mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
1ef32c3dc4
1997-01-21 Paul Eggert <eggert@twinsun.com> * posix/getopt.c (_getopt_internal): Return -1, not EOF, when args are exhausted; this is required by POSIX.2. * catgets/gencat.c, db/makedb.c, locale/programs/locale.c, locale/programs/localedef.c, manual/examples/subopt.c, posix/getopt.c, posix/getopt1.c, stdio-common/bug4.c, sunrpc/rpcinfo.c (main): Check getopt return value against -1, not EOF. Tue Jan 21 23:10:40 1997 Ulrich Drepper <drepper@cygnus.com> * version.h (VERSION): Bump to 1.102. * sysdeps/unix/sysv/linux/alpha/Dist: Add kernel_sigaction.h. * elf/Makefile: Don't use CFLAGS-dl-load.c, but instead CPPFLAGS-dl-load.c so that dependencies can be determined correctly. * elf/dl-load.c: Fix comment. * time/Banner: New file. * time/Makefile (distribute): Add Banner. Update from ADO tzcode1997a and tzdata1997a. * time/antarctica: Update. * time/australia: Update. * time/zdump.c: Update. * time/zic.c: Update. * time/zone.tab: Update. Mon Jan 20 08:38:32 1997 H.J. Lu <hjl@gnu.ai.mit.edu> * config.make.in (has-ldconfig): New variable. * configure, configure.in (has_ldconfig): New substitute. * sysdeps/unix/sysv/linux/configure.in (has_ldconfig): New, check if $srcdir/elf/ldconfig.c exists. * Makeconfig (rootsbindir): New, default as $(exec_prefix)/sbin. (rtld-version-installed-name): New, default as ld-$(version).so. * Makefile (install): Call `$(common-objpfx)elf/ldconfig -d' only if $(cross-compiling) is no and $(build-shared) is yes. * Makerules (make-shlib-link): New macro. ($(slibdir)/libfoo.so.$(libfoo.so-version)): Use $(make-shlib-link) for symlink. (install-rootsbin, install-rootsbin-nosubdir): New. (install-no-libc.a-nosubdir): Add install-rootsbin-nosubdir. * Rules (others): Add $(install-rootsbin). * config.make.in (rootsbindir): New. * configure, configure.in (libc_cv_rootsbindir): New substitute. * elf/Makefile (others, install-rootsbin): New, set to ldconfig. (+link): New for static linking. ($(slibdir)/$(rtld-version-installed-name)): New. ($(slibdir)/$(rtld-installed-name)): Depend on $(slibdir)/$(rtld-version-installed-name) and use $(make-shlib-link) for symlink. * sunrpc/xdr.c (xdr_string): Return FALSE if sp == NULL while XDR_ENCODE. * sysdeps/unix/sysv/linux/a.out.h: Use #include_next for glibc internals. * sysdeps/unix/sysv/linux/configure.in (libc_cv_rootsbindir): New, set to "/sbin" if "$prefix" == "/usr". Tue Jan 21 13:38:39 1997 Ulrich Drepper <drepper@cygnus.com> * Makefile (distribute): Add glibcbug.in. Reported by Philip Blundell <pjb27@cam.ac.uk>. * elf/Makefile ($(objpfx)trusted-dirs.h): Create elf/ subdir in build directory if necessary. Reported by marcus@shannon.sysc.pdx.edu (Marcus G. Daniels).
190 lines
4.5 KiB
C
190 lines
4.5 KiB
C
/* getopt_long and getopt_long_only entry points for GNU getopt.
|
||
Copyright (C) 1987,88,89,90,91,92,93,94,96,97 Free Software Foundation, Inc.
|
||
|
||
This file is part of the GNU C Library. Its master source is NOT part of
|
||
the C library, however. The master source lives in /gd/gnu/lib.
|
||
|
||
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. */
|
||
|
||
#ifdef HAVE_CONFIG_H
|
||
#include <config.h>
|
||
#endif
|
||
|
||
#include "getopt.h"
|
||
|
||
#if !defined (__STDC__) || !__STDC__
|
||
/* This is a separate conditional since some stdc systems
|
||
reject `defined (const)'. */
|
||
#ifndef const
|
||
#define const
|
||
#endif
|
||
#endif
|
||
|
||
#include <stdio.h>
|
||
|
||
/* Comment out all this code if we are using the GNU C Library, and are not
|
||
actually compiling the library itself. This code is part of the GNU C
|
||
Library, but also included in many other GNU distributions. Compiling
|
||
and linking in this code is a waste when using the GNU C library
|
||
(especially if it is a shared library). Rather than having every GNU
|
||
program understand `configure --with-gnu-libc' and omit the object files,
|
||
it is simpler to just do this in the source for each such file. */
|
||
|
||
#define GETOPT_INTERFACE_VERSION 1
|
||
#if !defined (_LIBC) && defined (__GLIBC__) && __GLIBC__ >= 2
|
||
#include <gnu-versions.h>
|
||
#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
|
||
#define ELIDE_CODE
|
||
#endif
|
||
#endif
|
||
|
||
#ifndef ELIDE_CODE
|
||
|
||
|
||
/* This needs to come after some library #include
|
||
to get __GNU_LIBRARY__ defined. */
|
||
#ifdef __GNU_LIBRARY__
|
||
#include <stdlib.h>
|
||
#endif
|
||
|
||
#ifndef NULL
|
||
#define NULL 0
|
||
#endif
|
||
|
||
int
|
||
getopt_long (argc, argv, options, long_options, opt_index)
|
||
int argc;
|
||
char *const *argv;
|
||
const char *options;
|
||
const struct option *long_options;
|
||
int *opt_index;
|
||
{
|
||
return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
|
||
}
|
||
|
||
/* Like getopt_long, but '-' as well as '--' can indicate a long option.
|
||
If an option that starts with '-' (not '--') doesn't match a long option,
|
||
but does match a short option, it is parsed as a short option
|
||
instead. */
|
||
|
||
int
|
||
getopt_long_only (argc, argv, options, long_options, opt_index)
|
||
int argc;
|
||
char *const *argv;
|
||
const char *options;
|
||
const struct option *long_options;
|
||
int *opt_index;
|
||
{
|
||
return _getopt_internal (argc, argv, options, long_options, opt_index, 1);
|
||
}
|
||
|
||
|
||
#endif /* Not ELIDE_CODE. */
|
||
|
||
#ifdef TEST
|
||
|
||
#include <stdio.h>
|
||
|
||
int
|
||
main (argc, argv)
|
||
int argc;
|
||
char **argv;
|
||
{
|
||
int c;
|
||
int digit_optind = 0;
|
||
|
||
while (1)
|
||
{
|
||
int this_option_optind = optind ? optind : 1;
|
||
int option_index = 0;
|
||
static struct option long_options[] =
|
||
{
|
||
{"add", 1, 0, 0},
|
||
{"append", 0, 0, 0},
|
||
{"delete", 1, 0, 0},
|
||
{"verbose", 0, 0, 0},
|
||
{"create", 0, 0, 0},
|
||
{"file", 1, 0, 0},
|
||
{0, 0, 0, 0}
|
||
};
|
||
|
||
c = getopt_long (argc, argv, "abc:d:0123456789",
|
||
long_options, &option_index);
|
||
if (c == -1)
|
||
break;
|
||
|
||
switch (c)
|
||
{
|
||
case 0:
|
||
printf ("option %s", long_options[option_index].name);
|
||
if (optarg)
|
||
printf (" with arg %s", optarg);
|
||
printf ("\n");
|
||
break;
|
||
|
||
case '0':
|
||
case '1':
|
||
case '2':
|
||
case '3':
|
||
case '4':
|
||
case '5':
|
||
case '6':
|
||
case '7':
|
||
case '8':
|
||
case '9':
|
||
if (digit_optind != 0 && digit_optind != this_option_optind)
|
||
printf ("digits occur in two different argv-elements.\n");
|
||
digit_optind = this_option_optind;
|
||
printf ("option %c\n", c);
|
||
break;
|
||
|
||
case 'a':
|
||
printf ("option a\n");
|
||
break;
|
||
|
||
case 'b':
|
||
printf ("option b\n");
|
||
break;
|
||
|
||
case 'c':
|
||
printf ("option c with value `%s'\n", optarg);
|
||
break;
|
||
|
||
case 'd':
|
||
printf ("option d with value `%s'\n", optarg);
|
||
break;
|
||
|
||
case '?':
|
||
break;
|
||
|
||
default:
|
||
printf ("?? getopt returned character code 0%o ??\n", c);
|
||
}
|
||
}
|
||
|
||
if (optind < argc)
|
||
{
|
||
printf ("non-option ARGV-elements: ");
|
||
while (optind < argc)
|
||
printf ("%s ", argv[optind++]);
|
||
printf ("\n");
|
||
}
|
||
|
||
exit (0);
|
||
}
|
||
|
||
#endif /* TEST */
|