Make sure to mark the sequence file as closed in the msgs struct.

[nmh] / uip / mhshowsbr.c

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index ae90a7b524c12d7bd9a230b0b82c4cbc8e7366d9..db804cb744d342749da8ec2c65daf064836b2373 100644 (file)
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -12,7 +12,7 @@
 #include <h/signals.h>
 #include <h/md5.h>
 #include <errno.h>
 #include <h/signals.h>
 #include <h/md5.h>
 #include <errno.h>

-#include <h/m_setjmp.h>
+#include <setjmp.h>

 #include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>


@@ -38,12 +38,6 @@ pid_t xpid = 0;
 static sigjmp_buf intrenv;
 
 
 static sigjmp_buf intrenv;
 
 

-/* termsbr.c */
-int SOprintf (char *, ...);
-
-/* mhparse.c */
-int pidcheck (int);
-

 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);
 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);


@@ -174,30 +168,30 @@ DisplayMsgHeader (CT ct, char *form)
 {
     pid_t child_id;
     int i, vecp;
 {
     pid_t child_id;
     int i, vecp;

-    char *vec[8];
+    char **vec;
+    char *file;

 
 

-    vecp = 0;
-    vec[vecp++] = r1bindex (mhlproc, '/');
-    vec[vecp++] = "-form";
-    vec[vecp++] = form;
-    vec[vecp++] = "-nobody";
-    vec[vecp++] = ct->c_file;
+    vec = argsplit(mhlproc, &file, &vecp);
+    vec[vecp++] = getcpy("-form");
+    vec[vecp++] = getcpy(form);
+    vec[vecp++] = getcpy("-nobody");
+    vec[vecp++] = getcpy(ct->c_file);

 
     /*
      * If we've specified -(no)moreproc,
      * then just pass that along.
      */
     if (nomore) {
 
     /*
      * If we've specified -(no)moreproc,
      * then just pass that along.
      */
     if (nomore) {

-       vec[vecp++] = "-nomoreproc";
+       vec[vecp++] = getcpy("-nomoreproc");

     } else if (progsw) {
     } else if (progsw) {

-       vec[vecp++] = "-moreproc";
-       vec[vecp++] = progsw;
+       vec[vecp++] = getcpy("-moreproc");
+       vec[vecp++] = getcpy(progsw);

     }
     vec[vecp] = NULL;
 
     fflush (stdout);
 
     }
     vec[vecp] = NULL;
 
     fflush (stdout);
 

-    for (i = 0; (child_id = m_vfork()) == NOTOK && i < 5; i++)
+    for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)

        sleep (5);
 
     switch (child_id) {
        sleep (5);
 
     switch (child_id) {


@@ -206,7 +200,7 @@ DisplayMsgHeader (CT ct, char *form)
        /* NOTREACHED */
 
     case OK:
        /* NOTREACHED */
 
     case OK:

-       execvp (mhlproc, vec);
+       execvp (file, vec);

        fprintf (stderr, "unable to exec ");
        perror (mhlproc);
        _exit (-1);
        fprintf (stderr, "unable to exec ");
        perror (mhlproc);
        _exit (-1);


@@ -216,6 +210,8 @@ DisplayMsgHeader (CT ct, char *form)
        xpid = -child_id;
        break;
     }
        xpid = -child_id;
        break;
     }

+
+    arglist_free(file, vec);

 }
 
 
 }
 
 


@@ -533,15 +529,15 @@ show_content_aux2 (CT ct, int serial, int alternate, char *cracked, char *buffer
        else
            list_switch (ct, -1, 1, 0, 0);
 
        else
            list_switch (ct, -1, 1, 0, 0);
 

-       if (xpause && SOprintf ("Press <return> to show content..."))
-           printf ("Press <return> to show content...");
-
-       if (xpause) {
+       if (xpause && isatty (fileno (stdout))) {

            int intr;
            SIGNAL_HANDLER istat;
 
            int intr;
            SIGNAL_HANDLER istat;
 

+           if (SOprintf ("Press <return> to show content..."))
+               printf ("Press <return> to show content...");
+

            istat = SIGNAL (SIGINT, intrser);
            istat = SIGNAL (SIGINT, intrser);

-           if ((intr = m_sigsetjmp (intrenv, 1)) == OK) {
+           if ((intr = sigsetjmp (intrenv, 1)) == OK) {

                fflush (stdout);
                prompt[0] = 0;
                read (fileno (stdout), prompt, sizeof(prompt));
                fflush (stdout);
                prompt[0] = 0;
                read (fileno (stdout), prompt, sizeof(prompt));


@@ -564,7 +560,7 @@ show_content_aux2 (CT ct, int serial, int alternate, char *cracked, char *buffer
 
     fflush (stdout);
 
 
     fflush (stdout);
 

-    for (i = 0; (child_id = m_vfork()) == NOTOK && i < 5; i++)
+    for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)

        sleep (5);
     switch (child_id) {
        case NOTOK:
        sleep (5);
     switch (child_id) {
        case NOTOK:


@@ -661,14 +657,11 @@ show_multi (CT ct, int serial, int alternate)
        return show_multi_aux (ct, serial, alternate, cp);
 
     /*
        return show_multi_aux (ct, serial, alternate, cp);
 
     /*

-     * Use default method to display this multipart content
-     * if it is not a (nested) part of a multipart/alternative,
-     * or if it is one of the known subtypes of multipart.
+     * Use default method to display this multipart content.  Even
+     * unknown types are displayable, since they're treated as mixed
+     * per RFC 2046.

      */
      */

-    if (!alternate || ct->c_subtype != MULTI_UNKNOWN)
-       return show_multi_internal (ct, serial, alternate);
-
-    return NOTOK;
+    return show_multi_internal (ct, serial, alternate);

 }
 
 
 }
 
 


@@ -986,7 +979,7 @@ raw:
     }
 
     if (buflen <= 0 ||
     }
 
     if (buflen <= 0 ||

-        (ct->c_termproc && (size_t) buflen <= strlen(ct->c_termproc))) {
+        (ct->c_termproc && buflen <= (ssize_t) strlen(ct->c_termproc))) {

        /* content_error would provide a more useful error message
         * here, except that if we got overrun, it probably would
         * too.
        /* content_error would provide a more useful error message
         * here, except that if we got overrun, it probably would
         * too.


@@ -1078,11 +1071,6 @@ show_external (CT ct, int serial, int alternate)
        return OK;
 
     return show_switch (p, serial, alternate);
        return OK;
 
     return show_switch (p, serial, alternate);

-
-#if 0
-    content_error (NULL, p, "don't know how to display content");
-    return NOTOK;
-#endif

 }
 
 
 }