fade: Abort on client command failures.

[paraslash.git] / fade.c

diff --git a/fade.c b/fade.c
index 92aec1e76f5da25c24ca447be91e5167e61a8ed5..36ff1fc1fdc1342f68590b3327a7fcfffe877ac4 100644 (file)
--- a/fade.c
+++ b/fade.c
@@ -9,12 +9,7 @@
 #include <regex.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
-#include <ctype.h>
-#include <stdlib.h> /* EXIT_SUCCESS */
-#include <unistd.h>
 #include <signal.h>
-#include <string.h>
-#include <limits.h>
 #include <sys/soundcard.h>
 
 #include "fade.cmdline.h"
@@ -181,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);
 
@@ -189,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)
@@ -204,7 +209,7 @@ static void change_afs_mode_and_play(char *afs_mode)
        client_cmd("stop");
        if (!afs_mode)
                return;
-       cmd = make_message("select %s\n", afs_mode);
+       cmd = make_message("select %s", afs_mode);
        client_cmd(cmd);
        free(cmd);
        client_cmd("play");