X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6651e2804863b4d1444ce5b0c0bb959416c4e0ad..ef1ba39e8dae81091b6c3e73e72825ef6edea3c6:/uip/slocal.c?ds=sidebyside diff --git a/uip/slocal.c b/uip/slocal.c index 789a5977..772c4e2b 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; } } @@ -1165,7 +1164,7 @@ get_sender (char *envelope, char **sender) return; } - i = strlen ("From "); + i = LEN("From "); strncpy (buffer, envelope + i, sizeof(buffer)); if ((cp = strchr(buffer, '\n'))) { *cp = 0; @@ -1251,7 +1250,7 @@ you_lose: * and massage the headers. Save * a copy of the "From " line for later. */ - i = strlen ("From "); + i = LEN("From "); while (fgets (buffer, sizeof(buffer), qfp)) { if (first) { first = 0;