X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/fc31cece06f633567cbf4432e4ec5ab0402a5a20..1e424a2249aa6b911fd3be973de00cee413342eb:/uip/mhlsbr.c

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index ee045ea0..297d6df7 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);
@@ -614,7 +612,7 @@ mhl_format (char *file, int length, int width)
 		    int n = 0;
 
 		    /* split the fields */
-		    tmparray = brkstring (getcpy (++parptr), ",", NULL);
+		    tmparray = brkstring (mh_xstrdup(++parptr), ",", NULL);
 
 		    /* count number of fields split */
 		    p = tmparray;
@@ -645,14 +643,14 @@ mhl_format (char *file, int length, int width)
 		if (!c1->c_nfs && global.c_nfs) {
 		    if (c1->c_flags & DATEFMT) {
 			if (global.c_flags & DATEFMT) {
-			    c1->c_nfs = getcpy (global.c_nfs);
+			    c1->c_nfs = mh_xstrdup(global.c_nfs);
 			    compile_formatfield(c1);
 			}
 		    }
 		    else
 			if (c1->c_flags & ADDRFMT) {
 			    if (global.c_flags & ADDRFMT) {
-				c1->c_nfs = getcpy (global.c_nfs);
+				c1->c_nfs = mh_xstrdup(global.c_nfs);
 				compile_formatfield(c1);
 			    }
 			}
@@ -836,7 +834,7 @@ ptos (char *name, char **s)
     }
     c = *parptr;
     *parptr = 0;
-    *s = getcpy (cp);
+    *s = mh_xstrdup(cp);
     if ((*parptr = c) == '"')
 	parptr++;
     return 0;
@@ -904,7 +902,7 @@ process (char *folder, char *fname, int ofilen, int ofilec)
 	    } else {
 	    	filesize = 0;
 	    }
-	    cp = folder ? concat (folder, ":", fname2, NULL) : getcpy (fname2);
+	    cp = folder ? concat (folder, ":", fname2, NULL) : mh_xstrdup(fname2);
 	    if (ontty != PITTY)
 		SIGNAL (SIGINT, intrser);
 	    mhlfile (fp, cp, ofilen, ofilec);  /* FALL THROUGH! */
@@ -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: 
@@ -1190,8 +1186,8 @@ mcomp_format (struct mcomp *c1, struct mcomp *c2)
     while ((cp = getname (ap))) {
 	NEW0(p);
         if ((mp = getm (cp, NULL, 0, error, sizeof(error))) == NULL) {
-            p->pq_text = getcpy (cp);
-            p->pq_error = getcpy (error);
+            p->pq_text = mh_xstrdup(cp);
+            p->pq_error = mh_xstrdup(error);
         } else {
             p->pq_text = getcpy (mp->m_text);
             mnfree (mp);
@@ -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);
@@ -1243,12 +1237,12 @@ add_queue (struct mcomp **head, struct mcomp **tail, char *name, char *text, int
 
     NEW0(c1);
     c1->c_flags = flags & ~INIT;
-    if ((c1->c_name = name ? getcpy (name) : NULL))
+    if ((c1->c_name = name ? mh_xstrdup(name) : NULL))
         c1->c_flags |= mcomp_flags (c1->c_name);
-    c1->c_text = text ? getcpy (text) : NULL;
+    c1->c_text = text ? mh_xstrdup(text) : NULL;
     if (flags & INIT) {
         if (global.c_ovtxt)
-            c1->c_ovtxt = getcpy (global.c_ovtxt);
+            c1->c_ovtxt = mh_xstrdup(global.c_ovtxt);
         c1->c_offset = global.c_offset;
         c1->c_ovoff = global. c_ovoff;
         c1->c_width = c1->c_length = 0;
@@ -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;
@@ -1338,8 +1328,7 @@ 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);
+                *cp = toupper ((unsigned char) *cp);
 	putstr (c1->c_text ? c1->c_text : c1->c_name, c1->c_flags);
 	if (flag != BODYCOMP) {
 	    putstr (": ", c1->c_flags);
@@ -1361,8 +1350,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 	    && !(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);
+                *cp = toupper ((unsigned char) *cp);
 	putstr (c2->c_name, c1->c_flags);
 	putstr (": ", c1->c_flags);
 	if (!(c1->c_flags & SPLIT))
@@ -1375,8 +1363,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
     }
     if (c1->c_flags & UPPERCASE)
 	for (cp = c2->c_text; *cp; cp++)
-	    if (islower ((unsigned char) *cp))
-		*cp = toupper ((unsigned char) *cp);
+            *cp = toupper ((unsigned char) *cp);
 
     count = 0;
     if (cchdr) {