Rearranged whitespace (and comments) in all the code!

[mmh] / uip / whom.c

diff --git a/uip/whom.c b/uip/whom.c
index 1b1660f..b68e3ae 100644 (file)
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -1,4 +1,3 @@
-

 /*
  * whom.c -- report to whom a message would be sent
  *
 /*
  * whom.c -- report to whom a message would be sent
  *

@@ -12,183 +11,183 @@
 #include <signal.h>
 
 static struct swit switches[] = {
 #include <signal.h>
 
 static struct swit switches[] = {

-#define        ALIASW              0
-    { "alias aliasfile", 0 },
-#define        CHKSW               1
-    { "check", 0 },
-#define        NOCHKSW             2
-    { "nocheck", 0 },
-#define        DRAFTSW             3
-    { "draft", 0 },
-#define        DFOLDSW             4
-    { "draftfolder +folder", 6 },
-#define        DMSGSW              5
-    { "draftmessage msg", 6 },
-#define        NDFLDSW             6
-    { "nodraftfolder", 0 },
-#define VERSIONSW           7
-    { "version", 0 },
-#define        HELPSW              8
-    { "help", 0 },
-#define        CLIESW              9
-    { "client host", -6 },
-#define        SERVSW             10
-    { "server host", -6 },
-#define        SNOOPSW            11
-    { "snoop", -5 },
-#define PORTSW            15
-    { "port server port name/number", 4 },
-    { NULL, 0 }
+#define ALIASW  0
+       { "alias aliasfile", 0 },
+#define CHKSW  1
+       { "check", 0 },
+#define NOCHKSW  2
+       { "nocheck", 0 },
+#define DRAFTSW  3
+       { "draft", 0 },
+#define DFOLDSW  4
+       { "draftfolder +folder", 6 },
+#define DMSGSW  5
+       { "draftmessage msg", 6 },
+#define NDFLDSW  6
+       { "nodraftfolder", 0 },
+#define VERSIONSW  7
+       { "version", 0 },
+#define HELPSW  8
+       { "help", 0 },
+#define CLIESW  9
+       { "client host", -6 },
+#define SERVSW  10
+       { "server host", -6 },
+#define SNOOPSW  11
+       { "snoop", -5 },
+#define PORTSW  15
+       { "port server port name/number", 4 },
+       { NULL, 0 }

 };
 
 
 int
 main (int argc, char **argv)
 {
 };
 
 
 int
 main (int argc, char **argv)
 {

-    pid_t child_id;
-    int i, status, isdf = 0;
-    int distsw = 0, vecp = 0;
-    char *cp, *dfolder = NULL, *dmsg = NULL;
-    char *msg = NULL, **ap, **argp, backup[BUFSIZ];
-    char buf[BUFSIZ], **arguments, *vec[MAXARGS];
+       pid_t child_id;
+       int i, status, isdf = 0;
+       int distsw = 0, vecp = 0;
+       char *cp, *dfolder = NULL, *dmsg = NULL;
+       char *msg = NULL, **ap, **argp, backup[BUFSIZ];
+       char buf[BUFSIZ], **arguments, *vec[MAXARGS];

 
 #ifdef LOCALE
 
 #ifdef LOCALE

-    setlocale(LC_ALL, "");
+       setlocale(LC_ALL, "");

 #endif
 #endif

-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
-
-    arguments = getarguments (invo_name, argc, argv, 1);
-    argp = arguments;
-
-    vec[vecp++] = invo_name;
-    vec[vecp++] = "-whom";
-    vec[vecp++] = "-library";
-    vec[vecp++] = getcpy (m_maildir (""));
-
-    while ((cp = *argp++)) {
-       if (*cp == '-') {
-           switch (smatch (++cp, switches)) {
-               case AMBIGSW: 
-                   ambigsw (cp, switches);
-                   done (1);
-               case UNKWNSW: 
-                   adios (NULL, "-%s unknown", cp);
-
-               case HELPSW: 
-                   snprintf (buf, sizeof(buf), "%s [switches] [file]", invo_name);
-                   print_help (buf, switches, 1);
-                   done (1);
-               case VERSIONSW:
-                   print_version(invo_name);
-                   done (1);
-
-               case CHKSW: 
-               case NOCHKSW: 
-               case SNOOPSW:
-                   vec[vecp++] = --cp;
-                   continue;
-
-               case DRAFTSW:
-                   msg = draft;
-                   continue;
-
-               case DFOLDSW: 
-                   if (dfolder)
-                       adios (NULL, "only one draft folder at a time!");
-                   if (!(cp = *argp++) || *cp == '-')
-                       adios (NULL, "missing argument to %s", argp[-2]);
-                   dfolder = path (*cp == '+' || *cp == '@' ? cp + 1 : cp,
-                           *cp != '@' ? TFOLDER : TSUBCWF);
-                   continue;
-               case DMSGSW: 
-                   if (dmsg)
-                       adios (NULL, "only one draft message at a time!");
-                   if (!(dmsg = *argp++) || *dmsg == '-')
-                       adios (NULL, "missing argument to %s", argp[-2]);
-                   continue;
-               case NDFLDSW: 
-                   dfolder = NULL;
-                   isdf = NOTOK;
-                   continue;
-
-               case ALIASW: 
-               case CLIESW: 
-               case SERVSW: 
-               case PORTSW:
-                   vec[vecp++] = --cp;
-                   if (!(cp = *argp++) || *cp == '-')
-                       adios (NULL, "missing argument to %s", argp[-2]);
-                   vec[vecp++] = cp;
-                   continue;
-           }
+       invo_name = r1bindex (argv[0], '/');
+
+       /* read user profile/context */
+       context_read();
+
+       arguments = getarguments (invo_name, argc, argv, 1);
+       argp = arguments;
+
+       vec[vecp++] = invo_name;
+       vec[vecp++] = "-whom";
+       vec[vecp++] = "-library";
+       vec[vecp++] = getcpy (m_maildir (""));
+
+       while ((cp = *argp++)) {
+               if (*cp == '-') {
+                       switch (smatch (++cp, switches)) {
+                               case AMBIGSW:
+                                       ambigsw (cp, switches);
+                                       done (1);
+                               case UNKWNSW:
+                                       adios (NULL, "-%s unknown", cp);
+
+                               case HELPSW:
+                                       snprintf (buf, sizeof(buf), "%s [switches] [file]", invo_name);
+                                       print_help (buf, switches, 1);
+                                       done (1);
+                               case VERSIONSW:
+                                       print_version(invo_name);
+                                       done (1);
+
+                               case CHKSW:
+                               case NOCHKSW:
+                               case SNOOPSW:
+                                       vec[vecp++] = --cp;
+                                       continue;
+
+                               case DRAFTSW:
+                                       msg = draft;
+                                       continue;
+
+                               case DFOLDSW:
+                                       if (dfolder)
+                                               adios (NULL, "only one draft folder at a time!");
+                                       if (!(cp = *argp++) || *cp == '-')
+                                               adios (NULL, "missing argument to %s", argp[-2]);
+                                       dfolder = path (*cp == '+' || *cp == '@' ? cp + 1 : cp,
+                                                       *cp != '@' ? TFOLDER : TSUBCWF);
+                                       continue;
+                               case DMSGSW:
+                                       if (dmsg)
+                                               adios (NULL, "only one draft message at a time!");
+                                       if (!(dmsg = *argp++) || *dmsg == '-')
+                                               adios (NULL, "missing argument to %s", argp[-2]);
+                                       continue;
+                               case NDFLDSW:
+                                       dfolder = NULL;
+                                       isdf = NOTOK;
+                                       continue;
+
+                               case ALIASW:
+                               case CLIESW:
+                               case SERVSW:
+                               case PORTSW:
+                                       vec[vecp++] = --cp;
+                                       if (!(cp = *argp++) || *cp == '-')
+                                               adios (NULL, "missing argument to %s", argp[-2]);
+                                       vec[vecp++] = cp;
+                                       continue;
+                       }
+               }
+               if (msg)
+                       adios (NULL, "only one draft at a time!");
+               else
+                       vec[vecp++] = msg = cp;
+       }
+
+       /* allow Aliasfile: profile entry */
+       if ((cp = context_find ("Aliasfile"))) {
+               char *dp = NULL;
+
+               for (ap = brkstring(dp = getcpy(cp), " ", "\n"); ap && *ap; ap++) {
+                       vec[vecp++] = "-alias";
+                       vec[vecp++] = *ap;
+               }
+       }
+
+       if (msg == NULL) {
+#ifdef WHATNOW
+               if (dfolder || (cp = getenv ("mhdraft")) == NULL || *cp == '\0')
+#endif /* WHATNOW */
+                       cp  = getcpy (m_draft (dfolder, dmsg, 1, &isdf));
+               msg = vec[vecp++] = cp;

        }
        }

