X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/6d2d327ca57fefaddceba10eb323451f8150e95d..ddf0e06b99c52ed416f19432be45b71238d0b877:/server/normalize.c

diff --git a/server/normalize.c b/server/normalize.c
index 7e5fbe8..956eb6b 100644
--- a/server/normalize.c
+++ b/server/normalize.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder
- * Copyright (C) 2007 Richard Kettlewell
+ * Copyright (C) 2007, 2008 Richard Kettlewell
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-/** @file server/disorder-normalize.c
+/** @file server/normalize.c
  * @brief Convert "raw" format output to the configured format
  *
  * Currently we invoke sox even for trivial conversions such as byte-swapping.
@@ -25,21 +25,35 @@
  * and eliminate the dependency on sox.
  */
 
-#include <config.h>
-#include "types.h"
+#include "disorder-server.h"
 
-#include <locale.h>
-#include <errno.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/wait.h>
+static const struct option options[] = {
+  { "help", no_argument, 0, 'h' },
+  { "version", no_argument, 0, 'V' },
+  { "config", required_argument, 0, 'c' },
+  { "debug", no_argument, 0, 'd' },
+  { "no-debug", no_argument, 0, 'D' },
+  { "syslog", no_argument, 0, 's' },
+  { "no-syslog", no_argument, 0, 'S' },
+  { 0, 0, 0, 0 }
+};
 
-#include "syscalls.h"
-#include "log.h"
-#include "configuration.h"
-#include "speaker-protocol.h"
+/* display usage message and terminate */
+static void help(void) {
+  xprintf("Usage:\n"
+	  "  disorder-normalize [OPTIONS]\n"
+	  "Options:\n"
+	  "  --help, -h              Display usage message\n"
+	  "  --version, -V           Display version number\n"
+	  "  --config PATH, -c PATH  Set configuration file\n"
+	  "  --debug, -d             Turn on debugging\n"
+          "  --[no-]syslog           Force logging\n"
+          "\n"
+          "Audio format normalizer for DisOrder.  Not intended to be run\n"
+          "directly.\n");
+  xfclose(stdout);
+  exit(0);
+}
 
 /** @brief Copy bytes from one file descriptor to another
  * @param infd File descriptor read from
@@ -47,26 +61,27 @@
  * @param n Number of bytes to copy
  */
 static void copy(int infd, int outfd, size_t n) {
-  char buffer[4096], *ptr;
-  int r, w;
+  char buffer[4096];
+  ssize_t written;
 
   while(n > 0) {
-    r = read(infd, buffer, sizeof buffer);
-    if(r < 0) {
+    const ssize_t readden = read(infd, buffer,
+                                 n > sizeof buffer ? sizeof buffer : n);
+    if(readden < 0) {
       if(errno == EINTR)
 	continue;
       else
 	fatal(errno, "read error");
     }
-    if(r == 0)
+    if(readden == 0)
       fatal(0, "unexpected EOF");
-    n -= r;
-    ptr = buffer;
-    while(r > 0) {
-      w = write(outfd, ptr, r - (ptr - buffer));
+    n -= readden;
+    written = 0;
+    while(written < readden) {
+      const ssize_t w = write(outfd, buffer + written, readden - written);
       if(w < 0)
 	fatal(errno, "write error");
-      ptr += w;
+      written += w;
     }
   }
 }
@@ -110,28 +125,48 @@ static void soxargs(const char ***pp, char **qq,
 
 int main(int argc, char attribute((unused)) **argv) {
   struct stream_header header, latest_format;
-  int n, p[2], outfd = -1;
+  int n, p[2], outfd = -1, logsyslog = !isatty(2);
   pid_t pid = -1;
 
   set_progname(argv);
   if(!setlocale(LC_CTYPE, ""))
     fatal(errno, "error calling setlocale");
-  if(argc > 1)
-    fatal(0, "not intended to be invoked by users");
-  if(config_read())
+  while((n = getopt_long(argc, argv, "hVc:dDSs", options, 0)) >= 0) {
+    switch(n) {
+    case 'h': help();
+    case 'V': version("disorder-normalize");
+    case 'c': configfile = optarg; break;
+    case 'd': debugging = 1; break;
+    case 'D': debugging = 0; break;
+    case 'S': logsyslog = 0; break;
+    case 's': logsyslog = 1; break;
+    default: fatal(0, "invalid option");
+    }
+  }
+  if(config_read(1))
     fatal(0, "cannot read configuration");
-  if(!isatty(2)) {
+  if(logsyslog) {
     openlog(progname, LOG_PID, LOG_DAEMON);
     log_default = &log_syslog;
   }
   memset(&latest_format, 0, sizeof latest_format);
   for(;;) {
-    if((n = read(0, &header, sizeof header)) < 0)
-      fatal(errno, "read error");
-    else if(n == 0)
-      exit(0);
-    else if((size_t)n < sizeof header)
-      fatal(0, "short header");
+    n = 0;
+    while((size_t)n < sizeof header) {
+      int r = read(0, (char *)&header + n, sizeof header - n);
+
+      if(r < 0) {
+        if(errno != EINTR)
+          fatal(errno, "error reading header");
+      } else if(r == 0) {
+        if(n)
+          fatal(0, "EOF reading header");
+        break;
+      } else
+        n += r;
+    }
+    if(!n)
+      break;
     /* Sanity check the header */
     if(header.rate < 100 || header.rate > 1000000)
       fatal(0, "implausible rate %"PRId32"Hz (%#"PRIx32")",
@@ -191,6 +226,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;
 }