X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=fade.c;h=36ff1fc1fdc1342f68590b3327a7fcfffe877ac4;hb=3a258056d2137c3a4c10d717c6bb2e92d91ee3e0;hp=ca9f08aee3034ded34c69f4db080268500cc5bda;hpb=b618dafe54ca9f73684c3167086ac799a10a0eb5;p=paraslash.git

diff --git a/fade.c b/fade.c
index ca9f08ae..36ff1fc1 100644
--- a/fade.c
+++ b/fade.c
@@ -176,7 +176,7 @@ out:
 
 static void client_cmd(const char *cmd)
 {
-	int ret, fds[3] = {0, 0, 0};
+	int ret, status, fds[3] = {0, 0, 0};
 	pid_t pid;
 	char *cmdline = make_message(BINDIR "/para_client %s", cmd);
 
@@ -184,12 +184,22 @@ static void client_cmd(const char *cmd)
 	ret = para_exec_cmdline_pid(&pid, cmdline, fds);
 	free(cmdline);
 	if (ret < 0) {
-		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
-		exit(EXIT_FAILURE);
+		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+		goto fail;
 	}
 	do
-		ret = wait(NULL);
-	while (ret != -1 && errno != ECHILD);
+		pid = waitpid(pid, &status, 0);
+	while (pid == -1 && errno == EINTR);
+	if (pid < 0) {
+		PARA_ERROR_LOG("%s\n", strerror(errno));
+		goto fail;
+	}
+	if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
+		goto fail;
+	return;
+fail:
+	PARA_EMERG_LOG("command \"%s\" failed\n", cmd);
+	exit(EXIT_FAILURE);
 }
 
 static void change_afs_mode_and_play(char *afs_mode)