X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/b22a846ca4b5e21a3bc3b6d48cf3aa12f181ede0..5093cef6808539a5e3b279cabc41d55f1bb5ac71:/uip/slocal.c

diff --git a/uip/slocal.c b/uip/slocal.c
index 254744b2..70c16df1 100644
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -1125,16 +1125,15 @@ usr_pipe (int fd_arg, char *cmd, char *pgm, char **vec, int suppress)
 			    pidstatus (status, stdout, ", failed");
 		}
 		return (status == 0 ? 0 : -1);
-	    } else {
-		/*
-		 * Ruthlessly kill the child and anything
-		 * else in its process group.
-		 */
-		killpg(child_id, SIGKILL);
-		if (verbose)
-		    verbose_printf (", timed-out; terminated\n");
-		return -1;
 	    }
+            /*
+             * Ruthlessly kill the child and anything
+             * else in its process group.
+             */
+            killpg(child_id, SIGKILL);
+            if (verbose)
+                verbose_printf (", timed-out; terminated\n");
+            return -1;
     }
 }
 
@@ -1251,11 +1250,10 @@ you_lose:
      * and massage the headers.  Save
      * a copy of the "From " line for later.
      */
-    i = LEN("From ");
     while (fgets (buffer, sizeof(buffer), qfp)) {
 	if (first) {
 	    first = 0;
-	    if (!strncmp (buffer, "From ", i)) {
+	    if (HasPrefix(buffer, "From ")) {
 		/* get copy of envelope information ("From " line) */
 		envelope = mh_xstrdup(buffer);
 
@@ -1374,7 +1372,7 @@ adorn (char *what, char *fmt, ...)
 	    fprintf (stdout, "Error %d", eindex);
     }
 
-    fputc ('\n', stdout);
+    putchar('\n');
     fflush (stdout);
 }