Rename local enum to avoid clashing with NEW() macro.

[nmh] / sbr / ext_hook.c

diff --git a/sbr/ext_hook.c b/sbr/ext_hook.c
index a86e7a3f598ebb31b84513922f5ecd5bf1eadd6a..7b94e57a5cb194029b831aad7f1e0c26b4df04d1 100644 (file)
--- a/sbr/ext_hook.c
+++ b/sbr/ext_hook.c
@@ -25,7 +25,7 @@ ext_hook(char *hook_name, char *message_file_name_1, char *message_file_name_2)
     if ((hook = context_find(hook_name)) == (char *)0)
        return (OK);
 
-    switch (pid = vfork()) {
+    switch (pid = fork()) {
     case -1:
        status = NOTOK;
        advise(NULL, "external database may be out-of-date.");
@@ -37,6 +37,7 @@ ext_hook(char *hook_name, char *message_file_name_1, char *message_file_name_2)
        vec[vecp++] = message_file_name_2;
        vec[vecp++] = NULL;
        execvp(program, vec);
+       advise(program, "Unable to execute");
        _exit(-1);
        /* NOTREACHED */
 
@@ -47,11 +48,14 @@ ext_hook(char *hook_name, char *message_file_name_1, char *message_file_name_2)
 
     if (status != OK) {
        if (did_message == 0) {
-           if ((hook = context_find("msg-hook")) != (char *)0)
-               advise(NULL, hook);
-           else
-               advise(NULL, "external hook (%s) did not work properly.", hook);
-       
+           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;
        }