X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=slip.c;h=59978c98d87ea5a5704595d675532d4b87320d43;hb=4ac7fd3ff73c98100d8a8546668d0212e4af3ffa;hp=badbc5d0fe02b3ebacaaa43e0fc60817f716d526;hpb=45736f7396593c2f4ef9ebf35c561e7a32111f63;p=secnet.git diff --git a/slip.c b/slip.c index badbc5d..59978c9 100644 --- a/slip.c +++ b/slip.c @@ -231,19 +231,10 @@ static void userv_userv_callback(void *sst, pid_t pid, int status) return; } if (!st->expecting_userv_exit) { - if (WIFEXITED(status)) { - fatal("%s: userv exited unexpectedly with status %d", - st->slip.nl.name,WEXITSTATUS(status)); - } else if (WIFSIGNALED(status)) { - fatal("%s: userv exited unexpectedly: uncaught signal %d", - st->slip.nl.name,WTERMSIG(status)); - } else { - fatal("%s: userv stopped unexpectedly", - st->slip.nl.name); - } + lg_exitstatus(0,st->slip.nl.name,0, + st->expecting_userv_exit ? M_WARNING : M_FATAL, + status,"userv"); } - Message(M_WARNING,"%s: userv subprocess died with status %d\n", - st->slip.nl.name,WEXITSTATUS(status)); st->pid=0; }