X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/91fff561d7a49b85c148c2de4cd82610b32a9cec..ef1ba39e8dae81091b6c3e73e72825ef6edea3c6:/uip/mhlsbr.c

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index e948da94..02ba0bcc 100644
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -545,7 +545,7 @@ static void
 mhl_format (char *file, int length, int width)
 {
     int i;
-    char *bp, *cp, **ip;
+    char *bp, **ip;
     char *ap, name[NAMESZ];
     struct mcomp *c1;
     struct stat st;
@@ -560,8 +560,7 @@ mhl_format (char *file, int length, int width)
 		&& dev == st.st_dev
 		&& ino == st.st_ino)
 	    goto out;
-	else
-	    free_queue (&fmthd, &fmttl);
+        free_queue (&fmthd, &fmttl);
     }
 
     if ((fp = fopen (etcpath (file), "r")) == NULL)
@@ -591,8 +590,7 @@ mhl_format (char *file, int length, int width)
 	if (*bp == ';')
 	    continue;
 
-	if ((cp = strchr(bp, '\n')))
-	    *cp = 0;
+        TrimSuffixC(bp, '\n');
 
 	if (*bp == ':') {
 	    (void) add_queue (&fmthd, &fmttl, NULL, bp + 1, CLEARTEXT);
@@ -923,10 +921,8 @@ process (char *folder, char *fname, int ofilen, int ofilec)
 		SIGNAL (SIGINT, SIG_IGN);
 	    if (mhl_action == NULL && fp != stdin && fp != NULL)
 		fclose (fp);
-	    if (holder.c_text) {
-		free (holder.c_text);
-		holder.c_text = NULL;
-	    }
+            mh_xfree(holder.c_text);
+            holder.c_text = NULL;
 	    free_queue (&msghd, &msgtl);
 	    for (c1 = fmthd; c1; c1 = c1->c_next)
 		c1->c_flags &= ~HDROUTPUT;
@@ -990,7 +986,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
 			nmh_clear_screen ();
 		}
 		else
-		    printf ("\n");
+		    putchar('\n');
 		break;
 
 	    default: 
@@ -1223,12 +1219,10 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2)
 	}
 	charstring_free (scanl);
 
-	if (p->pq_text)
-	    free (p->pq_text);
-	if (p->pq_error)
-	    free (p->pq_error);
+        mh_xfree(p->pq_text);
+        mh_xfree(p->pq_error);
 	q = p->pq_next;
-	free ((char *) p);
+	free(p);
     }
 
     c2->c_text = add ("\n", c2->c_text);
@@ -1272,17 +1266,13 @@ free_queue (struct mcomp **head, struct mcomp **tail)
 
     for (c1 = *head; c1; c1 = c2) {
 	c2 = c1->c_next;
-	if (c1->c_name)
-	    free (c1->c_name);
-	if (c1->c_text)
-	    free (c1->c_text);
-	if (c1->c_ovtxt)
-	    free (c1->c_ovtxt);
-	if (c1->c_nfs)
-	    free (c1->c_nfs);
+        mh_xfree(c1->c_name);
+        mh_xfree(c1->c_text);
+        mh_xfree(c1->c_ovtxt);
+        mh_xfree(c1->c_nfs);
 	if (c1->c_fmt)
 	    fmt_free (c1->c_fmt, 0);
-	free ((char *) c1);
+	free(c1);
     }
 
     *head = *tail = NULL;
@@ -1292,14 +1282,15 @@ free_queue (struct mcomp **head, struct mcomp **tail)
 static void
 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;
     char *cp;
-    /*
-     * Create a copy of c1->c_text with trailing whitespace
-     * trimmed, for use with blank lines.
-     */
-    char *trimmed_prefix =
-	rtrim (add (c1->c_text ? c1->c_text : c1->c_name, NULL));
+
+    text = c1->c_text ? c1->c_text : c1->c_name;
+    /* Create a copy with trailing whitespace trimmed, for use with
+     * blank lines. */
+    trimmed_prefix = rtrim(add(text, NULL));
 
     cchdr = 0;
     lm = 0;
@@ -1328,7 +1319,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 	count = (c1->c_width ? c1->c_width : global.c_width)
 	    - c1->c_offset - strlen (c2->c_text);
 	if (!(c1->c_flags & HDROUTPUT) && !(c1->c_flags & NOCOMPONENT))
-	    count -= strlen (c1->c_text ? c1->c_text : c1->c_name) + 2;
+	    count -= strlen(text) + 2;
 	lm = c1->c_offset + (count / 2);
     } else {
 	if (c1->c_offset)
@@ -1337,18 +1328,15 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 
     if (!(c1->c_flags & HDROUTPUT) && !(c1->c_flags & NOCOMPONENT)) {
         if (c1->c_flags & UPPERCASE)		/* uppercase component also */
-	    for (cp = (c1->c_text ? c1->c_text : c1->c_name); *cp; cp++)
-	        if (islower ((unsigned char) *cp))
-		    *cp = toupper ((unsigned char) *cp);
-	putstr (c1->c_text ? c1->c_text : c1->c_name, c1->c_flags);
+            ToUpper(text);
+	putstr(text, c1->c_flags);
 	if (flag != BODYCOMP) {
 	    putstr (": ", c1->c_flags);
 	    if (!(c1->c_flags & SPLIT))
 		c1->c_flags |= HDROUTPUT;
 
 	cchdr++;
-	if ((count = c1->c_cwidth -
-		strlen (c1->c_text ? c1->c_text : c1->c_name) - 2) > 0)
+	if ((count = c1->c_cwidth - strlen(text) - 2) > 0)
 	    while (count--)
 		putstr (" ", c1->c_flags);
 	}
@@ -1360,9 +1348,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 	    && !(c2->c_flags & HDROUTPUT)
 	    && !(c2->c_flags & NOCOMPONENT)) {
         if (c1->c_flags & UPPERCASE)
-	    for (cp = c2->c_name; *cp; cp++)
-	        if (islower ((unsigned char) *cp))
-		    *cp = toupper ((unsigned char) *cp);
+            ToUpper(c2->c_name);
 	putstr (c2->c_name, c1->c_flags);
 	putstr (": ", c1->c_flags);
 	if (!(c1->c_flags & SPLIT))
@@ -1374,9 +1360,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 		putstr (" ", c1->c_flags);
     }
     if (c1->c_flags & UPPERCASE)
-	for (cp = c2->c_text; *cp; cp++)
-	    if (islower ((unsigned char) *cp))
-		*cp = toupper ((unsigned char) *cp);
+        ToUpper(c2->c_text);
 
     count = 0;
     if (cchdr) {
@@ -1385,7 +1369,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 			: (int) strlen (c2->c_name) + 2;
 	else
 	    count = (c1->c_cwidth >= 0) ? (size_t) c1->c_cwidth
-			: strlen (c1->c_text ? c1->c_text : c1->c_name) + 2;
+			: strlen(text) + 2;
     }
     count += c1->c_offset;
 
@@ -1401,7 +1385,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 	    /* Output component, trimming trailing whitespace if there
 	       is no text on the line. */
 	    if (*cp) {
-		putstr (c1->c_text ? c1->c_text : c1->c_name, c1->c_flags);
+		putstr(text, c1->c_flags);
 	    } else {
 		putstr (trimmed_prefix, c1->c_flags);
 	    }