BSD 4_3_Net_2 release

[unix-history] / usr / src / lib / libc / gen / popen.c

diff --git a/usr/src/lib/libc/gen/popen.c b/usr/src/lib/libc/gen/popen.c
index d33fdd0..b84b588 100644 (file)
--- a/usr/src/lib/libc/gen/popen.c
+++ b/usr/src/lib/libc/gen/popen.c
@@ -5,23 +5,37 @@
  * This code is derived from software written by Ken Arnold and
  * published in UNIX Review, Vol. 6, No. 8.
  *
  * This code is derived from software written by Ken Arnold and
  * published in UNIX Review, Vol. 6, No. 8.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 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.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)popen.c    5.14 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)popen.c    5.15 (Berkeley) 2/23/91";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>


@@ -29,6 +43,8 @@ static char sccsid[] = "@(#)popen.c   5.14 (Berkeley) 6/1/90";
 #include <sys/wait.h>
 #include <errno.h>
 #include <stdio.h>
 #include <sys/wait.h>
 #include <errno.h>
 #include <stdio.h>

+#include <stdlib.h>
+#include <string.h>

 #include <unistd.h>
 #include <paths.h>
 
 #include <unistd.h>
 #include <paths.h>
 


@@ -36,11 +52,11 @@ static pid_t *pids;
 
 FILE *
 popen(program, type)
 
 FILE *
 popen(program, type)

-       char *program, *type;
+       const char *program;
+       const char *type;

 {
        FILE *iop;
        int pdes[2], fds, pid;
 {
        FILE *iop;
        int pdes[2], fds, pid;

-       char *malloc();

 
        if (*type != 'r' && *type != 'w' || type[1])
                return (NULL);
 
        if (*type != 'r' && *type != 'w' || type[1])
                return (NULL);


@@ -90,14 +106,14 @@ popen(program, type)
        return (iop);
 }
 
        return (iop);
 }
 

+int

 pclose(iop)
        FILE *iop;
 {
 pclose(iop)
        FILE *iop;
 {

-       extern int errno;

        register int fdes;
        int omask;
        union wait pstat;
        register int fdes;
        int omask;
        union wait pstat;

-       pid_t pid, waitpid();
+       pid_t pid;

 
        /*
         * pclose returns -1 if stream is not associated with a
 
        /*
         * pclose returns -1 if stream is not associated with a


@@ -109,7 +125,7 @@ pclose(iop)
        (void) fclose(iop);
        omask = sigblock(sigmask(SIGINT)|sigmask(SIGQUIT)|sigmask(SIGHUP));
        do {
        (void) fclose(iop);
        omask = sigblock(sigmask(SIGINT)|sigmask(SIGQUIT)|sigmask(SIGHUP));
        do {

-               pid = waitpid(pids[fdes], &pstat, 0);
+               pid = waitpid(pids[fdes], (int *) &pstat, 0);

        } while (pid == -1 && errno == EINTR);
        (void) sigsetmask(omask);
        pids[fdes] = 0;
        } while (pid == -1 && errno == EINTR);
        (void) sigsetmask(omask);
        pids[fdes] = 0;