octave-kai/gnulib-hg: lib/getopt.c comparison

comparison lib/getopt.c @ 637:1df6981c6f31

use latest from gettext-0.10.23

author	Jim Meyering <jim@meyering.net>
date	Thu, 11 Jul 1996 03:57:04 +0000
parents	39f6e38131a6
children	acf83993b98e

comparison

equal deleted inserted replaced

-:ddd029a89661
+:1df6981c6f31
 /* Getopt for GNU.
 NOTE: getopt is now part of the C library, so if you don't know what
 "Keep this file name-space clean" means, talk to roland@gnu.ai.mit.edu
 before changing it!
-Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95
+Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 1996
 	Free Software Foundation, Inc.
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
 Free Software Foundation; either version 2, or (at your option) any
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
 Ditto for AIX 3.2 and <stdlib.h>.  */
 #ifndef _NO_PROTO
 #define _NO_PROTO
 #if defined (_LIBC) || !defined (__GNU_LIBRARY__)
 /* This needs to come after some library #include
 to get __GNU_LIBRARY__ defined.  */
-#ifdef	__GNU_LIBRARY__
+#ifdef __GNU_LIBRARY__
 /* Don't include stdlib.h for non-GNU C libraries because some of them
 contain conflicting prototypes for getopt.  */
 #include <stdlib.h>
+#if defined (_LIBC) || defined (HAVE_UNISTD_H)
+#include <unistd.h>
+#endif
 #endif	/* GNU C library.  */
+#ifdef VMS
+#include <unixlib.h>
+#if HAVE_STRING_H - 0
+#include <string.h>
+#endif
+#endif
+#ifdef WIN32
+/* It's not Unix, really.  See?  Capital letters.  */
+#include <windows.h>
+#define getpid() GetCurrentProcessId()
+#endif
 #ifndef _
 /* This is for other GNU distributions with internationalized messages.
 When compiling libc, the _ macro is predefined.  */
 #ifdef HAVE_LIBINTL_H
 } ordering;
 /* Value of POSIXLY_CORRECT environment variable.  */
 static char *posixly_correct;
-#ifdef	__GNU_LIBRARY__
+#ifdef __GNU_LIBRARY__
 /* We want to avoid inclusion of string.h with non-GNU libraries
 because there are many ways it can cause trouble.
 On some systems, it contains special magic macros that don't work
 in GCC.  */
 #include <string.h>
 `last_nonopt' is the index after the last of them.  */
 static int first_nonopt;
 static int last_nonopt;
+/* Bash 2.0 gives us an environment variable containing flags
+indicating ARGV elements that should not be considered arguments.  */
+static const char *nonoption_flags;
+static int nonoption_flags_len;
 /* Exchange two adjacent subsequences of ARGV.
 One subsequence is elements [first_nonopt,last_nonopt)
 which contains all the non-options that have been skipped so far.
 The other is elements [last_nonopt,optind), which contains all
 the options processed since those non-options were skipped.
 `first_nonopt' and `last_nonopt' are relocated so that they describe
 the new indices of the non-options in ARGV after they are moved.  */
+#if defined (__STDC__) && __STDC__
+static void exchange (char **);
+#endif
 static void
 exchange (argv)
 char **argv;
 {
 last_nonopt = optind;
 }
 /* Initialize the internal data when the first call is made.  */
+#if defined (__STDC__) && __STDC__
+static const char *_getopt_initialize (const char *);
+#endif
 static const char *
 _getopt_initialize (optstring)
 const char *optstring;
 {
 /* Start processing options with ARGV-element 1 (since ARGV-element 0
 }
 else if (posixly_correct != NULL)
 ordering = REQUIRE_ORDER;
 else
 ordering = PERMUTE;
+if (posixly_correct == NULL)
+{
+/* Bash 2.0 puts a special variable in the environment for each
+	 command it runs, specifying which ARGV elements are the results of
+	 file name wildcard expansion and therefore should not be
+	 considered as options.  */
+char var[100];
+sprintf (var, "_%d_GNU_nonoption_argv_flags_", getpid ());
+nonoption_flags = getenv (var);
+if (nonoption_flags == NULL)
+	nonoption_flags_len = 0;
+else
+	nonoption_flags_len = strlen (nonoption_flags);
+}
 return optstring;
 }
 /* Scan elements of ARGV (whose length is ARGC) for option characters
 {
 optstring = _getopt_initialize (optstring);
 optind = 1;		/* Don't scan ARGV[0], the program name.  */
 }
