Removed the -width switch from send, spost and repl.

[mmh] / uip / spost.c

diff --git a/uip/spost.c b/uip/spost.c
index cc163ac..947904e 100644 (file)
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -50,23 +50,21 @@ struct swit switches[] = {
        { "alias aliasfile", 0 },
 #define NALIASW  13
        { "noalias", 0 },
-#define WIDTHSW  14
-       { "width columns", 0 },
-#define VERSIONSW  15
+#define VERSIONSW  14
        { "version", 0 },
-#define HELPSW  16
+#define HELPSW  15
        { "help", 0 },
-#define DEBUGSW  17
+#define DEBUGSW  16
        { "debug", -5 },
-#define DISTSW  18
+#define DISTSW  17
        { "dist", -4 },  /* interface from dist */
-#define PUSHSW  19  /* fork to sendmail then exit */
+#define PUSHSW  18  /* fork to sendmail then exit */
        { "push", -4 },
-#define NPUSHSW  20  /* exec sendmail */
+#define NPUSHSW  19  /* exec sendmail */
        { "nopush", -6 },
-#define LIBSW  21
+#define LIBSW  20
        { "library directory", -7 },
-#define ANNOSW  22
+#define ANNOSW  21
        { "idanno number", -6 },
        { NULL, 0 }
 };
@@ -143,7 +141,6 @@ static int watch = 0;  /* watch the delivery process */
 static int backflg = 0;  /* rename input file as *.bak when done */
 static int pushflg = 0;  /* if going to fork to sendmail */
 static int aliasflg = 0;  /* if going to process aliases */
-static int outputlinelen=72;
 
 static unsigned msgflags = 0;  /* what we've seen */
 
@@ -295,15 +292,6 @@ main(int argc, char **argv)
                                aliasflg = 0;
                                continue;
 
-                       case WIDTHSW:
-                               if (!(cp = *argp++) || *cp == '-')
-                                       adios(NULL, "missing argument to %s",
-                                                       argp[-2]);
-                               outputlinelen = atoi(cp);
-                               if (outputlinelen <= 10)
-                                       outputlinelen = 72;
-                               continue;
-
                        case LIBSW:
                                if (!(cp = *argp++) || *cp == '-')
                                        adios(NULL, "missing argument to %s",
@@ -431,7 +419,7 @@ main(int argc, char **argv)
 
        if (pushflg && !(watch || verbose)) {
                /* fork to a child to run sendmail */
-               for (i=0; (pid = vfork()) == NOTOK && i < 5; i++)
+               for (i=0; (pid = fork()) == NOTOK && i < 5; i++)
                        sleep(5);
                switch (pid) {
                case NOTOK:
@@ -713,7 +701,7 @@ putone(char *adr, int pos, int indent)
        len = strlen( adr );
        if (pos == indent)
                linepos = pos;
-       else if (linepos+len > outputlinelen) {
+       else if (linepos+len > OUTPUTLINELEN) {
                fprintf( out, ",\n%*s", indent, "");
                linepos = indent;
                pos += indent + 2;
@@ -797,11 +785,11 @@ make_bcc_file(void)
        } else {
                vec[0] = mhbasename(mhlproc);
 
-               for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
+               for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
                        sleep(5);
                switch (child_id) {
                case NOTOK:
-                       adios("vfork", "unable to");
+                       adios("fork", "unable to");
 
                case OK:
                        dup2(fileno(out), 1);
@@ -857,7 +845,7 @@ fcc(char *file, char *folder)
                                folder);
        fflush(stdout);
 
-       for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
+       for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
                sleep(5);
        switch (child_id) {
        case NOTOK: