format files

1 files changed, 164 insertions, 126 deletions

diff --git a/src/qmail-pw2u.c b/src/qmail-pw2u.c
index 4ca7d25..9b0a09b 100644
--- a/src/qmail-pw2u.c
+++ b/src/qmail-pw2u.c
@@ -1,78 +1,80 @@
-#include <unistd.h>
-#include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
 #include "buffer.h"
-#include "getoptb.h"
-#include "control.h"
+#include "byte.h"
 #include "constmap.h"
-#include "stralloc.h"
-#include "fmt.h"
-#include "str.h"
-#include "scan.h"
-#include "open.h"
-#include "logmsg.h"
 #include "exit.h"
+#include "fmt.h"
 #include "getln.h"
-#include "byte.h"
+#include "getoptb.h"
+#include "logmsg.h"
+#include "open.h"
+#include "scan.h"
+#include "str.h"
+#include "stralloc.h"
+
 #include "auto_break.h"
 #include "auto_qmail.h"
 #include "auto_usera.h"
+#include "control.h"
 
 #define WHO "qmail-pw2u"
 
 void die_chdir()
 {
-  buffer_putsflush(buffer_2,"qmail-pw2u: fatal: unable to chdir\n");
+  buffer_putsflush(buffer_2, "qmail-pw2u: fatal: unable to chdir\n");
   _exit(111);
 }
 
 void die_nomem()
 {
-  buffer_putsflush(buffer_2,"qmail-pw2u: fatal: out of memory\n");
+  buffer_putsflush(buffer_2, "qmail-pw2u: fatal: out of memory\n");
   _exit(111);
 }
 
 void die_read()
 {
-  buffer_putsflush(buffer_2,"qmail-pw2u: fatal: unable to read input\n");
+  buffer_putsflush(buffer_2, "qmail-pw2u: fatal: unable to read input\n");
   _exit(111);
 }
 
 void die_write()
 {
-  buffer_putsflush(buffer_2,"qmail-pw2u: fatal: unable to write output\n");
+  buffer_putsflush(buffer_2, "qmail-pw2u: fatal: unable to write output\n");
   _exit(111);
 }
 
 void die_control()
 {
-  buffer_putsflush(buffer_2,"qmail-pw2u: fatal: unable to read controls\n");
+  buffer_putsflush(buffer_2, "qmail-pw2u: fatal: unable to read controls\n");
   _exit(111);
 }
 
 void die_alias()
 {
-  buffer_puts(buffer_2,"qmail-pw2u: fatal: unable to find ");
-  buffer_puts(buffer_2,auto_usera);
-  buffer_puts(buffer_2," user\n");
+  buffer_puts(buffer_2, "qmail-pw2u: fatal: unable to find ");
+  buffer_puts(buffer_2, auto_usera);
+  buffer_puts(buffer_2, " user\n");
   buffer_flush(buffer_2);
   _exit(111);
 }
 
 void die_home(char *fn)
 {
-  buffer_puts(buffer_2,"qmail-pw2u: fatal: unable to stat ");
-  buffer_puts(buffer_2,fn);
-  buffer_puts(buffer_2,"\n");
+  buffer_puts(buffer_2, "qmail-pw2u: fatal: unable to stat ");
+  buffer_puts(buffer_2, fn);
+  buffer_puts(buffer_2, "\n");
   buffer_flush(buffer_2);
   _exit(111);
 }
 
-void die_user(char *s,unsigned int len)
+void die_user(char *s, unsigned int len)
 {
-  buffer_puts(buffer_2,"qmail-pw2u: fatal: unable to find ");
-  buffer_put(buffer_2,s,len);
-  buffer_puts(buffer_2," user for subuser\n");
+  buffer_puts(buffer_2, "qmail-pw2u: fatal: unable to find ");
+  buffer_put(buffer_2, s, len);
+  buffer_puts(buffer_2, " user for subuser\n");
   buffer_flush(buffer_2);
   _exit(111);
 }
@@ -85,11 +87,18 @@ int homestrategy = 2;
 /* 1: stop if home does not exist; skip if home is not owned by user */
 /* 0: don't worry about home */
 