-       if (msg)
-           adios (NULL, "only one draft at a time!");
-       else
-           vec[vecp++] = msg = cp;
-    }
-
-    /* allow Aliasfile: profile entry */
-    if ((cp = context_find ("Aliasfile"))) {
-       char *dp = NULL;
-
-       for (ap = brkstring(dp = getcpy(cp), " ", "\n"); ap && *ap; ap++) {
-           vec[vecp++] = "-alias";
-           vec[vecp++] = *ap;
+       if ((cp = getenv ("mhdist"))
+                       && *cp
+                       && (distsw = atoi (cp))
+                       && (cp = getenv ("mhaltmsg"))
+                       && *cp) {
+               if (distout (msg, cp, backup) == NOTOK)
+                       done (1);
+               vec[vecp++] = "-dist";
+               distsw++;

        }
        }

-    }
-
-    if (msg == NULL) {
-#ifdef WHATNOW
-       if (dfolder || (cp = getenv ("mhdraft")) == NULL || *cp == '\0')
-#endif /* WHATNOW */
-           cp  = getcpy (m_draft (dfolder, dmsg, 1, &isdf));
-       msg = vec[vecp++] = cp;
-    }
-    if ((cp = getenv ("mhdist"))
-           && *cp
-           && (distsw = atoi (cp))
-           && (cp = getenv ("mhaltmsg"))
-           && *cp) {
-       if (distout (msg, cp, backup) == NOTOK)
-           done (1);
-       vec[vecp++] = "-dist";
-       distsw++;
-    }
-    vec[vecp] = NULL;
-
-    closefds (3);
-
-    if (distsw) {
-       for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
-           sleep (5);
-    }
-
-    switch (distsw ? child_id : OK) {
-       case NOTOK:
-           advise (NULL, "unable to fork, so checking directly...");
-       case OK:
-           execvp (postproc, vec);
-           fprintf (stderr, "unable to exec ");
-           perror (postproc);
-           _exit (-1);
-
-       default:
-           SIGNAL (SIGHUP, SIG_IGN);
-           SIGNAL (SIGINT, SIG_IGN);
-           SIGNAL (SIGQUIT, SIG_IGN);
-           SIGNAL (SIGTERM, SIG_IGN);
-
-           status = pidwait(child_id, OK);
-
-           unlink (msg);
-           if (rename (backup, msg) == NOTOK)
-               adios (msg, "unable to rename %s to", backup);
-           done (status);
-    }
-
-    return 0;  /* dead code to satisfy the compiler */
+       vec[vecp] = NULL;
+
+       closefds (3);
+
+       if (distsw) {
+               for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
+                       sleep (5);
+       }
+
+       switch (distsw ? child_id : OK) {
+               case NOTOK:
+                               advise (NULL, "unable to fork, so checking directly...");
+               case OK:
+                       execvp (postproc, vec);
+                       fprintf (stderr, "unable to exec ");
+                       perror (postproc);
+                       _exit (-1);
+
+               default:
+                       SIGNAL (SIGHUP, SIG_IGN);
+                       SIGNAL (SIGINT, SIG_IGN);
+                       SIGNAL (SIGQUIT, SIG_IGN);
+                       SIGNAL (SIGTERM, SIG_IGN);
+
+                       status = pidwait(child_id, OK);
+
+                       unlink (msg);
+                       if (rename (backup, msg) == NOTOK)
+                               adios (msg, "unable to rename %s to", backup);
+                       done (status);
+       }
+
+       return 0;  /* dead code to satisfy the compiler */

 }
 }