BSD 4_4 release

[unix-history] / usr / src / usr.bin / mail / popen.c

diff --git a/usr/src/usr.bin/mail/popen.c b/usr/src/usr.bin/mail/popen.c
index 623801e..467d24a 100644 (file)
--- a/usr/src/usr.bin/mail/popen.c
+++ b/usr/src/usr.bin/mail/popen.c
@@ -1,51 +1,95 @@
 /*
 /*

- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)popen.c    5.15 (Berkeley) %G%";
+static char sccsid[] = "@(#)popen.c    8.1 (Berkeley) 6/6/93";

 #endif /* not lint */
 
 #include "rcv.h"
 #endif /* not lint */
 
 #include "rcv.h"

-#include <sys/signal.h>

 #include <sys/wait.h>
 #include <sys/wait.h>

+#include <fcntl.h>
+#include "extern.h"

 
 #define READ 0
 #define WRITE 1
 
 #define READ 0
 #define WRITE 1

-static int *pid;

 
 struct fp {
        FILE *fp;
        int pipe;
 
 struct fp {
        FILE *fp;
        int pipe;

+       int pid;

        struct fp *link;
 };
 static struct fp *fp_head;
 
        struct fp *link;
 };
 static struct fp *fp_head;
 

+struct child {
+       int pid;
+       char done;
+       char free;
+       union wait status;
+       struct child *link;
+};
+static struct child *child;
+static struct child *findchild __P((int));
+static void delchild __P((struct child *));
+

 FILE *
 Fopen(file, mode)
        char *file, *mode;
 {
        FILE *fp;
 
 FILE *
 Fopen(file, mode)
        char *file, *mode;
 {
        FILE *fp;
 

-       if ((fp = fopen(file, mode)) != NULL)
-               register_file(fp, 0);
+       if ((fp = fopen(file, mode)) != NULL) {
+               register_file(fp, 0, 0);
+               (void) fcntl(fileno(fp), F_SETFD, 1);
+       }

        return fp;
 }
 
 FILE *
 Fdopen(fd, mode)
        return fp;
 }
 
 FILE *
 Fdopen(fd, mode)

+       int fd;

        char *mode;
 {
        FILE *fp;
 
        char *mode;
 {
        FILE *fp;
 

-       if ((fp = fdopen(fd, mode)) != NULL)
-               register_file(fp, 0);
+       if ((fp = fdopen(fd, mode)) != NULL) {
+               register_file(fp, 0, 0);
+               (void) fcntl(fileno(fp), F_SETFD, 1);
+       }

        return fp;
 }
 
        return fp;
 }
 

+int

 Fclose(fp)
        FILE *fp;
 {
 Fclose(fp)
        FILE *fp;
 {


@@ -60,12 +104,13 @@ Popen(cmd, mode)
 {
        int p[2];
        int myside, hisside, fd0, fd1;
 {
        int p[2];
        int myside, hisside, fd0, fd1;

+       int pid;

        FILE *fp;
 
        FILE *fp;
 

-       if (pid == 0)
-               pid = (int *) malloc((unsigned) sizeof (int) * getdtablesize());

        if (pipe(p) < 0)
                return NULL;
        if (pipe(p) < 0)
                return NULL;

+       (void) fcntl(p[READ], F_SETFD, 1);
+       (void) fcntl(p[WRITE], F_SETFD, 1);

        if (*mode == 'r') {
                myside = p[READ];
                fd0 = -1;
        if (*mode == 'r') {
                myside = p[READ];
                fd0 = -1;


@@ -75,32 +120,34 @@ Popen(cmd, mode)
                hisside = fd0 = p[READ];
                fd1 = -1;
        }
                hisside = fd0 = p[READ];
                fd1 = -1;
        }

-       if ((pid[myside] = start_command(cmd, 0, fd0, fd1, NOSTR)) < 0) {
+       if ((pid = start_command(cmd, 0, fd0, fd1, NOSTR, NOSTR, NOSTR)) < 0) {

                close(p[READ]);
                close(p[WRITE]);
                return NULL;
        }
        (void) close(hisside);
        if ((fp = fdopen(myside, mode)) != NULL)
                close(p[READ]);
                close(p[WRITE]);
                return NULL;
        }
        (void) close(hisside);
        if ((fp = fdopen(myside, mode)) != NULL)

-               register_file(fp, 1);
+               register_file(fp, 1, pid);

        return fp;
 }
 
        return fp;
 }
 

+int

 Pclose(ptr)
        FILE *ptr;
 {
        int i;
        int omask;
 
 Pclose(ptr)
        FILE *ptr;
 {
        int i;
        int omask;
 

-       i = fileno(ptr);
+       i = file_pid(ptr);

        unregister_file(ptr);
        (void) fclose(ptr);
        omask = sigblock(sigmask(SIGINT)|sigmask(SIGHUP));
        unregister_file(ptr);
        (void) fclose(ptr);
        omask = sigblock(sigmask(SIGINT)|sigmask(SIGHUP));

-       i = wait_child(pid[i]);
+       i = wait_child(i);

        sigsetmask(omask);
        return i;
 }
 
        sigsetmask(omask);
        return i;
 }
 

+void

 close_all_files()
 {
 
 close_all_files()
 {
 


@@ -111,8 +158,10 @@ close_all_files()
                        (void) Fclose(fp_head->fp);
 }
 
                        (void) Fclose(fp_head->fp);
 }
 

-register_file(fp, pipe)
+void
+register_file(fp, pipe, pid)

        FILE *fp;
        FILE *fp;

+       int pipe, pid;

 {
        struct fp *fpp;
 
 {
        struct fp *fpp;
 


@@ -120,10 +169,12 @@ register_file(fp, pipe)
                panic("Out of memory");
        fpp->fp = fp;
        fpp->pipe = pipe;
                panic("Out of memory");
        fpp->fp = fp;
        fpp->pipe = pipe;

+       fpp->pid = pid;

        fpp->link = fp_head;
        fp_head = fpp;
 }
 
        fpp->link = fp_head;
        fp_head = fpp;
 }
 

+void

 unregister_file(fp)
        FILE *fp;
 {
 unregister_file(fp)
        FILE *fp;
 {


@@ -135,11 +186,19 @@ unregister_file(fp)
                        free((char *) p);
                        return;
                }
                        free((char *) p);
                        return;
                }

-       /* XXX
-        * Ignore this for now; there may still be uncaught
-        * duplicate closes.

        panic("Invalid file pointer");
        panic("Invalid file pointer");

-       */
+}
+
+file_pid(fp)
+       FILE *fp;
+{
+       struct fp *p;
+
+       for (p = fp_head; p; p = p->link)
+               if (p->fp == fp)
+                       return (p->pid);
+       panic("Invalid file pointer");
+       /*NOTREACHED*/

 }
 
 /*
 }
 
 /*


@@ -150,6 +209,7 @@ unregister_file(fp)
  * SIGINT is enabled unless it's in the mask.
  */
 /*VARARGS4*/
  * SIGINT is enabled unless it's in the mask.
  */
 /*VARARGS4*/

+int

 run_command(cmd, mask, infd, outfd, a0, a1, a2)
        char *cmd;
        int mask, infd, outfd;
 run_command(cmd, mask, infd, outfd, a0, a1, a2)
        char *cmd;
        int mask, infd, outfd;


@@ -163,6 +223,7 @@ run_command(cmd, mask, infd, outfd, a0, a1, a2)
 }
 
 /*VARARGS4*/
 }
 
 /*VARARGS4*/

