X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/49c748c77f3c9b9ea024c4eb5d1d83855d7e7201..0c50c669:/uip/mhlsbr.c?ds=sidebyside

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 6babf510..6a1c3db7 100644
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -14,9 +14,6 @@
 #include <h/tws.h>
 #include <h/utils.h>
 #include <setjmp.h>
-#include <signal.h>
-#include <errno.h>
-#include <sys/wait.h>
 #include <sys/types.h>
 
 /*
@@ -481,7 +478,7 @@ mhl (int argc, char **argv)
 	folder = getenv ("mhfolder");
 
     if (isatty (fileno (stdout))) {
-	if (!nomore && !sc_hardcopy() && moreproc && *moreproc != '\0') {
+	if (!nomore && moreproc && *moreproc != '\0') {
 	    if (mhl_action) {
 		SIGNAL (SIGINT, SIG_IGN);
 		SIGNAL2 (SIGQUIT, quitser);
@@ -534,7 +531,7 @@ mhl (int argc, char **argv)
     }
     
     if (clearflg > 0 && ontty == NOTTY)
-	clear_screen ();
+	nmh_clear_screen ();
 
     if (ontty == PITTY)
 	m_pclose ();
@@ -611,7 +608,7 @@ mhl_format (char *file, int length, int width)
 		 * Split this list of fields to ignore, and copy
 		 * it to the end of the current "ignores" list.
 		 */
