aboutsummaryrefslogtreecommitdiff
path: root/stdio-common
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-07-23 18:53:26 +0000
committerUlrich Drepper <drepper@redhat.com>2004-07-23 18:53:26 +0000
commit06bfee07cbd94b28c62bbdea7a982dfdbd460b2c (patch)
treeb0604ba7038cf6ce51c269e5a03278859dffa063 /stdio-common
parent7a80496fb1d65c1e07df8a4addc5ad77226fd61e (diff)
downloadglibc-06bfee07cbd94b28c62bbdea7a982dfdbd460b2c.tar
glibc-06bfee07cbd94b28c62bbdea7a982dfdbd460b2c.tar.gz
glibc-06bfee07cbd94b28c62bbdea7a982dfdbd460b2c.tar.bz2
glibc-06bfee07cbd94b28c62bbdea7a982dfdbd460b2c.zip
[BZ #282]
Update. 2004-07-23 Jakub Jelinek <jakub@redhat.com> [BZ #282] * libio/iopopen.c (_IO_new_popen): Use _IO_init instead of _IO_no_init. Remove wd from struct locked_FILE. (_IO_wproc_jumps): Remove. Reported by Andrew Josey <a.josey@opengroup.org>. * stdio-common/Makefile (tests): Add tst-popen. * stdio-common/tst-popen.c: New test.
Diffstat (limited to 'stdio-common')
-rw-r--r--stdio-common/Makefile3
-rw-r--r--stdio-common/tst-popen.c72
2 files changed, 74 insertions, 1 deletions
diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index 9c50b954d5..ab573e6940 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -52,7 +52,8 @@ tests := tstscanf test_rdwr test-popen tstgetln test-fseek \
scanf1 scanf2 scanf3 scanf4 scanf5 scanf7 scanf8 scanf9 scanf10 \
scanf11 scanf12 tst-tmpnam tst-cookie tst-obprintf tst-sscanf \
tst-swprintf tst-fseek tst-fmemopen test-vfprintf tst-gets \
- tst-perror tst-sprintf tst-rndseek tst-fdopen tst-fphex bug14 bug15
+ tst-perror tst-sprintf tst-rndseek tst-fdopen tst-fphex bug14 bug15 \
+ tst-popen
test-srcs = tst-unbputc tst-printf
diff --git a/stdio-common/tst-popen.c b/stdio-common/tst-popen.c
new file mode 100644
index 0000000000..980cf935a7
--- /dev/null
+++ b/stdio-common/tst-popen.c
@@ -0,0 +1,72 @@
+/* Copyright (C) 2004 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Jakub Jelinek <jakub@redhat.com>, 2004.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <stdio.h>
+#include <wchar.h>
+
+static int
+do_test (void)
+{
+ FILE *f = popen ("echo test", "r");
+ int result = 0, ret;
+ char *line = NULL;
+ size_t len = 0;
+
+ if (f == NULL)
+ {
+ printf ("popen failed %m");
+ return 1;
+ }
+
+ /* POSIX says that pipe streams are byte-oriented. */
+ if (fwide (f, 0) >= 0)
+ {
+ puts ("popen did not return byte-oriented stream");
+ result = 1;
+ }
+
+ if (getline (&line, &len, f) != 5)
+ {
+ puts ("could not read line from popen");
+ result = 1;
+ }
+ else if (strcmp (line, "test\n") != 0)
+ {
+ printf ("read \"%s\"\n", line);
+ result = 1;
+ }
+
+ if (getline (&line, &len, f) != -1)
+ {
+ puts ("second getline did not return -1");
+ result = 1;
+ }
+
+ ret = pclose (f);
+ if (ret != 0)
+ {
+ printf ("pclose returned %d\n", ret);
+ result = 1;
+ }
+
+ return result;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"