Deleted Added
sdiff udiff text old ( 17141 ) new ( 23668 )
full compact
popen.c (17141) popen.c (23668)
1/*
2 * Copyright (c) 1988, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software written by Ken Arnold and
6 * published in UNIX Review, Vol. 6, No. 8.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 21 unchanged lines hidden (view full) ---

30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34 * SUCH DAMAGE.
35 */
36
37#if defined(LIBC_SCCS) && !defined(lint)
1/*
2 * Copyright (c) 1988, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software written by Ken Arnold and
6 * published in UNIX Review, Vol. 6, No. 8.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 21 unchanged lines hidden (view full) ---

30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34 * SUCH DAMAGE.
35 */
36
37#if defined(LIBC_SCCS) && !defined(lint)
38static char sccsid[] = "@(#)popen.c 8.1 (Berkeley) 6/4/93";
38static char sccsid[] = "@(#)popen.c 8.3 (Berkeley) 5/3/95";
39#endif /* LIBC_SCCS and not lint */
40
41#include <sys/param.h>
42#include <sys/wait.h>
39#endif /* LIBC_SCCS and not lint */
40
41#include <sys/param.h>
42#include <sys/wait.h>
43#include <sys/socket.h>
43
44#include <signal.h>
45#include <errno.h>
46#include <unistd.h>
47#include <stdio.h>
48#include <stdlib.h>
49#include <string.h>
50#include <paths.h>
51
52static struct pid {
53 struct pid *next;
54 FILE *fp;
55 pid_t pid;
56} *pidlist;
57
58FILE *
44
45#include <signal.h>
46#include <errno.h>
47#include <unistd.h>
48#include <stdio.h>
49#include <stdlib.h>
50#include <string.h>
51#include <paths.h>
52
53static struct pid {
54 struct pid *next;
55 FILE *fp;
56 pid_t pid;
57} *pidlist;
58
59FILE *
59popen(program, type)
60 const char *program;
61 const char *type;
60popen(command, type)
61 const char *command, *type;
62{
63 struct pid *cur;
64 FILE *iop;
62{
63 struct pid *cur;
64 FILE *iop;
65 int pdes[2], pid;
65 int pdes[2], pid, twoway;
66
66
67 if ( (*type != 'r' && *type != 'w') || type[1])
67 /*
68 * Lite2 introduced two-way popen() pipes using socketpair().
69 * FreeBSD's pipe() is bidirectional, so we use that.
70 */
71 if (strchr(type, '+')) {
72 twoway = 1;
73 type = "r+";
74 } else {
75 twoway = 0;
76 if (*type != 'r' && *type != 'w' || type[1])
77 return (NULL);
78 }
79 if (pipe(pdes) < 0)
68 return (NULL);
69
70 if ((cur = malloc(sizeof(struct pid))) == NULL)
71 return (NULL);
72
80 return (NULL);
81
82 if ((cur = malloc(sizeof(struct pid))) == NULL)
83 return (NULL);
84
73 if (pipe(pdes) < 0) {
74 free(cur);
75 return (NULL);
76 }
77
78 switch (pid = vfork()) {
79 case -1: /* Error. */
80 (void)close(pdes[0]);
81 (void)close(pdes[1]);
82 free(cur);
83 return (NULL);
84 /* NOTREACHED */
85 case 0: /* Child. */
86 if (*type == 'r') {
87 if (pdes[1] != STDOUT_FILENO) {
88 (void)dup2(pdes[1], STDOUT_FILENO);
89 (void)close(pdes[1]);
85 switch (pid = vfork()) {
86 case -1: /* Error. */
87 (void)close(pdes[0]);
88 (void)close(pdes[1]);
89 free(cur);
90 return (NULL);
91 /* NOTREACHED */
92 case 0: /* Child. */
93 if (*type == 'r') {
94 if (pdes[1] != STDOUT_FILENO) {
95 (void)dup2(pdes[1], STDOUT_FILENO);
96 (void)close(pdes[1]);
97 pdes[1] = STDOUT_FILENO;
90 }
91 (void) close(pdes[0]);
98 }
99 (void) close(pdes[0]);
100 if (twoway && (pdes[1] != STDIN_FILENO))
101 (void)dup2(pdes[1], STDIN_FILENO);
92 } else {
93 if (pdes[0] != STDIN_FILENO) {
94 (void)dup2(pdes[0], STDIN_FILENO);
95 (void)close(pdes[0]);
96 }
97 (void)close(pdes[1]);
98 }
102 } else {
103 if (pdes[0] != STDIN_FILENO) {
104 (void)dup2(pdes[0], STDIN_FILENO);
105 (void)close(pdes[0]);
106 }
107 (void)close(pdes[1]);
108 }
99 execl(_PATH_BSHELL, "sh", "-c", program, NULL);
109 execl(_PATH_BSHELL, "sh", "-c", command, NULL);
100 _exit(127);
101 /* NOTREACHED */
102 }
103
104 /* Parent; assume fdopen can't fail. */
105 if (*type == 'r') {
106 iop = fdopen(pdes[0], type);
107 (void)close(pdes[1]);

--- 17 unchanged lines hidden (view full) ---

125 * if already `pclosed', or waitpid returns an error.
126 */
127int
128pclose(iop)
129 FILE *iop;
130{
131 register struct pid *cur, *last;
132 int omask;
110 _exit(127);
111 /* NOTREACHED */
112 }
113
114 /* Parent; assume fdopen can't fail. */
115 if (*type == 'r') {
116 iop = fdopen(pdes[0], type);
117 (void)close(pdes[1]);

--- 17 unchanged lines hidden (view full) ---

135 * if already `pclosed', or waitpid returns an error.
136 */
137int
138pclose(iop)
139 FILE *iop;
140{
141 register struct pid *cur, *last;
142 int omask;
133 union wait pstat;
143 int pstat;
134 pid_t pid;
135
144 pid_t pid;
145
136 (void)fclose(iop);
137
138 /* Find the appropriate file pointer. */
139 for (last = NULL, cur = pidlist; cur; last = cur, cur = cur->next)
140 if (cur->fp == iop)
141 break;
142 if (cur == NULL)
143 return (-1);
144
146 /* Find the appropriate file pointer. */
147 for (last = NULL, cur = pidlist; cur; last = cur, cur = cur->next)
148 if (cur->fp == iop)
149 break;
150 if (cur == NULL)
151 return (-1);
152
145 /* Get the status of the process. */
146 omask = sigblock(sigmask(SIGINT)|sigmask(SIGQUIT)|sigmask(SIGHUP));
153 (void)fclose(iop);
154
147 do {
155 do {
148 pid = waitpid(cur->pid, (int *) &pstat, 0);
156 pid = waitpid(cur->pid, &pstat, 0);
149 } while (pid == -1 && errno == EINTR);
157 } while (pid == -1 && errno == EINTR);
150 (void)sigsetmask(omask);
151
152 /* Remove the entry from the linked list. */
153 if (last == NULL)
154 pidlist = cur->next;
155 else
156 last->next = cur->next;
157 free(cur);
158
158
159 /* Remove the entry from the linked list. */
160 if (last == NULL)
161 pidlist = cur->next;
162 else
163 last->next = cur->next;
164 free(cur);
165
159 return (pid == -1 ? -1 : pstat.w_status);
166 return (pid == -1 ? -1 : pstat);
160}
167}