Reformated comments and long lines

[mmh] / uip / viamail.c

diff --git a/uip/viamail.c b/uip/viamail.c
index 1d876cb..3bf341d 100644 (file)
--- a/uip/viamail.c
+++ b/uip/viamail.c
@@ -1,10 +1,10 @@
 /*
- * viamail.c -- send multiple files in a MIME message
- *
- * This code is Copyright (c) 2002, by the authors of nmh.  See the
- * COPYRIGHT file in the root directory of the nmh distribution for
- * complete copyright information.
- */
+** viamail.c -- send multiple files in a MIME message
+**
+** This code is Copyright (c) 2002, by the authors of nmh.  See the
+** COPYRIGHT file in the root directory of the nmh distribution for
+** complete copyright information.
+*/
 
 #include <h/mh.h>
 #include <fcntl.h>
@@ -34,23 +34,20 @@ static struct swit switches[] = {
        { "description text", 0 },
 #define COMMENTSW  5
        { "comment text", 0 },
-#define DELAYSW  6
-       { "delay seconds", 0 },
-#define VERBSW  7
+#define VERBSW  6
        { "verbose", 0 },
-#define NVERBSW  8
+#define NVERBSW  7
        { "noverbose", 0 },
-#define VERSIONSW  9
+#define VERSIONSW  8
        { "version", 0 },
-#define HELPSW  10
+#define HELPSW  9
        { "help", 0 },
-#define DEBUGSW  11
+#define DEBUGSW  10
        { "debug", -5 },
        { NULL, 0 }
 };
 
 extern int debugsw;
-extern int splitsw;
 extern int verbsw;
 
 int ebcdicsw = 0;  /* hack for linking purposes */
@@ -62,15 +59,14 @@ void set_endian (void);
 int writeBase64aux (FILE *, FILE *);
 
 /*
- * static prototypes
- */
-static int via_mail (char *, char *, char *, char *, char *, int, char *);
+** static prototypes
+*/
+static int via_mail (char *, char *, char *, char *, char *, char *);
 
 
 int
 main (int argc, char **argv)
 {
-       int delay = 0;
        char *f1 = NULL, *f2 = NULL, *f3 = NULL;
        char *f4 = NULL, *f5 = NULL, *f7 = NULL;
        char *cp, buf[BUFSIZ];
@@ -98,7 +94,8 @@ main (int argc, char **argv)
                                adios (NULL, "-%s unknown", cp);
 
                        case HELPSW:
-                               snprintf (buf, sizeof(buf), "%s [switches]", invo_name);
+                               snprintf (buf, sizeof(buf), "%s [switches]",
+                                               invo_name);
                                print_help (buf, switches, 1);
                                done (1);
                        case VERSIONSW:
@@ -107,39 +104,33 @@ main (int argc, char **argv)
 
                        case TOSW:
                                if (!(f1 = *argp++))
-                                       adios (NULL, "missing argument to %s", argp[-2]);
+                                       adios (NULL, "missing argument to %s",
+                                                       argp[-2]);
                                continue;
                        case SUBJECTSW:
                                if (!(f2 = *argp++))
-                                       adios (NULL, "missing argument to %s", argp[-2]);
+                                       adios (NULL, "missing argument to %s",
+                                               argp[-2]);
                                continue;
                        case PARAMSW:
                                if (!(f3 = *argp++))
-                                       adios (NULL, "missing argument to %s", argp[-2]);
+                                       adios (NULL, "missing argument to %s",
+                                               argp[-2]);
                                continue;
                        case DESCRIPTSW:
                                if (!(f4 = *argp++))
-                                       adios (NULL, "missing argument to %s", argp[-2]);
+                                       adios (NULL, "missing argument to %s",
+                                               argp[-2]);
                                continue;
                        case COMMENTSW:
                                if (!(f5 = *argp++))
-                                       adios (NULL, "missing argument to %s", argp[-2]);
-                               continue;
-                       case DELAYSW:
-                               if (!(cp = *argp++) || *cp == '-')
-                                       adios (NULL, "missing argument to %s", argp[-2]);
-
-                               /*
-                                * If there is an error, just reset the
-                                * delay parameter to -1.  We will set
-                                * a default delay later.
-                                */
-                               if (sscanf (cp, "%d", &delay) != 1)
-                                       delay = -1;
+                                       adios (NULL, "missing argument to %s",
+                                               argp[-2]);
                                continue;
                        case FROMSW:
                                if (!(f7 = *argp++))
-                                       adios (NULL, "missing argument to %s", argp[-2]);
+                                       adios (NULL, "missing argument to %s",
+                                               argp[-2]);
                                continue;
 
                        case VERBSW:
@@ -161,18 +152,18 @@ main (int argc, char **argv)
        if (!f1)
                adios (NULL, "missing -viamail \"mailpath\" switch");
 
-       via_mail (f1, f2, f3, f4, f5, delay, f7);
+       via_mail (f1, f2, f3, f4, f5, f7);
        return 0;  /* dead code to satisfy the compiler */
 }
 
 
 /*
- * VIAMAIL
- */
+** VIAMAIL
+*/
 
 static int
 via_mail (char *mailsw, char *subjsw, char *parmsw, char *descsw,
-       char *cmntsw, int delay, char *fromsw)
+       char *cmntsw, char *fromsw)
 {
        int status, vecp = 1;
        char tmpfil[BUFSIZ];
@@ -225,11 +216,6 @@ via_mail (char *mailsw, char *subjsw, char *parmsw, char *descsw,
        if (fstat (fileno (fp), &st) == NOTOK)
                adios ("failed", "fstat of %s", tmpfil);
 
-       if (delay < 0)
-               splitsw = 10;
-       else
-               splitsw = delay;
-
        status = 0;
        vec[0] = r1bindex (postproc, '/');
        if (verbsw)