X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a5b2adde414330e1661db05d1ee5b1daeaa2476d..394a751fd883d2bbfc769fed7e254e008a2ef45e:/uip/mhshowsbr.c

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index f0b5ef4e..909506e0 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -5,16 +5,25 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
+#include "h/mh.h"
+#include "sbr/concat.h"
+#include "sbr/trimcpy.h"
+#include "sbr/check_charset.h"
+#include "sbr/getcpy.h"
+#include "sbr/context_find.h"
+#include "sbr/pidstatus.h"
+#include "sbr/arglist.h"
+#include "sbr/error.h"
 #include <fcntl.h>
-#include <h/signals.h>
-#include <h/md5.h>
-#include <h/mts.h>
-#include <h/tws.h>
-#include <h/mime.h>
-#include <h/mhparse.h>
-#include <h/fmt_scan.h>
-#include <h/utils.h>
+#include "h/signals.h"
+#include "h/md5.h"
+#include "h/mts.h"
+#include "h/tws.h"
+#include "h/mime.h"
+#include "h/mhparse.h"
+#include "h/fmt_scan.h"
+#include "h/done.h"
+#include "h/utils.h"
 #include "mhmisc.h"
 #include "mhshowsbr.h"
 #include "sbr/m_mktemp.h"
@@ -100,7 +109,7 @@ show_all_messages(CT *cts, int concat, int textonly, int inlineonly)
      * for showing headers of MIME messages.
      */
     if (!formsw)
-	formsw = getcpy (etcpath ("mhl.headers"));
+	formsw = mh_xstrdup(etcpath("mhl.headers"));
 
     /*
      * Compile the content marker and header format lines
@@ -431,7 +440,7 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer,
 	}
 
 	while ((cc = read(fd, readbuf, sizeof(readbuf))) > 0) {
-	    if ((ssize_t) fwrite(readbuf, sizeof(char), cc, stdout) < cc) {
+	    if ((ssize_t) fwrite(readbuf, 1, cc, stdout) < cc) {
 		advise ("putline", "fwrite");
 	    }
 	    lastchar = readbuf[cc - 1];
@@ -581,9 +590,9 @@ show_multi_internal (CT ct, int alternate, int concatsw, int textonly,
     int	alternating, nowalternate, result;
     struct multipart *m = (struct multipart *) ct->c_ctparams;
     struct part *part;
-    int request_matched;
-    int display_success;
-    int mult_alt_done;
+    bool request_matched;
+    bool display_success;
+    bool mult_alt_done;
     int ret;
     CT p;
 
@@ -601,9 +610,9 @@ show_multi_internal (CT ct, int alternate, int concatsw, int textonly,
      */
 
     result = NOTOK;
-    request_matched = 0;
-    display_success = 0;
-    mult_alt_done = 0;
+    request_matched = false;
+    display_success = false;
+    mult_alt_done = false;
 
     for (part = m->mp_parts; part; part = part->mp_next) {
 	p = part->mp_part;
@@ -624,7 +633,7 @@ show_multi_internal (CT ct, int alternate, int concatsw, int textonly,
 				      inlineonly, fmt);
 	    switch (inneresult) {
 		case NOTOK:  /* hard display error */
-		    request_matched = 1;
+		    request_matched = true;
 		    if (alternate && !alternating) {
 			result = NOTOK;
 			goto out;
@@ -635,8 +644,8 @@ show_multi_internal (CT ct, int alternate, int concatsw, int textonly,
 		    continue;
 
 		case OK:  /* display successful */
-		    request_matched = 1;
-		    display_success = 1;
+		    request_matched = true;
+		    display_success = true;
 		    result = OK;
 
 		    /* if we got success on a sub-part of
@@ -644,7 +653,7 @@ show_multi_internal (CT ct, int alternate, int concatsw, int textonly,
 		     * there's a chance an explicit part should be
 		     * matched later in the alternatives.  */
 		    if (alternating) {
-			mult_alt_done = 1;
+			mult_alt_done = true;
 		    } else if (alternate) {
 			alternate = nowalternate = 0;
 		    }
@@ -790,8 +799,10 @@ show_external (CT ct, int alternate, int concatsw, int textonly, int inlineonly,
 static int
 parse_display_string (CT ct, char *cp, int *xstdin, int *xlist,
                       char *file, char *buffer, size_t buflen,
-                      int multipart) {
-    int len, quoted = 0;
+                      int multipart)
+{
+    int len;
+    bool quoted = false;
     char *bp = buffer, *pp;
     CI ci = &ct->c_ctinfo;
 
@@ -962,7 +973,7 @@ parse_display_string (CT ct, char *cp, int *xstdin, int *xlist,
 		    *pp++ = '\'';
 		    buflen--;
 		    bp++;
-		    quoted = 1;
+		    quoted = true;
 		}
 		/* Escape existing quotes */
 		while ((pp = strchr (pp, '\'')) && buflen > 3) {
@@ -977,7 +988,7 @@ parse_display_string (CT ct, char *cp, int *xstdin, int *xlist,
 			*pp++ = '\'';
 			buflen -= 2;
 			bp += 2;
-			quoted = 0;
+			quoted = false;
 		    } else {
 			/* Not quoted.  This should not be reached with
 			   the current code, but handle the condition
@@ -1016,7 +1027,7 @@ parse_display_string (CT ct, char *cp, int *xstdin, int *xlist,
 		    if (! found_quote) {
 			*bp++ = '\'';
 			buflen--;
-			quoted = 0;
+			quoted = false;
 		    }
 		}
 	    }
@@ -1054,7 +1065,8 @@ raw:
 
 
 int
-convert_charset (CT ct, char *dest_charset, int *message_mods) {
+convert_charset (CT ct, char *dest_charset, int *message_mods)
+{
     char *src_charset = content_charset (ct);
     int status = OK;
 
@@ -1067,7 +1079,7 @@ convert_charset (CT ct, char *dest_charset, int *message_mods) {
         FILE **fp = NULL;
         size_t begin;
         size_t end;
-        int opened_input_file = 0;
+        bool opened_input_file = false;
         char src_buffer[BUFSIZ];
 	size_t dest_buffer_size = BUFSIZ;
 	char *dest_buffer = mh_xmalloc(dest_buffer_size);
@@ -1083,7 +1095,7 @@ convert_charset (CT ct, char *dest_charset, int *message_mods) {
         }
 
         if ((tempfile = m_mktemp2 (NULL, invo_name, &fd, NULL)) == NULL) {
-            adios (NULL, "unable to create temporary file in %s",
+            die("unable to create temporary file in %s",
                    get_temp_dir());
         }
         dest = mh_xstrdup(tempfile);
@@ -1105,7 +1117,7 @@ convert_charset (CT ct, char *dest_charset, int *message_mods) {
                     advise (*file, "unable to open for reading");
                     status = NOTOK;
                 } else {
-                    opened_input_file = 1;
+                    opened_input_file = true;
                 }
             }
         }
@@ -1250,7 +1262,8 @@ iconv_start:
 
 
 static int
-convert_content_charset (CT ct, char **file) {
+convert_content_charset (CT ct, char **file)
+{
     int status = OK;
 
 #ifdef HAVE_ICONV