mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-10-26 00:57:39 +03:00 
			
		
		
		
	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.
		
			
				
	
	
		
			193 lines
		
	
	
		
			4.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			193 lines
		
	
	
		
			4.7 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,98,2004
 | ||
|      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
 | ||
|    modify it under the terms of the GNU Lesser General Public
 | ||
|    License as published by the Free Software Foundation; either
 | ||
|    version 2.1 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
 | ||
|    Lesser General Public License for more details.
 | ||
| 
 | ||
|    You should have received a copy of the GNU Lesser General Public
 | ||
|    License along with the GNU C Library; 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
 | ||
| 
 | ||
| #ifdef _LIBC
 | ||
| # include <getopt.h>
 | ||
| #else
 | ||
| # include "getopt.h"
 | ||
| #endif
 | ||
| #include "getopt_int.h"
 | ||
| 
 | ||
| #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 2
 | ||
| #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 (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);
 | ||
| }
 | ||
| 
 | ||
| int
 | ||
| _getopt_long_r (int argc, char *const *argv, const char *options,
 | ||
| 		const struct option *long_options, int *opt_index,
 | ||
| 		struct _getopt_data *d)
 | ||
| {
 | ||
|   return _getopt_internal_r (argc, argv, options, long_options, opt_index,
 | ||
| 			     0, d);
 | ||
| }
 | ||
| 
 | ||
| /* 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 (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);
 | ||
| }
 | ||
| 
 | ||
| int
 | ||
| _getopt_long_only_r (int argc, char *const *argv, const char *options,
 | ||
| 		     const struct option *long_options, int *opt_index,
 | ||
| 		     struct _getopt_data *d)
 | ||
| {
 | ||
|   return _getopt_internal_r (argc, argv, options, long_options, opt_index,
 | ||
| 			     1, d);
 | ||
| }
 | ||
| 
 | ||
| #endif	/* Not ELIDE_CODE.  */
 | ||
| 
 | ||
| #ifdef TEST
 | ||
| 
 | ||
| #include <stdio.h>
 | ||
| 
 | ||
| int
 | ||
| main (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 */
 |