X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fext_hook.c;h=3693d8bc01e666b3d30c472ee6a91164043b4256;hp=e94083b337f73508fb343c9633ea832d67114e4d;hb=be582c44948fe09cba55e538f1c9e2f57edb11ad;hpb=5dd6771b28c257af405d7248639ed0e3bcdce38b

diff --git a/sbr/ext_hook.c b/sbr/ext_hook.c
index e94083b..3693d8b 100644
--- a/sbr/ext_hook.c
+++ b/sbr/ext_hook.c
@@ -1,61 +1,38 @@
 /*
- *
- *	Run a program that hooks into some other system.  The first argument is
- *	name of the hook to use, the second is the full path name of a mail message.
- *	The third argument is also the full path name of a mail message, or a NULL
- *	pointer if it isn't needed.  Look in the context for an error message if
- *	something goes wrong; there is a built-in message in case one isn't specified.
- *	Only produce the error message once.
- */
+** ext_hook.c -- Run a program that hooks into some other system.
+*/
 
 #include <h/mh.h>
 
+/*
+** The filename arguments are given full path names.
+** msg_filename2 might contain a NULL pointer if not needed.
+** Look in the context for an error message if something goes wrong;
+** there is a built-in message in case one isn't specified.
+** Only produces the error message once.
+*/
 int
-ext_hook(char *hook_name, char *message_file_name_1, char *message_file_name_2)
+ext_hook(char *hook_name, char *msg_filename1, char *msg_filename2)
 {
-    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 */
-
-    static  int	did_message = 0;	/* set if we've already output a message */
-
-    if ((hook = context_find(hook_name)) == (char *)0)
-	return (OK);
-
-    switch (pid = vfork()) {
-    case -1:
-	status = NOTOK;
-	advise(NULL, "external database may be out-of-date.");
-	break;
+	char *hook;  /* hook program from context */
+	int status;
 
-    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);
-	_exit(-1);
-	/* NOTREACHED */
+	static int did_message = 0;  /* we've already output a message */
 
-    default:
-	status = pidwait(pid, -1);
-	break;
-    }
-
-    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);
-	
-	    did_message = 1;
+	if (!(hook = context_find(hook_name))) {
+		return (OK);
+	}
+	status = execprogl(mhbasename(hook), mhbasename(hook),
+			msg_filename1, msg_filename2,
+			(char *)NULL);
+	if (status != OK) {
+		if (did_message) {
+			return (NOTOK);
+		}
+		advise(NULL, "external hook (%s) failed.", hook);
+		did_message = 1;
+		return (NOTOK);
+	} else {
+		return (OK);
 	}
-
-	return (NOTOK);
-    }
-
-    else
-	return (OK);
 }