-int okincl; stralloc incl = {0}; struct constmap mapincl;
-int okexcl; stralloc excl = {0}; struct constmap mapexcl;
-int okmana; stralloc mana = {0}; struct constmap mapmana;
+int okincl;
+stralloc incl = {0};
+struct constmap mapincl;
+int okexcl;
+stralloc excl = {0};
+struct constmap mapexcl;
+int okmana;
+stralloc mana = {0};
+struct constmap mapmana;
 
-stralloc allusers = {0}; struct constmap mapuser;
+stralloc allusers = {0};
+struct constmap mapuser;
 
 stralloc uugh = {0};
 stralloc user = {0};
@@ -108,37 +117,57 @@ void doaccount()
   char *x;
   unsigned int xlen;
 
-  if (byte_chr(line.s,line.len,'\0') < line.len) return;
+  if (byte_chr(line.s, line.len, '\0') < line.len) return;
 
-  x = line.s; xlen = line.len; i = byte_chr(x,xlen,':'); if (i == xlen) return;
-  if (!stralloc_copyb(&user,x,i)) die_nomem();
+  x = line.s;
+  xlen = line.len;
+  i = byte_chr(x, xlen, ':');
+  if (i == xlen) return;
+  if (!stralloc_copyb(&user, x, i)) die_nomem();
   if (!stralloc_0(&user)) die_nomem();
-  ++i; x += i; xlen -= i; i = byte_chr(x,xlen,':'); if (i == xlen) return;
-  ++i; x += i; xlen -= i; i = byte_chr(x,xlen,':'); if (i == xlen) return;
-  if (!stralloc_copyb(&uidstr,x,i)) die_nomem();
+  ++i;
+  x += i;
+  xlen -= i;
+  i = byte_chr(x, xlen, ':');
+  if (i == xlen) return;
+  ++i;
+  x += i;
+  xlen -= i;
+  i = byte_chr(x, xlen, ':');
+  if (i == xlen) return;
+  if (!stralloc_copyb(&uidstr, x, i)) die_nomem();
   if (!stralloc_0(&uidstr)) die_nomem();
-  scan_ulong(uidstr.s,&uid);
-  ++i; x += i; xlen -= i; i = byte_chr(x,xlen,':'); if (i == xlen) return;
-  if (!stralloc_copyb(&gidstr,x,i)) die_nomem();
+  scan_ulong(uidstr.s, &uid);
+  ++i;
+  x += i;
+  xlen -= i;
+  i = byte_chr(x, xlen, ':');
+  if (i == xlen) return;
+  if (!stralloc_copyb(&gidstr, x, i)) die_nomem();
   if (!stralloc_0(&gidstr)) die_nomem();
-  ++i; x += i; xlen -= i; i = byte_chr(x,xlen,':'); if (i == xlen) return;
-  ++i; x += i; xlen -= i; i = byte_chr(x,xlen,':'); if (i == xlen) return;
-  if (!stralloc_copyb(&home,x,i)) die_nomem();
+  ++i;
+  x += i;
+  xlen -= i;
+  i = byte_chr(x, xlen, ':');
+  if (i == xlen) return;
+  ++i;
+  x += i;
+  xlen -= i;
+  i = byte_chr(x, xlen, ':');
+  if (i == xlen) return;
+  if (!stralloc_copyb(&home, x, i)) die_nomem();
   if (!stralloc_0(&home)) die_nomem();
 
   if (!uid) return;
   if (flagnoupper)
     for (i = 0; i < user.len; ++i)
-      if ((user.s[i] >= 'A') && (user.s[i] <= 'Z'))
-	return;
+      if ((user.s[i] >= 'A') && (user.s[i] <= 'Z')) return;
   if (okincl)
-    if (!constmap(&mapincl,user.s,user.len - 1))
-      return;
+    if (!constmap(&mapincl, user.s, user.len - 1)) return;
   if (okexcl)
