From: markus schnalke <meillo@marmaro.de>
Date: Mon, 26 Jan 2015 17:44:50 +0000 (+0100)
Subject: Merge ../mmh
X-Git-Tag: mmh-0.2-RC1~56^2~3
X-Git-Url: http://git.marmaro.de/?p=mmh;a=commitdiff_plain;h=8ab7ca4f2b4caa1f1ed2859d7d911513a7b2b2a2

Merge ../mmh

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

8ab7ca4f2b4caa1f1ed2859d7d911513a7b2b2a2
diff --cc uip/rmm.c
index 9401d2b,33ae9da..03d4568
--- a/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);
  }