+int

 start_command(cmd, mask, infd, outfd, a0, a1, a2)
        char *cmd;
        int mask, infd, outfd;
 start_command(cmd, mask, infd, outfd, a0, a1, a2)
        char *cmd;
        int mask, infd, outfd;


@@ -190,17 +251,20 @@ start_command(cmd, mask, infd, outfd, a0, a1, a2)
        return pid;
 }
 
        return pid;
 }
 

+void

 prepare_child(mask, infd, outfd)
        int mask, infd, outfd;
 {
        int i;
 
 prepare_child(mask, infd, outfd)
        int mask, infd, outfd;
 {
        int i;
 

+       /*
+        * All file descriptors other than 0, 1, and 2 are supposed to be
+        * close-on-exec.
+        */

        if (infd >= 0)
                dup2(infd, 0);
        if (outfd >= 0)
                dup2(outfd, 1);
        if (infd >= 0)
                dup2(infd, 0);
        if (outfd >= 0)
                dup2(outfd, 1);

-       for (i = getdtablesize(); --i > 2;)
-               close(i);

        for (i = 1; i <= NSIG; i++)
                if (mask & sigmask(i))
                        (void) signal(i, SIG_IGN);
        for (i = 1; i <= NSIG; i++)
                if (mask & sigmask(i))
                        (void) signal(i, SIG_IGN);


@@ -209,6 +273,7 @@ prepare_child(mask, infd, outfd)
        (void) sigsetmask(0);
 }
 
        (void) sigsetmask(0);
 }
 

+int

 wait_command(pid)
        int pid;
 {
 wait_command(pid)
        int pid;
 {


@@ -220,16 +285,7 @@ wait_command(pid)
        return 0;
 }
 
        return 0;
 }
 

-struct child {
-       int pid;
-       char done;
-       char free;
-       union wait status;
-       struct child *link;
-};
-static struct child *child;
-
-struct child *
+static struct child *

 findchild(pid)
        int pid;
 {
 findchild(pid)
        int pid;
 {


@@ -247,6 +303,7 @@ findchild(pid)
        return *cpp;
 }
 
        return *cpp;
 }
 

+static void

 delchild(cp)
        register struct child *cp;
 {
 delchild(cp)
        register struct child *cp;
 {


@@ -258,13 +315,16 @@ delchild(cp)
        free((char *) cp);
 }
 
        free((char *) cp);
 }
 

-sigchild()
+void
+sigchild(signo)
+       int signo;

 {
        int pid;
        union wait status;
        register struct child *cp;
 
 {
        int pid;
        union wait status;
        register struct child *cp;
 

-       while ((pid = wait3(&status, WNOHANG, (struct timeval *)0)) > 0) {
+       while ((pid =
+           wait3((int *)&status, WNOHANG, (struct rusage *)0)) > 0) {

                cp = findchild(pid);
                if (cp->free)
                        delchild(cp);
                cp = findchild(pid);
                if (cp->free)
                        delchild(cp);


@@ -280,6 +340,7 @@ union wait wait_status;
 /*
  * Wait for a specific child to die.
  */
 /*
  * Wait for a specific child to die.
  */

+int

 wait_child(pid)
        int pid;
 {
 wait_child(pid)
        int pid;
 {


@@ -297,6 +358,7 @@ wait_child(pid)
 /*
  * Mark a child as don't care.
  */
 /*
  * Mark a child as don't care.
  */

+void

 free_child(pid)
        int pid;
 {
 free_child(pid)
        int pid;
 {