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 cc77784..467d24a 100644 (file)
--- a/usr/src/usr.bin/mail/popen.c
+++ b/usr/src/usr.bin/mail/popen.c
@@ -1,25 +1,52 @@
 /*
 /*

- * 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.18 (Berkeley) %G%";
+static char sccsid[] = "@(#)popen.c    8.1 (Berkeley) 6/6/93";

 #endif /* not lint */
 
 #include "rcv.h"
 #include <sys/wait.h>
 #endif /* not lint */
 
 #include "rcv.h"
 #include <sys/wait.h>

+#include <fcntl.h>

 #include "extern.h"
 
 #define READ 0
 #define WRITE 1
 #include "extern.h"
 
 #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;


@@ -41,8 +68,10 @@ Fopen(file, mode)
 {
        FILE *fp;
 
 {
        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;
 }
 
        return fp;
 }
 


@@ -53,8 +82,10 @@ Fdopen(fd, mode)
 {
        FILE *fp;
 
 {
        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;
 }
 


@@ -66,13 +97,6 @@ Fclose(fp)
        return fclose(fp);
 }
 
        return fclose(fp);
 }
 

-/*
- * XXX
- * The old mail code used getdtablesize() to return the max number of
- * file descriptors.  That's a *real* big number now.  Fake it.
- */
-#define        MAX_FILE_DESCRIPTORS            64
-#define        MAX_FILE_DESCRIPTORS_TO_CLOSE   20

 FILE *
 Popen(cmd, mode)
        char *cmd;
 FILE *
 Popen(cmd, mode)
        char *cmd;


@@ -80,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 = malloc((u_int)sizeof (int) * MAX_FILE_DESCRIPTORS);

        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;


@@ -95,15 +120,14 @@ 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, NOSTR, 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;
 }
 


@@ -114,11 +138,11 @@ Pclose(ptr)
        int i;
        int omask;
 
        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;
 }


@@ -135,9 +159,9 @@ close_all_files()
 }
 
 void
 }
 
 void

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

        FILE *fp;
        FILE *fp;

-       int pipe;
+       int pipe, pid;

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


@@ -145,6 +169,7 @@ 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;
 }


@@ -161,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*/

 }
 
 /*
 }
 
 /*


@@ -224,12 +257,14 @@ prepare_child(mask, infd, outfd)
 {
        int i;
 
 {
        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 = MAX_FILE_DESCRIPTORS_TO_CLOSE; --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);