-		if (!mh_strcasecmp (name, "ignores")) {
+		if (!strcasecmp (name, "ignores")) {
 		    char **tmparray, **p;
 		    int n = 0;
 
@@ -720,17 +717,17 @@ evalvar (struct mcomp *c1)
 	return 0;
     strncpy (name, parse(), sizeof(name));
 
-    if (!mh_strcasecmp (name, "component")) {
+    if (!strcasecmp (name, "component")) {
 	if (ptos (name, &c1->c_text))
 	    return 1;
 	c1->c_flags &= ~NOCOMPONENT;
 	return 0;
     }
 
-    if (!mh_strcasecmp (name, "overflowtext"))
+    if (!strcasecmp (name, "overflowtext"))
 	return ptos (name, &c1->c_ovtxt);
 
-    if (!mh_strcasecmp (name, "formatfield")) {
+    if (!strcasecmp (name, "formatfield")) {
 	if (ptos (name, &cp))
 	    return 1;
 	c1->c_nfs = getcpy (new_fs (NULL, NULL, cp));
@@ -739,40 +736,40 @@ evalvar (struct mcomp *c1)
 	return 0;
     }
 
-    if (!mh_strcasecmp (name, "decode")) {
+    if (!strcasecmp (name, "decode")) {
 	c1->c_nfs = getcpy (new_fs (NULL, NULL, "%(decode{text})"));
 	compile_formatfield(c1);
 	c1->c_flags |= FORMAT;
 	return 0;
     }
 
-    if (!mh_strcasecmp (name, "offset"))
+    if (!strcasecmp (name, "offset"))
 	return ptoi (name, &c1->c_offset);
-    if (!mh_strcasecmp (name, "overflowoffset"))
+    if (!strcasecmp (name, "overflowoffset"))
 	return ptoi (name, &c1->c_ovoff);
-    if (!mh_strcasecmp (name, "width"))
+    if (!strcasecmp (name, "width"))
 	return ptoi (name, &c1->c_width);
-    if (!mh_strcasecmp (name, "compwidth"))
+    if (!strcasecmp (name, "compwidth"))
 	return ptoi (name, &c1->c_cwidth);
-    if (!mh_strcasecmp (name, "length"))
+    if (!strcasecmp (name, "length"))
 	return ptoi (name, &c1->c_length);
-    if (!mh_strcasecmp (name, "nodashstuffing"))
+    if (!strcasecmp (name, "nodashstuffing"))
 	return (dashstuff = -1);
 
     for (ap = triples; ap->t_name; ap++)
-	if (!mh_strcasecmp (ap->t_name, name)) {
+	if (!strcasecmp (ap->t_name, name)) {
 	    c1->c_flags |= ap->t_on;
 	    c1->c_flags &= ~ap->t_off;
 	    return 0;
 	}
 
-   if (!mh_strcasecmp (name, "formatarg")) {
+   if (!strcasecmp (name, "formatarg")) {
 	struct arglist *args;
 
 	if (ptos (name, &cp))
 	    return 1;
 
-	if (mh_strcasecmp (c1->c_name, "body")) {
+	if (! c1->c_name  ||  strcasecmp (c1->c_name, "body")) {
 	    advise (NULL, "format filters are currently only supported on "
 	    	    "the \"body\" component");
 	    return 1;
@@ -880,6 +877,8 @@ process (char *folder, char *fname, int ofilen, int ofilec)
     struct mcomp *c1;
     struct stat st;
     struct arglist *ap;
+    /* volatile to prevent "might be clobbered" warning from gcc: */
+    char *volatile fname2 = fname ? fname : "(stdin)";
 
     switch (setjmp (env)) {
 	case OK: 
@@ -891,7 +890,6 @@ process (char *folder, char *fname, int ofilen, int ofilec)
 		    return;
 		}
 	    } else {
-		fname = "(stdin)";
 		fp = stdin;
 	    }
 	    if (fstat(fileno(fp), &st) == 0) {
@@ -899,7 +897,7 @@ process (char *folder, char *fname, int ofilen, int ofilec)
 	    } else {
 	    	filesize = 0;
 	    }
-	    cp = folder ? concat (folder, ":", fname, NULL) : getcpy (fname);
+	    cp = folder ? concat (folder, ":", fname2, NULL) : getcpy (fname2);
 	    if (ontty != PITTY)
 		SIGNAL (SIGINT, intrser);
 	    mhlfile (fp, cp, ofilen, ofilec);  /* FALL THROUGH! */
@@ -958,7 +956,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
 		if (ofilec > 1) {
 		    if (ofilen > 1) {
 			if ((global.c_flags & CLEARSCR))
-			    clear_screen ();
+			    nmh_clear_screen ();
 			else
 			    printf ("\n\n\n");
 		    }
@@ -980,7 +978,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
 		}
 		if (strchr(buf, '\n')) {
 		    if ((global.c_flags & CLEARSCR))
-			clear_screen ();
+			nmh_clear_screen ();
 		}
 		else
 		    printf ("\n");
@@ -991,7 +989,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
 		    if (ofilen > 1) {
 			printf ("\n\n\n");
 			if (clearflg > 0)
-			    clear_screen ();
+			    nmh_clear_screen ();
 		    }
 		    printf (">>> %s\n\n", mname);
 		}
@@ -1006,7 +1004,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
 	    case FLDPLUS: 
 	        bucket = fmt_addcomptext(name, buf);
 		for (ip = ignores; *ip; ip++)
-		    if (!mh_strcasecmp (name, *ip)) {
+		    if (!strcasecmp (name, *ip)) {
 			while (state == FLDPLUS) {
 			    bufsz = sizeof buf;
 			    state = m_getfld (&gstate, name, buf, &bufsz, fp);
@@ -1018,12 +1016,13 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
 		    continue;
 
 		for (c2 = fmthd; c2; c2 = c2->c_next)
-		    if (!mh_strcasecmp (c2->c_name, name))
+		    if (!strcasecmp (c2->c_name ? c2->c_name : "", name))
 			break;
 		c1 = NULL;
 		if (!((c3 = c2 ? c2 : &global)->c_flags & SPLIT))
 		    for (c1 = msghd; c1; c1 = c1->c_next)
-			if (!mh_strcasecmp (c1->c_name, c3->c_name)) {
+			if (!strcasecmp (c1->c_name ? c1->c_name : "",
+					 c3->c_name ? c3->c_name : "")) {
 			    c1->c_text =
 				mcomp_add (c1->c_flags, buf, c1->c_text);
 			    break;
@@ -1048,7 +1047,8 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
 			putcomp (c1, c1, ONECOMP);
 			continue;
 		    }
-		    if (!mh_strcasecmp (c1->c_name, "messagename")) {
+		    if (!c1->c_name  ||
+			!strcasecmp (c1->c_name, "messagename")) {
 			holder.c_text = concat ("(Message ", mname, ")\n",
 					    NULL);
 			putcomp (c1, &holder, ONECOMP);
@@ -1056,13 +1056,14 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
 			holder.c_text = NULL;
 			continue;
 		    }
-		    if (!mh_strcasecmp (c1->c_name, "extras")) {
+		    if (!c1->c_name  ||  !strcasecmp (c1->c_name, "extras")) {
 			for (c2 = msghd; c2; c2 = c2->c_next)
 			    if (c2->c_flags & EXTRA)
 				putcomp (c1, c2, TWOCOMP);
 			continue;
 		    }
-		    if (dobody && !mh_strcasecmp (c1->c_name, "body")) {
+		    if (dobody && (!c1->c_name  ||
+				   !strcasecmp (c1->c_name, "body"))) {
 		    	if (c1->c_flags & FMTFILTER && state == BODY &&
 							formatproc != NULL) {
 			    filterbody(c1, buf, sizeof(buf), state, fp, gstate);
@@ -1081,7 +1082,8 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
 			continue;
 		    }
 		    for (c2 = msghd; c2; c2 = c2->c_next)
-			if (!mh_strcasecmp (c2->c_name, c1->c_name)) {
+			if (!strcasecmp (c2->c_name ? c2->c_name : "",
+					 c1->c_name ? c1->c_name : "")) {
 			    putcomp (c1, c2, ONECOMP);
 			    if (!(c1->c_flags & SPLIT))
 				break;
@@ -1110,7 +1112,7 @@ mcomp_flags (char *name)
     struct pair *ap;
 
     for (ap = pairs; ap->p_name; ap++)
-	if (!mh_strcasecmp (ap->p_name, name))
+	if (!strcasecmp (ap->p_name, name))
 	    return (ap->p_flags);
 
     return 0;
@@ -1164,7 +1166,8 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2)
 	    if (!cp[1])
 		*cp = 0;
 
-	fmt_scan (c1->c_fmt, buffer, sizeof buffer - 1, sizeof buffer - 1, dat);
+	fmt_scan (c1->c_fmt, buffer, sizeof buffer - 1, sizeof buffer - 1,
+		  dat, NULL);
 	/* Don't need to append a newline, dctime() already did */
 	c2->c_text = getcpy (buffer);
 
@@ -1177,7 +1180,7 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2)
 	if ((p = (struct pqpair *) calloc ((size_t) 1, sizeof(*p))) == NULL)
 	    adios (NULL, "unable to allocate pqpair memory");
 
-	if ((mp = getm (cp, NULL, 0, AD_NAME, error)) == NULL) {
+	if ((mp = getm (cp, NULL, 0, error, sizeof(error))) == NULL) {
 	    p->pq_text = getcpy (cp);
 	    p->pq_error = getcpy (error);
 	} else {
@@ -1197,7 +1200,8 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2)
 	    p->pq_error = NULL;
 	}
 
-	fmt_scan (c1->c_fmt, buffer, sizeof buffer - 1, sizeof buffer - 1, dat);
+	fmt_scan (c1->c_fmt, buffer, sizeof buffer - 1, sizeof buffer - 1,
+		  dat, NULL);
 	if (*buffer) {
 	    if (c2->c_text)
 		c2->c_text = add (",\n", c2->c_text);
@@ -1481,7 +1485,7 @@ putch (char ch, long flags)
 	    read (fileno (stdout), buf, sizeof(buf));
 	    if (strchr(buf, '\n')) {
 		if (global.c_flags & CLEARSCR)
-		    clear_screen ();
+		    nmh_clear_screen ();
 		row = 0;
 	    } else {
 		putchar ('\n');
@@ -1848,7 +1852,6 @@ filterbody (struct mcomp *c1, char *buf, int bufsz, int state, FILE *fp,
 	 * buffers that we have duplicated from the parent.
 	 */
 	_exit(0);
-	break;
     case -1:
     	adios(NULL, "Unable to fork for filter writer process");
 	break;
@@ -1883,7 +1886,7 @@ filterbody (struct mcomp *c1, char *buf, int bufsz, int state, FILE *fp,
 
 	for (a = arglist_head, i = argp; a != NULL; a = a->a_next, i++) {
 	    args[i] = mh_xmalloc(BUFSIZ);
-	    fmt_scan(a->a_fmt, args[i], BUFSIZ - 1, BUFSIZ, dat);
+	    fmt_scan(a->a_fmt, args[i], BUFSIZ - 1, BUFSIZ, dat, NULL);
 	    /*
 	     * fmt_scan likes to put a trailing newline at the end of the
 	     * format string.  If we have one, get rid of it.