diff options
author | Ulrich Drepper <drepper@redhat.com> | 1996-10-08 23:39:20 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1996-10-08 23:39:20 +0000 |
commit | 11336c165c25e5a467335ca742674b1d5ad6d982 (patch) | |
tree | d416c633f2bebd9b9cb3b7142396e3644805fec3 /posix | |
parent | 6428aed93c1a132c4cd6a8c21de9d0248fed4c46 (diff) | |
download | glibc-11336c165c25e5a467335ca742674b1d5ad6d982.tar glibc-11336c165c25e5a467335ca742674b1d5ad6d982.tar.gz glibc-11336c165c25e5a467335ca742674b1d5ad6d982.tar.bz2 glibc-11336c165c25e5a467335ca742674b1d5ad6d982.zip |
update from main archive 961008cvs/libc-961009
Wed Oct 9 00:30:33 1996 Ulrich Drepper <drepper@cygnus.com>
* inet/getnetgrent_r.c: Correct netgroup implementation. A
specification of a netgroup can also name another netgroup.
* nss/nss_files/files-netgrp.c: Likewise.
* inet/netgroup.h: Add fields to hold additional information.
Tue Oct 8 21:51:14 1996 Arnold D. Robbins <arnold@skeeve.atl.ga.us>
* posix/getopt.c: Implement POSIX -W option handling. When the
option string contains "W;" -W foo is handled like --foo.
Tue Oct 8 12:27:26 1996 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/i386/clone.S: Define _ERRNO_H before
inclusing <errnos.h> so we really get error symbols defined.
* sysdeps/unix/sysv/linux/m68k/clone.S: Likewise.
* sysdeps/unix/sysv/linux/alpha/clone.S: Likewise.
* sunrpc/auth_unix.c (authunix_create_default): Don't use fixed
size array for getgroups call. Instead get maximal number via
sysconf. But discard list to NGRPS elements before calling XDR
function since Sun's code cannot handle longer lists.
Based on a patch by Thorsten Kukuk <kukuk@weber.uni-paderborn.de>.
* sysdeps/stub/e_j0l.c: Define y0l as well.
* sysdeps/stub/e_j1l.c: Define y1l as well.
* sysdeps/stub/e_jnl.c: Define ynl as well.
* posix/unistd.h: Correct prototype for execlp.
* sysdeps/unix/sysv/linux/posix_opt.h: Define _POSIX_NO_TRUNC.
Mon Oct 7 22:18:03 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* Makeconfig (sysdep-library-path): New variable.
(built-program-cmd): Use it here to properly build a colon
separated library path.
Mon Oct 7 22:11:55 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* crypt/md5-crypt.c (md5_crypt_r): Add missing parens around &
within comparison. Fix comments.
(md5_crypt): Fix comment.
Tue Oct 8 05:10:49 1996 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/errnos.h: Only include <linux/errnos.h>
when _ERRNO_H is defined.
[!_ERRNO_H && __need_Emath]: Define value for EDOM and ERANGE.
Should there ever be a Linux port where the numeric values are
not 33 and 34 this file must change.
Mon Oct 7 13:54:04 1996 Ulrich Drepper <drepper@cygnus.com>
* libio/iofgets.c (_IO_fgets): Use _IO_flockfile instead of
__flockfile.
Mon Oct 7 11:01:45 1996 Andreas Jaeger <aj@arthur.pfalz.de>
* string/tst-strlen.c (main): Provide prototype.
* malloc/mallocbug.c: Likewise.
* io/test-utime.c: Likewise.
* sysdeps/generic/crypt-entry.c: Correct typo.
Mon Oct 7 13:42:20 1996 Ulrich Drepper <drepper@cygnus.com>
* elf/dl-open.c (_dl_open): Check against _dl_sysdep_start to
test for libc.a. Checking _DYNAMIC is of no worth here.
Suggested by Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>.
* nss/nss_files/files-parse.c: Define LOOKUP_NAME even if
EXTERN_PARSER is defined.
Sat Oct 5 17:05:36 1996 Andreas Jaeger <aj@arthur.pfalz.de>
* Rules (dep-dummy-lib): Correct prototype for __dummy__.
* crypt/md5-crypt.c: Fix typos in comments.
* gmon/gmon.c: Provide prototypes.
* db/makedb.c: Likewise.
* locale/programs/xmalloc.c: Likewise.
* stdio-common/bug11.c (main): Likewise.
* stdio-common/bug7.c (main): Likewise.
* stdio-common/bug8.c (main): Likewise.
* stdio-common/bug9.c (main): Likewise.
* stdio-common/scanf1.c (main): Likewise.
* stdio-common/scanf2.c (main): Likewise.
* stdio-common/scanf5.c (main): Likewise.
* stdio-common/scanf6.c (main): Likewise.
* stdio-common/scanf7.c (main): Likewise.
* stdio-common/scanf8.c (main): Likewise.
* stdio-common/temptest.c (main): Likewise.
* stdio-common/test-fwrite.c (main): Likewise.
* stdio-common/tst-printf.c: Likewise.
* stdio-common/tstdiomisc.c: Likewise.
* stdio-common/tstgetln.c (main): Likewise.
* stdlib/testmb.c (main): Likewise.
* stdio-common/scanf4.c (main): Correct prototype, remove unused
variable n.
* stdio-common/scanf3.c (main): Correct prototype, change
declaration of s to reduce warnings.
* stdio-common/bug10.c (main): Likewise.
* stdio-common/tfformat.c: Provide prototype, remove unused
reference to dump_stats, add braces in sprint_doubles.
* stdio-common/tiformat.c: Likewise.
* stdio-common/test_rdwr.c (main): Parameter `where' is long in
printf call.
Mon Oct 7 14:04:26 1996 NIIBE Yutaka <gniibe@mri.co.jp>
* sysdeps/unix/sysv/linux/sys/soundcard.h: Fix typo.
* shadow/putspent.c: Don't write colon after flag field.
* sysdeps/unix/sysv/linux/net/if_ppp.h: New file. Wrapper around
kernel header.
* sysdeps/unix/sysv/linux/net/ppp-comp.h: Likewise.
* sysdeps/unix/sysv/linux/net/ppp_defs.h: Likewise.
* sysdeps/unix/sysv/linux/Dist: Mention new files.
Mon Oct 7 00:58:19 1996 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/i386/i586/strchr.S: Correct handling of first bytes to
get pointer aligned. Reported by Matthias Urlichs <smurf@noris.de>.
* sysdeps/posix/euidaccess.c [_LIBC]: Avoid calling get?id functions
by using __libc_enable_secure variable.
* sysdeps/libm-i387/s_copysignl.S: Correct loading of return value.
Diffstat (limited to 'posix')
-rw-r--r-- | posix/getopt.c | 124 | ||||
-rw-r--r-- | posix/unistd.h | 2 |
2 files changed, 125 insertions, 1 deletions
diff --git a/posix/getopt.c b/posix/getopt.c index 7bd7e7181c..76346c2ac3 100644 --- a/posix/getopt.c +++ b/posix/getopt.c @@ -693,6 +693,130 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only) optopt = c; return '?'; } + /* Convenience. Treat POSIX -W foo same as long option --foo */ + if (temp[0] == 'W' && temp[1] == ';') + { + char *nameend; + const struct option *p; + const struct option *pfound = NULL; + int exact = 0; + int ambig = 0; + int indfound; + int option_index; + + /* This is an option that requires an argument. */ + if (*nextchar != '\0') + { + optarg = nextchar; + /* If we end this ARGV-element by taking the rest as an arg, + we must advance to the next element now. */ + optind++; + } + else if (optind == argc) + { + if (opterr) + { + /* 1003.2 specifies the format of this message. */ + fprintf (stderr, + gettext ("%s: option requires an argument -- %c\n"), + argv[0], c); + } + optopt = c; + if (optstring[0] == ':') + c = ':'; + else + c = '?'; + } + else + /* We already incremented `optind' once; + increment it again when taking next ARGV-elt as argument. */ + optarg = argv[optind++]; + + /* optarg is now the argument, see if it's in the + table of longopts. */ + + for (nextchar = nameend = optarg; *nameend && *nameend != '='; nameend++) + /* Do nothing. */ ; + + /* Test all long options for either exact match + or abbreviated matches. */ + for (p = longopts, option_index = 0; p->name; p++, option_index++) + if (!strncmp (p->name, nextchar, nameend - nextchar)) + { + if (nameend - nextchar == strlen (p->name)) + { + /* Exact match found. */ + pfound = p; + indfound = option_index; + exact = 1; + break; + } + else if (pfound == NULL) + { + /* First nonexact match found. */ + pfound = p; + indfound = option_index; + } + else + /* Second or later nonexact match found. */ + ambig = 1; + } + if (ambig && !exact) + { + if (opterr) + fprintf (stderr, gettext ("%s: option `-W %s' is ambiguous\n"), + argv[0], argv[optind]); + nextchar += strlen (nextchar); + optind++; + return '?'; + } + if (pfound != NULL) + { + option_index = indfound; + if (*nameend) + { + /* Don't test has_arg with >, because some C compilers don't + allow it to be used on enums. */ + if (pfound->has_arg) + optarg = nameend + 1; + else + { + if (opterr) + fprintf (stderr, + gettext ("%s: option `-W %s' doesn't allow an argument\n"), + argv[0], pfound->name); + + nextchar += strlen (nextchar); + return '?'; + } + } + else if (pfound->has_arg == 1) + { + if (optind < argc) + optarg = argv[optind++]; + else + { + if (opterr) + fprintf (stderr, + gettext ("%s: option `%s' requires an argument\n"), + argv[0], argv[optind - 1]); + nextchar += strlen (nextchar); + return optstring[0] == ':' ? ':' : '?'; + } + } + nextchar += strlen (nextchar); + if (longind != NULL) + *longind = option_index; + if (pfound->flag) + { + *(pfound->flag) = pfound->val; + return 0; + } + return pfound->val; + } + nextchar = NULL; + return 'W'; /* Let the application handle it. */ + } if (temp[1] == ':') { if (temp[2] == ':') diff --git a/posix/unistd.h b/posix/unistd.h index 2147400d66..14b11b16c0 100644 --- a/posix/unistd.h +++ b/posix/unistd.h @@ -334,7 +334,7 @@ extern int execvp __P ((__const char *__file, char *__const __argv[])); /* Execute FILE, searching in the `PATH' environment variable if it contains no slashes, with all arguments after FILE until a NULL pointer and environment from `environ'. */ -extern int execlp __P ((__const char *__file, ...)); +extern int execlp __P ((__const char *__file, __const char *__arg, ...)); #ifdef __USE_MISC |