AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-09 23:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

* libio/iopopen.c (_IO_new_proc_open): Don't close child_std_end

Browse Source 
if one of proc_file_chain streams has that fileno.
	* stdio-common/Makefile (tests): Add tst-popen2.
	* stdio-common/tst-popen2.c: New test.
This commit is contained in:
Ulrich Drepper 2007-07-19 17:03:08 +00:00
parent d8d7feefa7
commit 4e425301f4
3 changed files with 100 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-07-16 Jakub Jelinek <jakub@redhat.com>
* 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.
2007-07-14 Jakub Jelinek <jakub@redhat.com>
* elf/ldconfig.c: Allow GPLv2 or any later version.

2
stdio-common/Makefile
View File

@ -55,7 +55,7 @@ tests := tstscanf test_rdwr test-popen tstgetln test-fseek \
tst-perror tst-sprintf tst-rndseek tst-fdopen tst-fphex bug14 bug15 \
tst-popen tst-unlockedio tst-fmemopen2 tst-put-error tst-fgets \
tst-fwrite bug16 bug17 tst-swscanf tst-sprintf2 bug18 bug18a \
bug19 bug19a
bug19 bug19a tst-popen2
test-srcs = tst-unbputc tst-printf

92
stdio-common/tst-popen2.c Normal file
View File

@ -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"