On today's systems fork() will hardly fail, thus removed the fork retry loops.

[mmh] / uip / mhbuildsbr.c

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 05f1b35..efbb8ac 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -20,7 +20,6 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
-#include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
@@ -703,7 +702,7 @@ use_forw:
                        ap = brkstring(ci->ci_magic, " ", "\n");
                        copyip(ap, arguments, MAXARGS);
                } else {
-                       arguments[0] = "cur";
+                       arguments[0] = seq_cur;
                        arguments[1] = NULL;
                }
                folder = NULL;
@@ -1018,7 +1017,7 @@ compose_content(CT ct)
        default:
                if (!ce->ce_file) {
                        pid_t child_id;
-                       int i, xstdout, len, buflen;
+                       int xstdout, len, buflen;
                        char *bp, **ap, *cp;
                        char *vec[4], buffer[BUFSIZ];
                        FILE *out;
@@ -1120,9 +1119,7 @@ raw:
                        if ((out = fopen(ce->ce_file, "w")) == NULL)
                                adios(ce->ce_file, "unable to open for writing");
 
-                       for (i = 0; (child_id = fork()) == NOTOK && i > 5; i++)
-                               sleep(5);
-                       switch (child_id) {
+                       switch (child_id = fork()) {
                        case NOTOK:
                                adios("fork", "unable to fork");
                                /* NOTREACHED */
@@ -1335,7 +1332,7 @@ scan_content(CT ct)
                                        if (!isspace(*cp))
                                                break;
                                *++cp = '\0';
-                               if (!strncmp(buffer + 2, prefix, len) &&
+                               if (strncmp(buffer + 2, prefix, len)==0 &&
                                                isdigit(buffer[2 + len])) {
                                        boundaryclash = 1;
                                        /* no need to keep checking */
@@ -1562,11 +1559,6 @@ skip_headers:
        switch (ct->c_encoding) {
        case CE_7BIT:
                /* Nothing to output */
-#if 0
-               np = getcpy(ENCODING_FIELD);
-               vp = concat(" ", "7bit", "\n", NULL);
-               add_header(ct, np, vp);
-#endif
                break;
 
        case CE_8BIT: