1 files changed, 49 insertions, 35 deletions

diff --git a/src/control.c b/src/control.c
index 2558225..a40030d 100644
--- a/src/control.c
+++ b/src/control.c
@@ -1,13 +1,15 @@
+#include "control.h"
+
 #include <unistd.h>
-#include "open.h"
-#include "getln.h"
-#include "stralloc.h"
+
+#include "alloc.h"
 #include "buffer.h"
+#include "error.h"
+#include "getln.h"
 #include "logmsg.h"
-#include "control.h"
-#include "alloc.h"
+#include "open.h"
 #include "scan.h"
-#include "error.h"
+#include "stralloc.h"
 
 static char inbuf[2048];
 static stralloc line = {0};
@@ -19,13 +21,12 @@ static int meok = 0;
 
 static void striptrailingwhitespace(stralloc *sa)
 {
-  while (sa->len > 0)
-    switch (sa->s[sa->len - 1]) {
-      case '\n': case ' ': case '\t':
-        --sa->len;
-        break;
-      default:
-        return;
+  while (sa->len > 0) switch (sa->s[sa->len - 1])
+    {
+      case '\n':
+      case ' ':
+      case '\t': --sa->len; break;
+      default:   return;
     }
 }
 
@@ -33,34 +34,41 @@ int control_init(void)
 {
   int r;
 
-  r = control_readline(&me,"control/me");
+  r = control_readline(&me, "control/me");
   if (r == 1) meok = 1;
   return r;
 }
 
-int control_rldef(stralloc *sa,char *fn,int flagme,char *def)
+int control_rldef(stralloc *sa, char *fn, int flagme, char *def)
 {
   int r;
 
-  r = control_readline(sa,fn);
+  r = control_readline(sa, fn);
   if (r) return r;
-  if (flagme) if (meok) return stralloc_copy(sa,&me) ? 1 : -1;
-  if (def) return stralloc_copys(sa,def) ? 1 : -1;
+  if (flagme)
+    if (meok) return stralloc_copy(sa, &me) ? 1 : -1;
+  if (def) return stralloc_copys(sa, def) ? 1 : -1;
   return r;
 }
 
-int control_readline(stralloc *sa,char *fn)
+int control_readline(stralloc *sa, char *fn)
 {
   buffer b;
   int fd;
   int match;
 
   fd = open_read(fn);
-  if (fd == -1) { if (errno == ENOENT) return 0; return -1; }
- 
-  buffer_init(&b,read,fd,inbuf,sizeof(inbuf));
+  if (fd == -1) {
+    if (errno == ENOENT) return 0;
+    return -1;
+  }
 
-  if (getln(&b,sa,&match,'\n') == -1) { close(fd); return -1; }
+  buffer_init(&b, read, fd, inbuf, sizeof(inbuf));
+
+  if (getln(&b, sa, &match, '\n') == -1) {
+    close(fd);
+    return -1;
+  }
 
   striptrailingwhitespace(sa);
 
@@ -68,34 +76,34 @@ int control_readline(stralloc *sa,char *fn)
   return 1;
 }
 
-int control_readint(int *i,char *fn)
+int control_readint(int *i, char *fn)
 {
   unsigned long u;
 
-  switch (control_readline(&line,fn)) {
-    case 0: return 0;
+  switch (control_readline(&line, fn)) {
+    case 0:  return 0;
     case -1: return -1;
   }
   if (!stralloc_0(&line)) return -1;
-  if (!scan_ulong(line.s,&u)) return 0;
+  if (!scan_ulong(line.s, &u)) return 0;
   *i = u;
 
   return 1;
 }
 
-int control_readfile(stralloc *sa,char *fn,int flagme)
+int control_readfile(stralloc *sa, char *fn, int flagme)
 {
   buffer b;
   int fd;
   int match;
 
-  if (!stralloc_copys(sa,"")) return -1;
+  if (!stralloc_copys(sa, "")) return -1;
 
   fd = open_read(fn);
   if (fd == -1) {
     if (errno == ENOENT) {
       if (flagme && meok) {
-        if (!stralloc_copy(sa,&me)) return -1;
+        if (!stralloc_copy(sa, &me)) return -1;
         if (!stralloc_0(sa)) return -1;
         return 1;
       }
@@ -104,17 +112,23 @@ int control_readfile(stralloc *sa,char *fn,int flagme)
     return -1;
   }
 
-  buffer_init(&b,read,fd,inbuf,sizeof(inbuf));
+  buffer_init(&b, read, fd, inbuf, sizeof(inbuf));
 
   for (;;) {
-    if (getln(&b,&line,&match,'\n') == -1) break;
-    if (!match && !line.len) { close(fd); return 1; }
+    if (getln(&b, &line, &match, '\n') == -1) break;
+    if (!match && !line.len) {
+      close(fd);
+      return 1;
+    }
     striptrailingwhitespace(&line);
     if (!stralloc_0(&line)) break;
     if (line.s[0])
       if (line.s[0] != '#')
-        if (!stralloc_cat(sa,&line)) break;
-    if (!match) { close(fd); return 1; }
+        if (!stralloc_cat(sa, &line)) break;
+    if (!match) {
+      close(fd);
+      return 1;
+    }
   }
 
   close(fd);