X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2e45544e082577402083dec7e23089d74ac7d89f..94187a80bd60baab4b9c4b949ad820d730578123:/sbr/ext_hook.c diff --git a/sbr/ext_hook.c b/sbr/ext_hook.c index 7b94e57a..ac88ac7b 100644 --- a/sbr/ext_hook.c +++ b/sbr/ext_hook.c @@ -22,13 +22,13 @@ ext_hook(char *hook_name, char *message_file_name_1, char *message_file_name_2) static int did_message = 0; /* set if we've already output a message */ - if ((hook = context_find(hook_name)) == (char *)0) - return (OK); + if ((hook = context_find(hook_name)) == NULL) + return OK; switch (pid = fork()) { case -1: status = NOTOK; - advise(NULL, "external database may be out-of-date."); + inform("external database may be out-of-date."); break; case 0: @@ -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: @@ -46,22 +46,20 @@ ext_hook(char *hook_name, char *message_file_name_1, char *message_file_name_2) break; } - if (status != OK) { - if (did_message == 0) { - char *msghook; - if ((msghook = context_find("msg-hook")) != (char *)0) - advise(NULL, msghook); - else { - char errbuf[BUFSIZ]; - snprintf(errbuf, sizeof(errbuf), "external hook \"%s\"", hook); - pidstatus(status, stderr, errbuf); - } - did_message = 1; - } + if (status == OK) + return OK; - return (NOTOK); + if (did_message == 0) { + char *msghook; + if ((msghook = context_find("msg-hook")) != NULL) + inform("%s", msghook); + else { + char errbuf[BUFSIZ]; + snprintf(errbuf, sizeof(errbuf), "external hook \"%s\"", hook); + pidstatus(status, stderr, errbuf); + } + did_message = 1; } - else - return (OK); + return NOTOK; }