-    if (constmap(&mapexcl,user.s,user.len - 1))
-      return;
+    if (constmap(&mapexcl, user.s, user.len - 1)) return;
   if (homestrategy) {
-    if (stat(home.s,&st) == -1) {
+    if (stat(home.s, &st) == -1) {
       if (errno != ENOENT) die_home(home.s);
       if (homestrategy == 1) die_home(home.s);
       return;
@@ -146,54 +175,52 @@ void doaccount()
     if (st.st_uid != uid) return;
   }
 
-  if (!stralloc_copys(&uugh,":")) die_nomem();
-  if (!stralloc_cats(&uugh,user.s)) die_nomem();
-  if (!stralloc_cats(&uugh,":")) die_nomem();
-  if (!stralloc_cats(&uugh,uidstr.s)) die_nomem();
-  if (!stralloc_cats(&uugh,":")) die_nomem();
-  if (!stralloc_cats(&uugh,gidstr.s)) die_nomem();
-  if (!stralloc_cats(&uugh,":")) die_nomem();
-  if (!stralloc_cats(&uugh,home.s)) die_nomem();
-  if (!stralloc_cats(&uugh,":")) die_nomem();
+  if (!stralloc_copys(&uugh, ":")) die_nomem();
+  if (!stralloc_cats(&uugh, user.s)) die_nomem();
+  if (!stralloc_cats(&uugh, ":")) die_nomem();
+  if (!stralloc_cats(&uugh, uidstr.s)) die_nomem();
+  if (!stralloc_cats(&uugh, ":")) die_nomem();
+  if (!stralloc_cats(&uugh, gidstr.s)) die_nomem();
+  if (!stralloc_cats(&uugh, ":")) die_nomem();
+  if (!stralloc_cats(&uugh, home.s)) die_nomem();
+  if (!stralloc_cats(&uugh, ":")) die_nomem();
 
   /* XXX: avoid recording in allusers unlein sub actually needs it */
-  if (!stralloc_cats(&allusers,user.s)) die_nomem();
-  if (!stralloc_cats(&allusers,":")) die_nomem();
-  if (!stralloc_catb(&allusers,uugh.s,uugh.len)) die_nomem();
+  if (!stralloc_cats(&allusers, user.s)) die_nomem();
+  if (!stralloc_cats(&allusers, ":")) die_nomem();
+  if (!stralloc_catb(&allusers, uugh.s, uugh.len)) die_nomem();
   if (!stralloc_0(&allusers)) die_nomem();
 
-  if (str_equal(user.s,auto_usera)) {
-    if (buffer_puts(buffer_1,"+") == -1) die_write();
-    if (buffer_put(buffer_1,uugh.s,uugh.len) == -1) die_write();
-    if (buffer_puts(buffer_1,dashcolon) == -1) die_write();
-    if (buffer_puts(buffer_1,":\n") == -1) die_write();
+  if (str_equal(user.s, auto_usera)) {
+    if (buffer_puts(buffer_1, "+") == -1) die_write();
+    if (buffer_put(buffer_1, uugh.s, uugh.len) == -1) die_write();
+    if (buffer_puts(buffer_1, dashcolon) == -1) die_write();
+    if (buffer_puts(buffer_1, ":\n") == -1) die_write();
     flagalias = 1;
   }
 
   mailnames = 0;
-  if (okmana)
-    mailnames = constmap(&mapmana,user.s,user.len - 1);
-  if (!mailnames)
-    mailnames = user.s;
+  if (okmana) mailnames = constmap(&mapmana, user.s, user.len - 1);
+  if (!mailnames) mailnames = user.s;
 
   for (;;) {
     while (*mailnames == ':') ++mailnames;
     if (!*mailnames) break;
 
-    i = str_chr(mailnames,':');
+    i = str_chr(mailnames, ':');
+
+    if (buffer_puts(buffer_1, "=") == -1) die_write();
+    if (buffer_put(buffer_1, mailnames, i) == -1) die_write();
+    if (buffer_put(buffer_1, uugh.s, uugh.len) == -1) die_write();
+    if (buffer_puts(buffer_1, "::\n") == -1) die_write();
 
-    if (buffer_puts(buffer_1,"=") == -1) die_write();
-    if (buffer_put(buffer_1,mailnames,i) == -1) die_write();
-    if (buffer_put(buffer_1,uugh.s,uugh.len) == -1) die_write();
-    if (buffer_puts(buffer_1,"::\n") == -1) die_write();
-  
     if (*auto_break) {
-      if (buffer_puts(buffer_1,"+") == -1) die_write();
-      if (buffer_put(buffer_1,mailnames,i) == -1) die_write();
-      if (buffer_put(buffer_1,auto_break,1) == -1) die_write();
-      if (buffer_put(buffer_1,uugh.s,uugh.len) == -1) die_write();
-      if (buffer_puts(buffer_1,dashcolon) == -1) die_write();
-      if (buffer_puts(buffer_1,":\n") == -1) die_write();
+      if (buffer_puts(buffer_1, "+") == -1) die_write();
+      if (buffer_put(buffer_1, mailnames, i) == -1) die_write();
+      if (buffer_put(buffer_1, auto_break, 1) == -1) die_write();
+      if (buffer_put(buffer_1, uugh.s, uugh.len) == -1) die_write();
+      if (buffer_puts(buffer_1, dashcolon) == -1) die_write();
+      if (buffer_puts(buffer_1, ":\n") == -1) die_write();
     }
 
     mailnames += i;
@@ -209,28 +236,39 @@ void dosubuser()
   unsigned int xlen;
   char *uugh;
 
-  x = line.s; xlen = line.len; i = byte_chr(x,xlen,':'); if (i == xlen) return;
-  if (!stralloc_copyb(&sub,x,i)) die_nomem();
-  ++i; x += i; xlen -= i; i = byte_chr(x,xlen,':'); if (i == xlen) return;
-  uugh = constmap(&mapuser,x,i);
-  if (!uugh) die_user(x,i);
-  ++i; x += i; xlen -= i; i = byte_chr(x,xlen,':'); if (i == xlen) return;
-
-  if (buffer_puts(buffer_1,"=") == -1) die_write();
-  if (buffer_put(buffer_1,sub.s,sub.len) == -1) die_write();
-  if (buffer_puts(buffer_1,uugh) == -1) die_write();
-  if (buffer_puts(buffer_1,dashcolon) == -1) die_write();
-  if (buffer_put(buffer_1,x,i) == -1) die_write();
-  if (buffer_puts(buffer_1,":\n") == -1) die_write();
+  x = line.s;
+  xlen = line.len;
+  i = byte_chr(x, xlen, ':');
+  if (i == xlen) return;
+  if (!stralloc_copyb(&sub, x, i)) die_nomem();
+  ++i;
+  x += i;
+  xlen -= i;
+  i = byte_chr(x, xlen, ':');
+  if (i == xlen) return;
+  uugh = constmap(&mapuser, x, i);
+  if (!uugh) die_user(x, i);
+  ++i;
+  x += i;
+  xlen -= i;
+  i = byte_chr(x, xlen, ':');
+  if (i == xlen) return;
+
+  if (buffer_puts(buffer_1, "=") == -1) die_write();
+  if (buffer_put(buffer_1, sub.s, sub.len) == -1) die_write();
+  if (buffer_puts(buffer_1, uugh) == -1) die_write();
+  if (buffer_puts(buffer_1, dashcolon) == -1) die_write();
+  if (buffer_put(buffer_1, x, i) == -1) die_write();
+  if (buffer_puts(buffer_1, ":\n") == -1) die_write();
 
   if (*auto_break) {
-    if (buffer_puts(buffer_1,"+") == -1) die_write();
-    if (buffer_put(buffer_1,sub.s,sub.len) == -1) die_write();
-    if (buffer_put(buffer_1,auto_break,1) == -1) die_write();
-    if (buffer_puts(buffer_1,uugh) == -1) die_write();
-    if (buffer_puts(buffer_1,dashcolon) == -1) die_write();
-    if (buffer_put(buffer_1,x,i) == -1) die_write();
-    if (buffer_puts(buffer_1,"-:\n") == -1) die_write();
+    if (buffer_puts(buffer_1, "+") == -1) die_write();
+    if (buffer_put(buffer_1, sub.s, sub.len) == -1) die_write();
+    if (buffer_put(buffer_1, auto_break, 1) == -1) die_write();
+    if (buffer_puts(buffer_1, uugh) == -1) die_write();
+    if (buffer_puts(buffer_1, dashcolon) == -1) die_write();
+    if (buffer_put(buffer_1, x, i) == -1) die_write();
+    if (buffer_puts(buffer_1, "-:\n") == -1) die_write();
   }
 }
 
@@ -238,13 +276,13 @@ int fd;
 char inbuf[BUFFER_INSIZE];
 buffer in;
 
-int main(int argc,char **argv)
+int main(int argc, char **argv)
 {
   int opt;
   int match;
 
-  while ((opt = getopt(argc,argv,"/ohHuUc:C")) != opteof)
-    switch (opt) {
+  while ((opt = getopt(argc, argv, "/ohHuUc:C")) != opteof) switch (opt)
+    {
       case '/': dashcolon = "-/:"; break;
       case 'o': homestrategy = 2; break;
       case 'h': homestrategy = 1; break;
@@ -254,30 +292,32 @@ int main(int argc,char **argv)
       case 'c': *auto_break = *optarg; break;
       case 'C': *auto_break = 0; break;
       case '?':
-      default:
-	_exit(100);
+      default:  _exit(100);
     }
 
   if (chdir(auto_qmail) == -1) die_chdir();
 
   /* no need for control_init() */
 
-  okincl = control_readfile(&incl,"users/include",0);
+  okincl = control_readfile(&incl, "users/include", 0);
   if (okincl == -1) die_control();
-  if (okincl) if (!constmap_init(&mapincl,incl.s,incl.len,0)) die_nomem();
+  if (okincl)
+    if (!constmap_init(&mapincl, incl.s, incl.len, 0)) die_nomem();
 
-  okexcl = control_readfile(&excl,"users/exclude",0);
+  okexcl = control_readfile(&excl, "users/exclude", 0);
   if (okexcl == -1) die_control();
-  if (okexcl) if (!constmap_init(&mapexcl,excl.s,excl.len,0)) die_nomem();
+  if (okexcl)
+    if (!constmap_init(&mapexcl, excl.s, excl.len, 0)) die_nomem();
 
-  okmana = control_readfile(&mana,"users/mailnames",0);
+  okmana = control_readfile(&mana, "users/mailnames", 0);
   if (okmana == -1) die_control();
-  if (okmana) if (!constmap_init(&mapmana,mana.s,mana.len,1)) die_nomem();
+  if (okmana)
+    if (!constmap_init(&mapmana, mana.s, mana.len, 1)) die_nomem();
 
-  if (!stralloc_copys(&allusers,"")) die_nomem();
+  if (!stralloc_copys(&allusers, "")) die_nomem();
 
   for (;;) {
-    if (getln(buffer_0,&line,&match,'\n') == -1) die_read();
+    if (getln(buffer_0, &line, &match, '\n') == -1) die_read();
     doaccount();
     if (!match) break;
   }
@@ -286,14 +326,13 @@ int main(int argc,char **argv)
   fd = open_read("users/subusers");
   if (fd == -1) {
     if (errno != ENOENT) die_control();
-  }
-  else {
-    buffer_init(&in,read,fd,inbuf,sizeof(inbuf));
+  } else {
+    buffer_init(&in, read, fd, inbuf, sizeof(inbuf));
 
-    if (!constmap_init(&mapuser,allusers.s,allusers.len,1)) die_nomem();
+    if (!constmap_init(&mapuser, allusers.s, allusers.len, 1)) die_nomem();
 
     for (;;) {
-      if (getln(&in,&line,&match,'\n') == -1) die_read();
+      if (getln(&in, &line, &match, '\n') == -1) die_read();
       dosubuser();
       if (!match) break;
     }
@@ -304,17 +343,16 @@ int main(int argc,char **argv)
   fd = open_read("users/append");
   if (fd == -1) {
     if (errno != ENOENT) die_control();
-  }
-  else {
-    buffer_init(&in,read,fd,inbuf,sizeof(inbuf));
+  } else {
+    buffer_init(&in, read, fd, inbuf, sizeof(inbuf));
     for (;;) {
-      if (getln(&in,&line,&match,'\n') == -1) die_read();
-      if (buffer_put(buffer_1,line.s,line.len) == -1) die_write();
+      if (getln(&in, &line, &match, '\n') == -1) die_read();
+      if (buffer_put(buffer_1, line.s, line.len) == -1) die_write();
       if (!match) break;
     }
   }
 
-  if (buffer_puts(buffer_1,".\n") == -1) die_write();
+  if (buffer_puts(buffer_1, ".\n") == -1) die_write();
   if (buffer_flush(buffer_1) == -1) die_write();
   _exit(0);
 }