There's no need for killpg(). We can use kill() instead.

[mmh] / uip / slocal.c

diff --git a/uip/slocal.c b/uip/slocal.c
index eecd760..9865839 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -1096,7 +1096,7 @@ usr_folder(int fd, char *string)
        vec[1] = folder;
        vec[2] = NULL;
 
-       return usr_pipe(fd, "rcvstore", rcvstoreproc, vec, 1);
+       return usr_pipe(fd, "rcvstore", "rcvstore", vec, 1);
 }
 
 /*
@@ -1106,8 +1106,9 @@ static int
 usr_pipe(int fd, char *cmd, char *pgm, char **vec, int suppress)
 {
        pid_t child_id;
-       int bytes, seconds, status;
+       int bytes, seconds, status, n;
        struct stat st;
+       char *path;
 
        if (verbose && !suppress) {
                verbose_printf("delivering to pipe \"%s\"", cmd);
@@ -1132,7 +1133,9 @@ usr_pipe(int fd, char *cmd, char *pgm, char **vec, int suppress)
                if (fd != 3) {
                        dup2(fd, 3);
                }
-               closefds(4);
+               for (n=4; n<OPEN_MAX; n++) {
+                       close(n);
+               }
 
 #ifdef TIOCNOTTY
                if ((fd = open("/dev/tty", O_RDWR)) != -1) {
@@ -1144,10 +1147,12 @@ usr_pipe(int fd, char *cmd, char *pgm, char **vec, int suppress)
                /* put in own process group */
                setpgid((pid_t) 0, getpid());
 
+               path = getenv("PATH");
                *environ = NULL;
                m_putenv("USER", pw->pw_name);
                m_putenv("HOME", pw->pw_dir);
                m_putenv("SHELL", pw->pw_shell);
+               m_putenv("PATH", path);
 
                execvp(pgm, vec);
                _exit(-1);
@@ -1159,7 +1164,7 @@ usr_pipe(int fd, char *cmd, char *pgm, char **vec, int suppress)
                        ** Ruthlessly kill the child and anything
                        ** else in its process group.
                        */
-                       KILLPG(child_id, SIGKILL);
+                       kill(-child_id, SIGKILL);
                        if (verbose)
                                verbose_printf(", timed-out; terminated\n");
                        return -1;
@@ -1258,7 +1263,7 @@ copy_message(int qd, char *tmpfil, int fold)
        FILE *qfp, *ffp;
        char *tfile = NULL;
 
-       tfile = m_mktemp2(NULL, invo_name, &fd1, NULL);
+       tfile = m_mktemp2("/tmp/", invo_name, &fd1, NULL);
        if (tfile == NULL) return -1;
        fchmod(fd1, 0600);
        strncpy(tmpfil, tfile, BUFSIZ);