Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* libio/iopopen.c (_IO_new_proc_open): Don't close child_std_end
if one of proc_file_chain streams has that fileno. * stdio-common/Makefile (tests): Add tst-popen2. * stdio-common/tst-popen2.c: New test.
- Loading branch information
Ulrich Drepper
committed
Jul 19, 2007
1 parent
d8d7fee
commit 4e42530
Showing
3 changed files
with
100 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,92 @@ | ||
#include <stdio.h> | ||
#include <string.h> | ||
#include <unistd.h> | ||
|
||
static int | ||
do_test (void) | ||
{ | ||
int fd = dup (fileno (stdout)); | ||
if (fd <= 1) | ||
{ | ||
puts ("dup failed"); | ||
return 1; | ||
} | ||
|
||
FILE *f1 = fdopen (fd, "w"); | ||
if (f1 == NULL) | ||
{ | ||
printf ("fdopen failed: %m\n"); | ||
return 1; | ||
} | ||
|
||
fclose (stdout); | ||
|
||
FILE *f2 = popen ("echo test1", "r"); | ||
if (f2 == NULL) | ||
{ | ||
fprintf (f1, "1st popen failed: %m\n"); | ||
return 1; | ||
} | ||
FILE *f3 = popen ("echo test2", "r"); | ||
if (f2 == NULL || f3 == NULL) | ||
{ | ||
fprintf (f1, "2nd popen failed: %m\n"); | ||
return 1; | ||
} | ||
|
||
char *line = NULL; | ||
size_t len = 0; | ||
int result = 0; | ||
if (getline (&line, &len, f2) != 6) | ||
{ | ||
fputs ("could not read line from 1st popen\n", f1); | ||
result = 1; | ||
} | ||
else if (strcmp (line, "test1\n") != 0) | ||
{ | ||
fprintf (f1, "read \"%s\"\n", line); | ||
result = 1; | ||
} | ||
|
||
if (getline (&line, &len, f2) != -1) | ||
{ | ||
fputs ("second getline did not return -1\n", f1); | ||
result = 1; | ||
} | ||
|
||
if (getline (&line, &len, f3) != 6) | ||
{ | ||
fputs ("could not read line from 2nd popen\n", f1); | ||
result = 1; | ||
} | ||
else if (strcmp (line, "test2\n") != 0) | ||
{ | ||
fprintf (f1, "read \"%s\"\n", line); | ||
result = 1; | ||
} | ||
|
||
if (getline (&line, &len, f3) != -1) | ||
{ | ||
fputs ("second getline did not return -1\n", f1); | ||
result = 1; | ||
} | ||
|
||
int ret = pclose (f2); | ||
if (ret != 0) | ||
{ | ||
fprintf (f1, "1st pclose returned %d\n", ret); | ||
result = 1; | ||
} | ||
|
||
ret = pclose (f3); | ||
if (ret != 0) | ||
{ | ||
fprintf (f1, "2nd pclose returned %d\n", ret); | ||
result = 1; | ||
} | ||
|
||
return result; | ||
} | ||
|
||
#define TEST_FUNCTION do_test () | ||
#include "../test-skeleton.c" |