speaker-network.c network_play() no longer assumes

[disorder] / server / normalize.c

diff --git a/server/normalize.c b/server/normalize.c
index 87b0f3d7bc5c356419d60e4f4d6e5a391ca5b465..8b871c8a497bf1f160b19d1db2273a18a3e2d90b 100644 (file)
--- a/server/normalize.c
+++ b/server/normalize.c
@@ -42,6 +42,7 @@
 #include "configuration.h"
 #include "speaker-protocol.h"
 #include "defs.h"
+#include "version.h"
 
 static const struct option options[] = {
   { "help", no_argument, 0, 'h' },
@@ -71,13 +72,6 @@ static void help(void) {
   exit(0);
 }
 
-/* display version number and terminate */
-static void version(void) {
-  xprintf("%s", disorder_version_string);
-  xfclose(stdout);
-  exit(0);
-}
-
 /** @brief Copy bytes from one file descriptor to another
  * @param infd File descriptor read from
  * @param outfd File descriptor to write to
@@ -157,7 +151,7 @@ int main(int argc, char attribute((unused)) **argv) {
   while((n = getopt_long(argc, argv, "hVc:dDSs", options, 0)) >= 0) {
     switch(n) {
     case 'h': help();
-    case 'V': version();
+    case 'V': version("disorder-normalize");
     case 'c': configfile = optarg; break;
     case 'd': debugging = 1; break;
     case 'D': debugging = 0; break;
@@ -249,6 +243,13 @@ int main(int argc, char attribute((unused)) **argv) {
   }
   if(outfd != -1)
     xclose(outfd);
+  if(pid != -1) {
+    /* There's still a converter running */
+    if(waitpid(pid, &n, 0) < 0)
+      fatal(errno, "error calling waitpid");
+    if(n)
+      fatal(0, "sox failed: %#x", n);
+  }
   return 0;
 }