aboutsummaryrefslogtreecommitdiff
path: root/dirent
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-03-18 12:22:11 +0000
committerUlrich Drepper <drepper@redhat.com>1998-03-18 12:22:11 +0000
commit80a18298f02005310cf0edc6163ae5eff5fad09a (patch)
treefa4db80e6d033ac93658d00c347eae9dae768d45 /dirent
parent9eecb5e8f3903a6fe66ac88f9218935130e77042 (diff)
downloadglibc-80a18298f02005310cf0edc6163ae5eff5fad09a.tar
glibc-80a18298f02005310cf0edc6163ae5eff5fad09a.tar.gz
glibc-80a18298f02005310cf0edc6163ae5eff5fad09a.tar.bz2
glibc-80a18298f02005310cf0edc6163ae5eff5fad09a.zip
Update.
* dirent/list.c (test): Return error value. (main): Exit with error value. * sysdeps/unix/opendir.c (__opendir): Add missing initialization. * Makefile (distribute): Add test-skeleton.c. * test-skeleton.c: New file. * dirent/Makefile (tests): Add opendir-tst1. * dirent/opendir-tst1.c: New file. 1998-03-18 Ulrich Drepper <drepper@cygnus.com> Optimize memory handling.
Diffstat (limited to 'dirent')
-rw-r--r--dirent/Makefile6
-rw-r--r--dirent/list.c27
-rw-r--r--dirent/opendir-tst1.c96
3 files changed, 118 insertions, 11 deletions
diff --git a/dirent/Makefile b/dirent/Makefile
index 7c36510ca1..e763dabeb7 100644
--- a/dirent/Makefile
+++ b/dirent/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.
+# Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -27,6 +27,8 @@ routines := opendir closedir readdir readdir_r rewinddir \
getdents dirfd readdir64 readdir64_r
distribute := dirstream.h
-tests := list tst-seekdir
+tests := list tst-seekdir opendir-tst1
include ../Rules
+
+opendir-tst1.args = --test-dir=${objdir}
diff --git a/dirent/list.c b/dirent/list.c
index 38f770f0ed..6ce22c6ea1 100644
--- a/dirent/list.c
+++ b/dirent/list.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1993, 1997, 1998 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -23,11 +23,12 @@
#include <dirent.h>
-void
+int
test (const char *name)
{
DIR *dirp;
struct dirent *entp;
+ int retval = 0;
puts (name);
@@ -35,7 +36,7 @@ test (const char *name)
if (dirp == NULL)
{
perror ("opendir");
- return;
+ return 1;
}
errno = 0;
@@ -44,24 +45,32 @@ test (const char *name)
entp->d_name, (unsigned long int) entp->d_fileno);
if (errno)
- perror ("readdir");
+ {
+ perror ("readdir");
+ retval = 1;
+ }
if (closedir (dirp) < 0)
- perror ("closedir");
+ {
+ perror ("closedir");
+ retval = 1;
+ }
+
+ return retval;
}
int
main (int argc, char **argv)
{
+ int retval = 0;
--argc;
++argv;
if (argc == 0)
- test (".");
+ retval = test (".");
else
while (argc-- > 0)
- test (*argv++);
+ retval |= test (*argv++);
- exit (0);
- return 0;
+ return retval;
}
diff --git a/dirent/opendir-tst1.c b/dirent/opendir-tst1.c
new file mode 100644
index 0000000000..dfab1d9b3d
--- /dev/null
+++ b/dirent/opendir-tst1.c
@@ -0,0 +1,96 @@
+/* Copyright (C) 1998 Free Software Foundation, Inc.
+ Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include <dirent.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+/* Name of the FIFO. */
+char tmpname[] = "fifoXXXXXX";
+
+
+/* Do the real work. */
+static int
+real_test (void)
+{
+ DIR *dirp;
+
+ /* This should not block for an FIFO. */
+ dirp = opendir (tmpname);
+
+ /* Successful. */
+ if (dirp != NULL)
+ {
+ /* Oh, oh, how can this work? */
+ fputs ("`opendir' succeeded on a FIFO???\n", stderr);
+ closedir (dirp);
+ return 1;
+ }
+
+ if (errno != ENOTDIR)
+ {
+ fprintf (stderr, "`opendir' return error `%s' instead of `%s'\n",
+ strerror (errno), strerror (ENOTDIR));
+ return 1;
+ }
+
+ return 0;
+}
+
+
+static int
+do_test (int argc, char *argv[])
+{
+ int retval;
+
+ if (mktemp (tmpname) == NULL)
+ {
+ perror ("mktemp");
+ return 1;
+ }
+
+ /* Try to generate a FIFO. */
+ if (mknod (tmpname, 0600 | S_IFIFO, 0) < 0)
+ {
+ perror ("mknod");
+ /* We cannot make this an error. */
+ return 0;
+ }
+
+ retval = real_test ();
+
+ remove (tmpname);
+
+ return retval;
+}
+
+
+void
+do_cleanup (void)
+{
+ remove (tmpname);
+}
+#define CLEANUP_HANDLER do_cleanup ()
+
+
+/* Include the test skeleton. */
+#include <test-skeleton.c>