Merge ../mmh

Conflicts:
	uip/rmm.c
	uip/whatnow.c

diff --cc uip/new.c
Simple merge

diff --cc uip/rmm.c
index 9401d2bea85bf4f1d9e6652e1f75f60f52dc690e,33ae9dad400d459635156be358deada291111654..03d4568bb1a3e988e48b8fe79ecad2636b7bd67d
--- 1/uip/rmm.c
--- 2/uip/rmm.c
+++ b/uip/rmm.c
@@@ -140,21 -139,7 +139,6 @@@ main(int argc, char **argv
                vec[vecp++] = msgs.msgs[msgnum];
        }
        vec[vecp] = NULL;
 -      done(execprog(*vec, vec));
  
-       fflush(stdout);
-       switch (pid = fork()) {
-       case -1:
-               adios("fork", "unable to");
- 
-       case 0:
-               execvp(*vec, vec);
-               fprintf(stderr, "unable to exec ");
-               perror(*vec);
-               _exit(-1);
- 
-       default:
-               pidwait(pid, -1);
-       }
- 
-       return 0;
 -      return 1;  /* just in case ... */
++      return execprog(*vec, vec);
  }

diff --cc uip/whatnow.c
Simple merge