get_file_info(): Flip logic throughout, reducing nesting.

[nmh] / uip / mhbuildsbr.c

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index bb68cc5b7323d64bef4f91e2eeed30e842af8906..4af6e590bd1337d608e3d938af00be515ad8336c 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -22,10 +22,11 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
+#include "h/mhcachesbr.h"
 #include "mhmisc.h"
-#include "../sbr/m_mktemp.h"
-#include "../sbr/message_id.h"
-#include "../sbr/mime_type.h"
+#include "sbr/m_mktemp.h"
+#include "sbr/message_id.h"
+#include "sbr/mime_type.h"
 #include "mhfree.h"
 #include "mhshowsbr.h"
 
@@ -56,9 +57,6 @@ typedef struct convert_list {
 } convert_list;
 
 
-/* mhcachesbr.c */
-int find_cache (CT, int, int *, char *, char *, int);
-
 /*
  * static prototypes
  */
@@ -1223,7 +1221,7 @@ compose_content (CT ct, int verbose)
     default:
        if (!ce->ce_file) {
            pid_t child_id;
-           int i, xstdout, len, buflen;
+           int xstdout, len, buflen;
            char *bp, *cp;
            char *vec[4], buffer[BUFSIZ];
            FILE *out;
@@ -1323,8 +1321,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);
+           child_id = fork();
            switch (child_id) {
            case NOTOK:
                adios ("fork", "unable to fork");
@@ -2239,9 +2236,9 @@ expand_pseudoheader (CT ct, CT *text_plain_ct, struct multipart *m,
     init_decoded_content (reply_ct, infile);
 
     if (extract_headers (reply_ct, reply_file, &reply_fp) == NOTOK) {
-        free (reply_file);
         inform("failed to extract headers from convert output in %s, "
            "continuing...", reply_file);
+        free(reply_file);
         return;
     }