uip/anno.c: Increase coverage.

[nmh] / sbr / ext_hook.c

diff --git a/sbr/ext_hook.c b/sbr/ext_hook.c
index e94083b337f73508fb343c9633ea832d67114e4d..186f77c38d095a555763c1173b5be936776f7a96 100644 (file)
--- a/sbr/ext_hook.c
+++ b/sbr/ext_hook.c
@@ -16,25 +16,28 @@ ext_hook(char *hook_name, char *message_file_name_1, char *message_file_name_2)
     char       *hook;                  /* hook program from context */
     pid_t      pid;                    /* ID of child process */
     int                status;                 /* exit or other child process status */
-    char       *vec[4];                /* argument vector for child process */
+    char       **vec;                  /* argument vector for child process */
+    int                vecp;                   /* Vector index */
+    char       *program;               /* Name of program to execute */
 
     static  int        did_message = 0;        /* set if we've already output a message */
 
-    if ((hook = context_find(hook_name)) == (char *)0)
+    if ((hook = context_find(hook_name)) == NULL)
        return (OK);
 
-    switch (pid = vfork()) {
+    switch (pid = fork()) {
     case -1:
        status = NOTOK;
        advise(NULL, "external database may be out-of-date.");
        break;
 
     case 0:
-       vec[0] = r1bindex(hook, '/');
-       vec[1] = message_file_name_1;
-       vec[2] = message_file_name_2;
-       vec[3] = (char *)0;
-       execvp(hook, vec);
+        vec = argsplit(hook, &program, &vecp);
+       vec[vecp++] = message_file_name_1;
+       vec[vecp++] = message_file_name_2;
+       vec[vecp++] = NULL;
+       execvp(program, vec);
+       advise(program, "Unable to execute");
        _exit(-1);
        /* NOTREACHED */
 
@@ -45,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")) != NULL)
+               advise(NULL, msghook);
+           else {
+               char errbuf[BUFSIZ];
+               snprintf(errbuf, sizeof(errbuf), "external hook \"%s\"", hook);
+               pidstatus(status, stderr, errbuf);
+           }
            did_message = 1;
        }