From: Ralph Corderoy Date: Mon, 18 Sep 2017 14:04:07 +0000 (+0100) Subject: Replace `_exit(-1)' with `_exit(1)'. X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/a5b2adde414330e1661db05d1ee5b1daeaa2476d?hp=a27d1ec492f69d93a13821a0f236f0691d8683a3 Replace `_exit(-1)' with `_exit(1)'. In line with other changes to limit a process's exit value to small non-negative integers distinguishable with sh's `$?'. --- diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c index 2f57483d..c7d95073 100644 --- a/mts/smtp/smtp.c +++ b/mts/smtp/smtp.c @@ -339,7 +339,7 @@ sendmail_init (char *client, int watch, int verbose, int debug, int sasl, execvp (sendmail, vec); fprintf (stderr, "unable to exec "); perror (sendmail); - _exit (-1); /* NOTREACHED */ + _exit(1); /* NOTREACHED */ default: SIGNAL (SIGPIPE, SIG_IGN); diff --git a/sbr/ext_hook.c b/sbr/ext_hook.c index f1a9a14a..ac88ac7b 100644 --- a/sbr/ext_hook.c +++ b/sbr/ext_hook.c @@ -38,7 +38,7 @@ ext_hook(char *hook_name, char *message_file_name_1, char *message_file_name_2) vec[vecp++] = NULL; execvp(program, vec); advise(program, "Unable to execute"); - _exit(-1); + _exit(1); /* NOTREACHED */ default: diff --git a/sbr/folder_delmsgs.c b/sbr/folder_delmsgs.c index 78fc516c..9addf7cc 100644 --- a/sbr/folder_delmsgs.c +++ b/sbr/folder_delmsgs.c @@ -75,7 +75,7 @@ folder_delmsgs (struct msgs *mp, int unlink_msgs, int nohook) execvp (prog, vec); fprintf (stderr, "unable to exec "); perror (rmmproc); - _exit (-1); + _exit(1); default: arglist_free(prog, vec); diff --git a/sbr/m_popen.c b/sbr/m_popen.c index 1fb0cfb4..9a1c1a5e 100644 --- a/sbr/m_popen.c +++ b/sbr/m_popen.c @@ -47,7 +47,7 @@ m_popen (char *name, int savestdout) execvp (file, arglist); fprintf (stderr, "unable to exec "); perror (name); - _exit (-1); + _exit(1); default: close (pd[0]); diff --git a/sbr/refile.c b/sbr/refile.c index ade07f6e..3c4d4e25 100644 --- a/sbr/refile.c +++ b/sbr/refile.c @@ -43,7 +43,7 @@ refile (char **arg, char *file) execvp (program, vec); fprintf (stderr, "unable to exec "); perror (fileproc); - _exit (-1); + _exit(1); default: arglist_free(program, vec); diff --git a/sbr/showfile.c b/sbr/showfile.c index 9b24ec64..9dfda7b6 100644 --- a/sbr/showfile.c +++ b/sbr/showfile.c @@ -54,7 +54,7 @@ showfile (char **arg, char *file) execvp (program, vec); fprintf (stderr, "unable to exec "); perror (lproc); - _exit (-1); + _exit(1); default: /* parent */ diff --git a/uip/forw.c b/uip/forw.c index ce8a4fcc..51caa0bc 100644 --- a/uip/forw.c +++ b/uip/forw.c @@ -540,7 +540,7 @@ mhl_draft (int out, char *digest, int volume, int issue, execvp (program, vec.msgs); fprintf (stderr, "unable to exec "); perror (mhlproc); - _exit (-1); + _exit(1); default: close (pd[1]); diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c index 3ae8edcb..ffec2d6d 100644 --- a/uip/mhbuildsbr.c +++ b/uip/mhbuildsbr.c @@ -1334,7 +1334,7 @@ raw: execvp ("/bin/sh", vec); fprintf (stderr, "unable to exec "); perror ("/bin/sh"); - _exit (-1); + _exit(1); /* NOTREACHED */ default: diff --git a/uip/mhn.c b/uip/mhn.c index 4a3b33a7..71034885 100644 --- a/uip/mhn.c +++ b/uip/mhn.c @@ -370,7 +370,7 @@ do_cache: execvp ("mhbuild", vec); fprintf (stderr, "unable to exec "); - _exit (-1); + _exit(1); } /* @@ -397,7 +397,7 @@ do_cache: execvp ("mhbuild", vec); fprintf (stderr, "unable to exec "); - _exit (-1); + _exit(1); } if (file && msgs.size) diff --git a/uip/mhparse.c b/uip/mhparse.c index 1b2d23f7..c49d31f5 100644 --- a/uip/mhparse.c +++ b/uip/mhparse.c @@ -2583,7 +2583,7 @@ openFTP (CT ct, char **file) execvp (ftp, vec); fprintf (stderr, "unable to exec "); perror (ftp); - _exit (-1); + _exit(1); /* NOTREACHED */ default: @@ -2716,7 +2716,7 @@ openMail (CT ct, char **file) execvp (mailproc, vec); fprintf (stderr, "unable to exec "); perror (mailproc); - _exit (-1); + _exit(1); /* NOTREACHED */ default: @@ -2844,7 +2844,7 @@ openURL (CT ct, char **file) execvp(program, args.msgs); fprintf(stderr, "Unable to exec "); perror(program); - _exit(-1); + _exit(1); /* NOTREACHED */ default: diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c index 512ea2f9..f0b5ef4e 100644 --- a/uip/mhshowsbr.c +++ b/uip/mhshowsbr.c @@ -227,7 +227,7 @@ DisplayMsgHeader (CT ct, char *form, int concatsw) execvp (file, vec); fprintf (stderr, "unable to exec "); perror (mhlproc); - _exit (-1); + _exit(1); /* NOTREACHED */ default: @@ -483,7 +483,7 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer, execvp (file, vec); fprintf (stderr, "unable to exec "); perror (buffer); - _exit (-1); + _exit(1); /* NOTREACHED */ default: { diff --git a/uip/post.c b/uip/post.c index 1a541e21..56ae555c 100644 --- a/uip/post.c +++ b/uip/post.c @@ -1537,7 +1537,7 @@ make_bcc_file (int dashstuff) execvp (program, vec); fprintf (stderr, "unable to exec "); perror (mhlproc); - _exit (-1); + _exit(1); default: pidXwait (child_id, mhlproc); @@ -2012,7 +2012,7 @@ fcc (char *file, char *folder) arglist[argp++] = fold; arglist[argp] = NULL; execvp (program, arglist); - _exit (-1); + _exit(1); default: if ((status = pidwait (child_id, OK))) { diff --git a/uip/rcvtty.c b/uip/rcvtty.c index 101aa5ab..2c66fa6f 100644 --- a/uip/rcvtty.c +++ b/uip/rcvtty.c @@ -230,11 +230,11 @@ message_fd (char **vec) /* child process */ rewind (stdin); if (dup2 (fd, 1) == NOTOK || dup2 (fd, 2) == NOTOK) - _exit (-1); + _exit(1); closefds (3); setpgid(0, getpid()); /* put in own process group */ if (execvp (vec[0], vec) == NOTOK) { - _exit (-1); + _exit(1); } return NOTOK; diff --git a/uip/replsbr.c b/uip/replsbr.c index afcf2ffc..f99b6d0c 100644 --- a/uip/replsbr.c +++ b/uip/replsbr.c @@ -470,7 +470,7 @@ replfilter (FILE *in, FILE *out, char *filter, int fmtproc) write(2, "\n", 1) < 0) { advise ("stderr", "write"); } - _exit (-1); + _exit(1); default: if (pidXwait (pid, mhl)) diff --git a/uip/sendsbr.c b/uip/sendsbr.c index 75a25ed4..371321c1 100644 --- a/uip/sendsbr.c +++ b/uip/sendsbr.c @@ -100,7 +100,7 @@ sendsbr (char **vec, int vecp, char *program, char *draft, struct stat *st, execvp(buildprogram, buildvec); fprintf(stderr, "unable to exec "); perror(buildmimeproc); - _exit(-1); + _exit(1); break; default: @@ -467,7 +467,7 @@ sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st) execvp (program, vec); fprintf (stderr, "unable to exec "); perror (postproc); - _exit (-1); + _exit(1); default: /* @@ -570,7 +570,7 @@ alert (char *file, int out) execvp (program, arglist); fprintf (stderr, "unable to exec "); perror (mailproc); - _exit (-1); + _exit(1); default: /* no waiting... */ break; diff --git a/uip/slocal.c b/uip/slocal.c index 6027eabd..6866a0b0 100644 --- a/uip/slocal.c +++ b/uip/slocal.c @@ -1091,7 +1091,7 @@ usr_pipe (int fd_arg, char *cmd, char *pgm, char **vec, int suppress) setenv("SHELL", pw->pw_shell, 1); execvp (pgm, vec); - _exit (-1); + _exit(1); default: /* parent process */ diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c index c27ee63d..98052e38 100644 --- a/uip/whatnowsbr.c +++ b/uip/whatnowsbr.c @@ -722,7 +722,7 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp, execvp (prog, vec); fprintf (stderr, "unable to exec "); perror (*ed); - _exit (-1); + _exit(1); default: if ((status = pidwait (pid, NOTOK))) { @@ -836,7 +836,7 @@ sendfile (char **arg, char *file, int pushsw) execvp (program, vec); fprintf (stderr, "unable to exec "); perror (sendproc); - _exit (-1); + _exit(1); default: if (pidwait(child_id, OK) == 0) @@ -1276,7 +1276,7 @@ whomfile (char **arg, char *file) execvp (program, vec); fprintf (stderr, "unable to exec "); perror (whomproc); - _exit (-1); /* NOTREACHED */ + _exit(1); /* NOTREACHED */ default: return pidwait(pid, NOTOK) & 0377 ? 1 : 0; diff --git a/uip/whom.c b/uip/whom.c index 00af980c..39a64703 100644 --- a/uip/whom.c +++ b/uip/whom.c @@ -202,5 +202,5 @@ main (int argc, char **argv) execvp (postproc, vec); fprintf (stderr, "unable to exec "); perror (postproc); - _exit (-1); + _exit(1); }