+/* Test whether ARGV[optind] points to a non-option argument.
+Either it does not have option syntax, or there is an environment flag
+from the shell indicating it is not an option.  */
+#define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0'	      \
+		     || (optind < nonoption_flags_len			      \
+			 && nonoption_flags[optind] == '1'))
 if (nextchar == NULL || *nextchar == '\0')
 {
 /* Advance to the next ARGV-element.  */
+/* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been
+	 moved back by the user (who may also have changed the arguments).  */
+if (last_nonopt > optind)
+	last_nonopt = optind;
+if (first_nonopt > optind)
+	first_nonopt = optind;
 if (ordering == PERMUTE)
 	{
 	  /* If we have just processed some options following some non-options,
 	     exchange them so that the options come first.  */
 	    first_nonopt = optind;
 	  /* Skip any additional non-options
 	     and extend the range of non-options previously skipped.  */
-	  while (optind < argc
+	  while (optind < argc && NONOPTION_P)
-		 && (argv[optind][0] != '-' || argv[optind][1] == '\0'))
 	    optind++;
 	  last_nonopt = optind;
 	}
 /* The special ARGV-element `--' means premature end of options.
 	}
 /* If we have come to a non-option and did not permute it,
 	 either stop the scan or describe it to the caller and pass it by.  */
-if ((argv[optind][0] != '-' || argv[optind][1] == '\0'))
+if (NONOPTION_P)
 	{
 	  if (ordering == REQUIRE_ORDER)
 	    return EOF;
 	  optarg = argv[optind++];
 	  return 1;
 This distinction seems to be the most useful approach.  */
 if (longopts != NULL
 && (argv[optind][1] == '-'
-	  || (long_only && (argv[optind][2]
+	  || (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1])))))
-			    || !my_index (optstring, argv[optind][1])))))
 {
 char *nameend;
 const struct option *p;
 const struct option *pfound = NULL;
 int exact = 0;
 int option_index;
 for (nameend = nextchar; *nameend && *nameend != '='; nameend++)
 	/* Do nothing.  */ ;
-#ifdef lint
+#ifdef lint		/* Suppress `used before initialized' warning.  */
-indfound = 0;  /* Avoid spurious compiler warning.  */
+indfound = 0;
 #endif
 /* Test all long options for either exact match
 	 or abbreviated matches.  */
 for (p = longopts, option_index = 0; p->name; p++, option_index++)
 	  if (opterr)
 	    fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
 		     argv[0], argv[optind]);
 	  nextchar += strlen (nextchar);
 	  optind++;
+	  optopt = 0;
 	  return '?';
 	}
 if (pfound != NULL)
 	{
 	      if (pfound->has_arg)
 		optarg = nameend + 1;
 	      else
 		{
 		  if (opterr)
-		   if (argv[optind - 1][1] == '-')
+		    if (argv[optind - 1][1] == '-')
-		    /* --option */
+		      /* --option */
-		    fprintf (stderr,
+		      fprintf (stderr,
-		     _("%s: option `--%s' doesn't allow an argument\n"),
+			_("%s: option `--%s' doesn't allow an argument\n"),
-		     argv[0], pfound->name);
+			       argv[0], pfound->name);
-		   else
+		    else
-		    /* +option or -option */
+		      /* +option or -option */
-		    fprintf (stderr,
+		      fprintf (stderr,
-		     _("%s: option `%c%s' doesn't allow an argument\n"),
+			_("%s: option `%c%s' doesn't allow an argument\n"),
-		     argv[0], argv[optind - 1][0], pfound->name);
+			       argv[0], argv[optind - 1][0], pfound->name);
 		  nextchar += strlen (nextchar);
+		  optopt = pfound->val;
 		  return '?';
 		}
 	    }
 	  else if (pfound->has_arg == 1)
 	    {
 		optarg = argv[optind++];
 	      else
 		{
 		  if (opterr)
 		    fprintf (stderr,
-			   _("%s: option `%s' requires an argument\n"),
+			     _("%s: option `%s' requires an argument\n"),
-			   argv[0], argv[optind - 1]);
+			     argv[0], argv[optind - 1]);
 		  nextchar += strlen (nextchar);
+		  optopt = pfound->val;
 		  return optstring[0] == ':' ? ':' : '?';
 		}
 	    }
 	  nextchar += strlen (nextchar);
 	  if (longind != NULL)
 		fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
 			 argv[0], argv[optind][0], nextchar);
 	    }
 	  nextchar = (char *) "";
 	  optind++;
+	  optopt = 0;
 	  return '?';
 	}
 }
 /* Look at and handle the next short option-character.  */
 	      {
 		if (opterr)
 		  {
 		    /* 1003.2 specifies the format of this message.  */
 		    fprintf (stderr,
-			   _("%s: option requires an argument -- %c\n"),
+			     _("%s: option requires an argument -- %c\n"),
-			   argv[0], c);
+			     argv[0], c);
 		  }
 		optopt = c;
 		if (optstring[0] == ':')
 		  c = ':';
 		else

Mercurial > hg > octave-kai > gnulib-hg

comparison lib/getopt.c @ 637:1df6981c6f31