summaryrefslogtreecommitdiff
path: root/posix/globtest.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-07-27 17:55:05 +0000
committerUlrich Drepper <drepper@redhat.com>1998-07-27 17:55:05 +0000
commit3f62b69af3f0f61299ac7bcbc7c3b35cbd16cf4a (patch)
tree325c502561495d94ab29442c1929afd08ac41686 /posix/globtest.c
parent6730873037b6afad1504bb237399c343cce18451 (diff)
downloadglibc-3f62b69af3f0f61299ac7bcbc7c3b35cbd16cf4a.tar.gz
Update.
1998-07-27 17:42 Ulrich Drepper <drepper@cygnus.com> * nss/nss_files/files-parse.c (INT_FIELD): Use strtoul instead of strtol. (INT_FIELD_MAYBE_NULL): Likewise. * posix/globtest.c: Rewrite for extended test suite. * posix/globtest.sh: More tests. Patch by Brian Wellington <bwelling@anomaly.munge.com>. * stdlib/strtol.c: Don't redefine LONG_MAX, LONG_MIN, and ULONG_MAX. Use new macro. * sysdeps/generic/readv.c: Correct return type. * sysdeps/generic/writev.c: Likewise. 1998-07-24 Gordon Matzigkeit <gord@fig.org> * argp/argp-help.c (_GNU_SOURCE): Define, to suck in program_invocation_name when compiling outside of glibc. 1998-07-26 Philip Blundell <philb@gnu.org> * sysdeps/unix/sysv/linux/arm/siglist.c: New file; ARM tools don't like `@' in .type directives. * sysdeps/libm-ieee754/e_expf.c (__ieee754_expf): Check whether FE_TONEAREST exists for this platform before using it. * sysdeps/libm-ieee754/e_exp.c (__ieee754_exp): Likewise. * sysdeps/arm/dl-machine.h (elf_machine_rel): Delete redundant debugging code. Correct handling of PC24 relocs. * elf/Makefile (ld-map): Only define if versioning is in use. * sysdeps/arm/fpu_control.h: Move to ... * sysdeps/arm/fpu/fpu_control.h: ... here. * sysdeps/generic/fpu_control.h: Made usable as a dummy implementation. * sysdeps/unix/sysv/linux/arm/brk.c: New file. * sysdeps/arm/machine-gmon.h: Improved profiling for ARM. * sysdeps/arm/sysdep.h (CALL_MCOUNT): Replace stub with real implementation. * sysdeps/unix/sysv/linux/arm/clone.S: Likewise. Based on patch from Scott Bambrough and Pat Beirne. * shlib-versions: Add appropriate definitions for ARM machines. * README.template: Mention that Linux/ARM with ELF works now. 1998-07-18 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makerules: Generate compilation rules for all object suffixes, not only those currently selected, for sources in the current or object directory. 1998-07-24 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * posix/fnmatch.c (fnmatch): Allow `/' in character class. Don't match `/' in filename by a character class if requested. * posix/testfnm.c: Rewritten. * posix/testfnm.args: Removed. 1998-07-25 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * posix/annexc.c (limits_syms): Add missing symbols. (stdarg_syms): Move va_list to `maybe' list. (stdio_syms): Add FOPEN_MAX.
Diffstat (limited to 'posix/globtest.c')
-rw-r--r--posix/globtest.c87
1 files changed, 72 insertions, 15 deletions
diff --git a/posix/globtest.c b/posix/globtest.c
index 7008a8bcd1..37b1fd07e9 100644
--- a/posix/globtest.c
+++ b/posix/globtest.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997 Free Software Foundation, Inc.
+/* Copyright (C) 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
@@ -16,36 +16,93 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#include <getopt.h>
#include <stdio.h>
-#include <glob.h>
#include <unistd.h>
+#include <glob.h>
int
main (int argc, char *argv[])
{
- int i;
- int glob_flags = GLOB_NOSORT;
- glob_t filenames;
+ int i, j;
+ int glob_flags = 0;
+ glob_t g;
+ int quotes = 1;
- if (argc != 3)
- exit (1);
- if (chdir (argv[1]))
+ while ((i = getopt (argc, argv, "bcdegmopqst")) != -1)
+ switch(i)
+ {
+ case 'b':
+ glob_flags |= GLOB_BRACE;
+ break;
+ case 'c':
+ glob_flags |= GLOB_NOCHECK;
+ break;
+ case 'd':
+ glob_flags |= GLOB_ONLYDIR;
+ break;
+ case 'e':
+ glob_flags |= GLOB_NOESCAPE;
+ break;
+ case 'g':
+ glob_flags |= GLOB_NOMAGIC;
+ break;
+ case 'm':
+ glob_flags |= GLOB_MARK;
+ break;
+ case 'o':
+ glob_flags |= GLOB_DOOFFS;
+ g.gl_offs = 1;
+ break;
+ case 'p':
+ glob_flags |= GLOB_PERIOD;
+ break;
+ case 'q':
+ quotes = 0;
+ break;
+ case 's':
+ glob_flags |= GLOB_NOSORT;
+ break;
+ case 't':
+ glob_flags |= GLOB_TILDE;
+ break;
+ default:
+ exit (-1);
+ }
+
+ if (optind >= argc || chdir (argv[optind]))
+ exit(1);
+
+ j = optind + 1;
+ if (optind + 1 >= argc)
exit (1);
- i = glob (argv[2], glob_flags, NULL, &filenames);
+ /* Do a glob on each remaining argument. */
+ for (j = optind + 1; j < argc; j++) {
+ i = glob (argv[j], glob_flags, NULL, &g);
+ if (i != 0)
+ break;
+ glob_flags |= GLOB_APPEND;
+ }
+
+ /* Was there an error? */
if (i == GLOB_NOSPACE)
puts ("GLOB_NOSPACE");
- else if (i == GLOB_ABEND)
- puts ("GLOB_ABEND");
+ else if (i == GLOB_ABORTED)
+ puts ("GLOB_ABORTED");
else if (i == GLOB_NOMATCH)
puts ("GLOB_NOMATCH");
- printf ("%sNULL\n", filenames.gl_pathv ? "not " : "");
+ /* If we set an offset, fill in the first field. */
+ if (glob_flags & GLOB_DOOFFS)
+ g.gl_pathv[0] = (char *) "abc";
- if (filenames.gl_pathv)
+ /* Print out the names. Unless otherwise specified, qoute them. */
+ if (g.gl_pathv)
{
- for (i = 0; i < filenames.gl_pathc; ++i)
- printf ("`%s'\n", filenames.gl_pathv[i]);
+ for (i = 0; i < g.gl_pathc; ++i)
+ printf ("%s%s%s\n", quotes ? "`" : "", g.gl_pathv[i],
+ quotes ? "'" : "");
}
return 0;
}