Fix invalid pointer arithmetic.

[nmh] / sbr / ext_hook.c

diff --git a/sbr/ext_hook.c b/sbr/ext_hook.c
index befbd94b48c2dbd2ba30ef631a70322f8893a7b3..ac88ac7bea59669251c6e086178a23e0fe395f28 100644 (file)
--- a/sbr/ext_hook.c
+++ b/sbr/ext_hook.c
@@ -23,7 +23,7 @@ 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)) == NULL)
-       return (OK);
+       return OK;
 
     switch (pid = fork()) {
     case -1:
@@ -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,20 +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")) != NULL)
-                inform("%s", 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);
-    } else
-       return (OK);
+    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;
+    }
+
+    return NOTOK;
 }