X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/6d2d327ca57fefaddceba10eb323451f8150e95d..e99d42b153659e7ac644bb93700acb81514998e5:/server/normalize.c

diff --git a/server/normalize.c b/server/normalize.c
index 7e5fbe8..8ea6efa 100644
--- a/server/normalize.c
+++ b/server/normalize.c
@@ -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.
@@ -47,26 +47,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;
     }
   }
 }
@@ -118,7 +119,7 @@ int main(int argc, char attribute((unused)) **argv) {
     fatal(errno, "error calling setlocale");
   if(argc > 1)
     fatal(0, "not intended to be invoked by users");
-  if(config_read())
+  if(config_read(1))
     fatal(0, "cannot read configuration");
   if(!isatty(2)) {
     openlog(progname, LOG_PID, LOG_DAEMON);
@@ -126,12 +127,20 @@ int main(int argc, char attribute((unused)) **argv) {
   }
   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;
+    }
     /* Sanity check the header */
     if(header.rate < 100 || header.rate > 1000000)
       fatal(0, "implausible rate %"PRId32"Hz (%#"PRIx32")",