break out special local mail processing (e.g., mapping to the

[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 e96c801..b46b8ae 100644 (file)
--- a/usr/src/usr.bin/mail/popen.c
+++ b/usr/src/usr.bin/mail/popen.c
@@ -1,31 +1,75 @@
 /*
 /*

- * 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.

  *
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * %sccs.include.redist.c%

  */
 
 #ifndef lint
  */
 
 #ifndef lint

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

 #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;
+       int pid;
+       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;
+
+       if ((fp = fopen(file, mode)) != NULL) {
+               register_file(fp, 0, 0);
+               (void) fcntl(fileno(fp), F_SETFD, 1);
+       }
+       return fp;
+}
+
+FILE *
+Fdopen(fd, mode)
+       int fd;
+       char *mode;
+{
+       FILE *fp;
+
+       if ((fp = fdopen(fd, mode)) != NULL) {
+               register_file(fp, 0, 0);
+               (void) fcntl(fileno(fp), F_SETFD, 1);
+       }
+       return fp;
+}
+
+int
+Fclose(fp)
+       FILE *fp;
+{
+       unregister_file(fp);
+       return fclose(fp);
+}

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


@@ -34,11 +78,13 @@ Popen(cmd, mode)
 {
        int p[2];
        int myside, hisside, fd0, fd1;
 {
        int p[2];
        int myside, hisside, fd0, fd1;

+       int pid;
+       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;


@@ -48,29 +94,87 @@ 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;
        }
                close(p[READ]);
                close(p[WRITE]);
                return NULL;
        }

-       close(hisside);
-       return fdopen(myside, mode);
+       (void) close(hisside);
+       if ((fp = fdopen(myside, mode)) != NULL)
+               register_file(fp, 1, pid);
+       return fp;

 }
 
 }
 

+int

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

-       i = fileno(ptr);
-       fclose(ptr);
+       i = file_pid(ptr);
+       unregister_file(ptr);
+       (void) fclose(ptr);

        omask = sigblock(sigmask(SIGINT)|sigmask(SIGHUP));
        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()
+{
+
+       while (fp_head)
+               if (fp_head->pipe)
+                       (void) Pclose(fp_head->fp);
+               else
+                       (void) Fclose(fp_head->fp);
+}
+
+void
+register_file(fp, pipe, pid)
+       FILE *fp;
+       int pipe, pid;
+{
+       struct fp *fpp;
+
+       if ((fpp = (struct fp *) malloc(sizeof *fpp)) == NULL)
+               panic("Out of memory");
+       fpp->fp = fp;
+       fpp->pipe = pipe;
+       fpp->pid = pid;
+       fpp->link = fp_head;
+       fp_head = fpp;
+}
+
+void
+unregister_file(fp)
+       FILE *fp;
+{
+       struct fp **pp, *p;
+
+       for (pp = &fp_head; p = *pp; pp = &p->link)
+               if (p->fp == fp) {
+                       *pp = p->link;
+                       free((char *) p);
+                       return;
+               }
+       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*/
+}
+

 /*
  * Run a command without a shell, with optional arguments and splicing
  * of stdin and stdout.  The command name can be a sequence of words.
 /*
  * Run a command without a shell, with optional arguments and splicing
  * of stdin and stdout.  The command name can be a sequence of words.


@@ -79,6 +183,7 @@ Pclose(ptr)
  * 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;


@@ -92,6 +197,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;


@@ -119,17 +225,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);


@@ -138,10 +247,10 @@ prepare_child(mask, infd, outfd)
        (void) sigsetmask(0);
 }
 
        (void) sigsetmask(0);
 }
 

+int

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

-       int r;

 
        if (wait_child(pid) < 0) {
                printf("Fatal error in process.\n");
 
        if (wait_child(pid) < 0) {
                printf("Fatal error in process.\n");


@@ -150,16 +259,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;
 {


@@ -177,6 +277,7 @@ findchild(pid)
        return *cpp;
 }
 
        return *cpp;
 }
 

+static void

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


@@ -188,13 +289,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);


@@ -210,6 +314,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;
 {


@@ -227,6 +332,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;
 {