511676f708
2004-03-08 Paul Eggert <eggert@cs.ucla.edu> Merge from gnulib. We now assume C89 or better. * posix/getopt1.c (const): Remove. * posix/getopt.c (const): Likewise. * posix/getopt1.c (getopt_long, _getopt_long_r, getopt_long_only, _getopt_long_only_r, main): Use prototypes, not old-style definitions. * posix/getopt.c (exchange, _getopt_initialize, _getopt_internal_r, _getopt_internal, getopt, main): Likewise. * posix/getopt.h (getopt, getopt_long, getopt_long_only): Likewise. * posix/getopt.c [!defined VMS || !HAVE_STRING_H]: Include <string.h> regardless. No need for <strings.h>. [!defined _LIBC]: Include "gettext.h" rather than rolling it ourselves. (_): Define to gettext always. (my_index): Remove: all uses changed to strchr. (strlen): Remove declaration. * posix/getopt.h (struct option.name): Always const char *. 2004-03-08 Marcus Brinkmann <marcus@gnu.org> * posix/getopt.h (_getopt_internal): Move to ... * posix/getopt_int.h: ... here. New file. * include/getopt_int.h: New file. * include/getopt.h: Remove libc_hidden_proto for getopt_long and getopt_long_only. * posix/getopt1.c: Include "getopt_int.h". Remove libc_hidden_def for getopt_long and getopt_long_only. (_getopt_long_r, _getopt_long_only_r): New functions. * posix/getopt.c: Include "getopt_int.h". (__getopt_initialized): Variable removed. (nextchar, ordering, posixly_correct, first_nonopt, last_nonopt): Static variables removed. (nonoption_flags_max_len, nonoption_flags_len) [_LIBC && USE_NONOPTION_FLAGS]: Static variables removed. (getopt_data): New static variable. (SWAP_FLAGS): Use d->__nonoption_flags_len instead nonoption_flags_len. (exchange): Add new argument D of type struct getopt_data *. Replace optind with d->optind, optarg with d->optarg, opterr with d->opterr, optopt with d->optopt, nextchar with d->__nextchar, first_nonopt with d->__first_nonopt, last_nonopt with d->__last_nonopt, d->ordering with d->__ordering, d->posixly_correct with d->__posixly_correct (which is now an int instead a string, so fix users), nonoption_flags_len with d->__nonoption_flags_len, nonoption_flags_max_len with d->__nonoption_flags_max_len. (_getopt_initialize): Likewise. (_getopt_internal): Rename to ... (_getopt_internal_r): ... this. Also add new argument D of type struct getopt_data * and use of members of D rather than global or static variables as described for exchange() above. Add new argument to invocations of _getopt_initialize and exchange. (_getopt_internal): Reimplement in terms of _getopt_internal_r. * argp/argp-parse.c: Include <getopt_int.h>. [_LIBC]: Do not include <bits/libc-lock.h>. [!_LIBC && HAVE_CTHREADS_H]: Do not include <cthreads.h>. [!_LIBC] (_argp_hang): Make static. (getopt_lock, LOCK_GETOPT, UNLOCK_GETOPT): Remove. (_argp_unlock_xxx): Remove. (parser_init): Do not use LOCK_GETOPT. (parser_finalize): Do not use UNLOCK_GETOPT. (struct parser): New member OPT_DATA. (parser_init): Initialize parser->opt_data. Use parser->opt_data.opterr instead of opterr. (parser_parse_opt): Use parser->opt_data.optarg instead optarg. (parser_parse_next): Likewise. Use parser->opt_data.optind instead optind. Use parser->opt_data.optopt instead of optopt. Call _getopt_long_only_r and _getopt_long_r instead of getopt_long_only and getopt_long, and pass the extra argument. |
||
---|---|---|
.. | ||
bits | ||
glob | ||
rxspencer | ||
sys | ||
.cvsignore | ||
annexc.c | ||
BOOST.tests | ||
bsd-getpgrp.c | ||
bug-ga1.c | ||
bug-ga2.c | ||
bug-regex1.c | ||
bug-regex2.c | ||
bug-regex3.c | ||
bug-regex4.c | ||
bug-regex5.c | ||
bug-regex6.c | ||
bug-regex7.c | ||
bug-regex8.c | ||
bug-regex9.c | ||
bug-regex10.c | ||
bug-regex11.c | ||
bug-regex12.c | ||
bug-regex13.c | ||
bug-regex14.c | ||
bug-regex15.c | ||
bug-regex16.c | ||
bug-regex17.c | ||
bug-regex18.c | ||
bug-regex19.c | ||
bug-regex20.c | ||
bug-regex21.c | ||
bug-regex22.c | ||
bug-regex23.c | ||
confstr.c | ||
cpio.h | ||
Depend | ||
execl.c | ||
execle.c | ||
execlp.c | ||
execv.c | ||
execvp.c | ||
fnmatch.c | ||
fnmatch.h | ||
fnmatch_loop.c | ||
getconf.c | ||
getopt.c | ||
getopt.h | ||
getopt1.c | ||
getopt_init.c | ||
getopt_int.h | ||
glob.h | ||
globtest.c | ||
globtest.sh | ||
Makefile | ||
PCRE.tests | ||
ptestcases.h | ||
PTESTS | ||
PTESTS2C.sed | ||
re_comp.h | ||
regcomp.c | ||
regex.c | ||
regex.h | ||
regex_internal.c | ||
regex_internal.h | ||
regexbug1.c | ||
regexec.c | ||
runptests.c | ||
runtests.c | ||
sched.h | ||
spawn.c | ||
spawn.h | ||
spawn_faction_addclose.c | ||
spawn_faction_adddup2.c | ||
spawn_faction_addopen.c | ||
spawn_faction_destroy.c | ||
spawn_faction_init.c | ||
spawn_int.h | ||
spawnattr_destroy.c | ||
spawnattr_getdefault.c | ||
spawnattr_getflags.c | ||
spawnattr_getpgroup.c | ||
spawnattr_getschedparam.c | ||
spawnattr_getschedpolicy.c | ||
spawnattr_getsigmask.c | ||
spawnattr_init.c | ||
spawnattr_setdefault.c | ||
spawnattr_setflags.c | ||
spawnattr_setpgroup.c | ||
spawnattr_setschedparam.c | ||
spawnattr_setschedpolicy.c | ||
spawnattr_setsigmask.c | ||
spawnp.c | ||
tar.h | ||
test-vfork.c | ||
testcases.h | ||
testfnm.c | ||
TESTS | ||
TESTS2C.sed | ||
transbug.c | ||
tst-boost.c | ||
tst-chmod.c | ||
tst-dir.c | ||
tst-exec.c | ||
tst-fnmatch.c | ||
tst-fnmatch.input | ||
tst-fork.c | ||
tst-getaddrinfo.c | ||
tst-getconf.sh | ||
tst-getlogin.c | ||
tst-gnuglob.c | ||
tst-mmap.c | ||
tst-nanosleep.c | ||
tst-nice.c | ||
tst-pcre.c | ||
tst-preadwrite.c | ||
tst-preadwrite64.c | ||
tst-regex.c | ||
tst-regexloc.c | ||
tst-rxspencer.c | ||
tst-spawn.c | ||
tst-truncate.c | ||
tst-truncate64.c | ||
tst-vfork1.c | ||
tstgetopt.c | ||
unistd.h | ||
Versions | ||
wait.h | ||
wordexp-test.c | ||
wordexp-tst.sh | ||
wordexp.h |