X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/64a40afc7d83e7b1280905fce7bdfd3a2ec7f01a..0b7286788a95dd854d1826b8493eda431d8e8aac:/uip/mhlsbr.c

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index d21c71c2..8224980e 100644
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -5,12 +5,20 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/signals.h>
-#include <h/addrsbr.h>
-#include <h/fmt_scan.h>
-#include <h/tws.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "sbr/brkstring.h"
+#include "sbr/ambigsw.h"
+#include "sbr/pidstatus.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/arglist.h"
+#include "sbr/error.h"
+#include "h/signals.h"
+#include "h/addrsbr.h"
+#include "h/fmt_scan.h"
+#include "h/tws.h"
+#include "h/done.h"
+#include "h/utils.h"
 #include "sbr/m_popen.h"
 #include <setjmp.h>
 #include <sys/types.h>
@@ -259,9 +267,9 @@ static char *addrcomps[] = {
 static int bellflg   = 0;
 static int clearflg  = 0;
 static int dashstuff = 0;
-static int dobody    = 1;
-static int forwflg   = 0;
-static int forwall   = 0;
+static bool dobody = true;
+static bool forwflg;
+static bool forwall;
 
 static int sleepsw = NOTOK;
 
@@ -270,7 +278,7 @@ static int volume = 0;
 static int issue = 0;
 
 static int exitstat = 0;
-static int mhldebug = 0;
+static bool mhldebug;
 
 static int filesize = 0;
 
@@ -337,7 +345,8 @@ static void compile_filterargs (void);
 int
 mhl (int argc, char **argv)
 {
-    int length = 0, nomore = 0;
+    int length = 0;
+    bool nomore = false;
     unsigned int i, vecp = 0;
     int width = 0;
     char *cp, *folder = NULL, *form = NULL;
@@ -351,7 +360,7 @@ mhl (int argc, char **argv)
     argp = arguments;
 
     if ((cp = getenv ("MHLDEBUG")) && *cp)
-	mhldebug++;
+	mhldebug = true;
 
     while ((cp = *argp++)) {
 	if (*cp == '-') {
@@ -404,7 +413,7 @@ mhl (int argc, char **argv)
 			mhladios (NULL, "missing argument to %s", argp[-2]);
 		    continue;
 		case NPROGSW:
-		    nomore++;
+		    nomore = true;
 		    continue;
 
 		case FMTPROCSW:
@@ -446,10 +455,10 @@ mhl (int argc, char **argv)
 		    continue;
 
 		case FORW2SW: 
-		    forwall++;
+		    forwall = true;
 		    /* FALLTHRU */
 		case FORW1SW: 
-		    forwflg++;
+		    forwflg = true;
 		    clearflg = -1;/* XXX */
 		    continue;
 
@@ -461,7 +470,7 @@ mhl (int argc, char **argv)
 		    continue;
 
 		case NBODYSW: 
-		    dobody = 0;
+		    dobody = false;
 		    continue;
 	    }
 	}
@@ -932,7 +941,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
 	if (digest)
 	    fputs(ofilen == 1 ? delim3 : delim4, stdout);
 	else {
-	    printf ("\n-------");
+	    fputs("\n-------", stdout);
 	    if (ofilen == 1)
 		printf (" Forwarded Message%s", PLURALS(ofilec));
 	    else
@@ -1266,7 +1275,8 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 {
     char *text; /* c1's text, or the name as a fallback. */
     char *trimmed_prefix;
-    int count, cchdr;
+    int count;
+    bool cchdr;
     char *cp;
     const int utf8 = strcasecmp(get_charset(), "UTF-8") == 0;
 
@@ -1281,7 +1291,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
      * blank lines. */
     trimmed_prefix = rtrim(mh_xstrdup(FENDNULL(text)));
 
-    cchdr = 0;
+    cchdr = false;
     lm = 0;
     llim = c1->c_length ? c1->c_length : -1;
     wid = c1->c_width ? c1->c_width : global.c_width;
@@ -1324,7 +1334,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 	    if (!(c1->c_flags & SPLIT))
 		c1->c_flags |= HDROUTPUT;
 
-	cchdr++;
+	cchdr = true;
 	if ((count = c1->c_cwidth - strlen(text) - 2) > 0)
 	    while (count--)
 		putstr (" ", c1->c_flags);
@@ -1343,7 +1353,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 	if (!(c1->c_flags & SPLIT))
 	    c2->c_flags |= HDROUTPUT;
 
-	cchdr++;
+	cchdr = true;
 	if ((count = c1->c_cwidth - strlen (c2->c_name) - 2) > 0)
 	    while (count--)
 		putstr (" ", c1->c_flags);
@@ -1396,7 +1406,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 static char *
 oneline (char *stuff, unsigned long flags)
 {
-    int spc;
+    bool spc;
     char *cp, *ret;
 
     if (onelp == NULL)
@@ -1407,7 +1417,7 @@ oneline (char *stuff, unsigned long flags)
     ret = onelp;
     term = 0;
     if (flags & COMPRESS) {
-	for (spc = 1, cp = ret; *onelp; onelp++)
+	for (spc = true, cp = ret; *onelp; onelp++)
 	    if (isspace ((unsigned char) *onelp)) {
 		if (*onelp == '\n' && (!onelp[1] || (flags & ADDRFMT))) {
 		    term = '\n';
@@ -1416,12 +1426,12 @@ oneline (char *stuff, unsigned long flags)
 		}
                 if (!spc) {
                     *cp++ = ' ';
-                    spc++;
+                    spc = true;
                 }
 	    }
 	    else {
 		*cp++ = *onelp;
-		spc = 0;
+		spc = false;
 	    }
 
 	*cp = 0;
@@ -1593,7 +1603,8 @@ putch (char ch, unsigned long flags)
  * Either way, the result depends on ASCII LF, either from typing Enter
  * or an escaped Ctrl-J, being amongst the read characters.
  */
-static bool linefeed_typed(void)
+static bool
+linefeed_typed(void)
 {
     char buf[128];
     ssize_t n;
@@ -1741,11 +1752,11 @@ filterbody (struct mcomp *c1, char *buf, int bufsz, int state,
      */
 
     if (pipe(fdinput) < 0) {
-	adios(NULL, "Unable to create input pipe");
+	die("Unable to create input pipe");
     }
 
     if (pipe(fdoutput) < 0) {
-    	adios(NULL, "Unable to create output pipe");
+    	die("Unable to create output pipe");
     }
 
     /*
@@ -1800,7 +1811,7 @@ filterbody (struct mcomp *c1, char *buf, int bufsz, int state,
 	 */
 	_exit(0);
     case -1:
-    	adios(NULL, "Unable to fork for filter writer process");
+    	die("Unable to fork for filter writer process");
 	break;
     }
 
@@ -1875,7 +1886,7 @@ filterbody (struct mcomp *c1, char *buf, int bufsz, int state,
 	break;
 
     case -1:
-    	adios(NULL, "Unable to fork format program");
+    	die("Unable to fork format program");
     }
 
     /*
@@ -1898,7 +1909,7 @@ filterbody (struct mcomp *c1, char *buf, int bufsz, int state,
     }
 
     if (cc < 0) {
-    	adios(NULL, "reading from formatproc");
+    	die("reading from formatproc");
     }
 
     /*