[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: 66-gary-gnulib-getopt-import.patch
|
From: |
Gary V. Vaughan |
|
Subject: |
FYI: 66-gary-gnulib-getopt-import.patch |
|
Date: |
Fri, 12 Sep 2003 16:23:19 +0100 |
|
User-agent: |
Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.5b) Gecko/20030903 Thunderbird/0.2 |
Applied to HEAD.
--
())_. Gary V. Vaughan gary@(lilith.warpmail.net|gnu.org)
( '/ Research Scientist http://www.oranda.demon.co.uk ,_())____
/ )= GNU Hacker http://www.gnu.org/software/libtool \' `&
`(_~)_ Tech' Author http://sources.redhat.com/autobook =`---d__/
Index: ChangeLog
from Gary V. Vaughan <address@hidden>
Replace the getopt code with CVS gnulib getopt. The source files
detect whether they are in a glibc environment and preprocess away
all of the code if there is a system getopt, so we can compile
them into the m4 executable unconditionally:
* gnulib/m4/getopt.c, gnulib/m4/getopt1.c, gnulib/m4/getopt.h,
gnulib/config/getopt.m4: Import getopt module from CVS gnulib.
* configure.ac (gl_GETOPT): Use this instead of homebrew inline
macros.
* src/getopt.c, src/getopt1.c, src/gnu-getopt.h: Removed old
version.
* src/Makefile.am: Adjust.
* src/main.c: Always include our shipped getopt.h.
* po/POTFILES.in: Use new location of getopt.c.
2003-09-12 Gary V. Vaughan <address@hidden>
Index: configure.ac
===================================================================
RCS file: /cvsroot/m4/m4/configure.ac,v
retrieving revision 1.24
diff -u -p -u -r1.24 configure.ac
--- configure.ac 12 Sep 2003 14:28:09 -0000 1.24
+++ configure.ac 12 Sep 2003 15:16:59 -0000
@@ -56,6 +56,7 @@ m4_pattern_allow([^m4_cv_])
m4_pattern_forbid([^jm_])
m4_pattern_allow([^jm_cv_])
m4_pattern_allow([^jm_ac_cv_])
+m4_pattern_allow([^jm_with_])
AC_MSG_CHECKING(for modules to preload)
m4_pattern_allow([^m4_default_preload$])
@@ -181,22 +182,13 @@ AC_FUNC_VPRINTF
AM_WITH_DMALLOC
+gl_GETOPT
gl_XALLOC
gl_XSTRNDUP
m4_ERROR
m4_OBSTACK
m4_REGEX([gnulib/m4/regex.c])
m4_SYS_STACKOVF
-
-M4OBJS=
-m4_pattern_allow([^m4_getopt_h$])
-m4_getopt_h=src/getopt.h
-rm -f $m4_getopt_h
-AC_CHECK_FUNC([getopt_long], [],
- [M4OBJS="getopt1.$ac_objext getopt.$ac_objext"
- AC_CONFIG_LINKS([$m4_getopt_h:src/gnu-getopt.h])])
-AC_SUBST([M4OBJS])
-
# This is for the modules
AC_STRUCT_TM
Index: gnulib/config/getopt.m4
===================================================================
RCS file: gnulib/config/getopt.m4
diff -N gnulib/config/getopt.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnulib/config/getopt.m4 12 Sep 2003 15:16:59 -0000
@@ -0,0 +1,13 @@
+# getopt.m4 serial 2
+dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+AC_DEFUN([gl_GETOPT],
+[
+ dnl Prerequisites of lib/getopt.c.
+ :
+])
Index: gnulib/m4/getopt.c
===================================================================
RCS file: gnulib/m4/getopt.c
diff -N gnulib/m4/getopt.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnulib/m4/getopt.c 12 Sep 2003 15:16:59 -0000
@@ -0,0 +1,1209 @@
+/* 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 address@hidden
+ before changing it!
+
+ Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
+ 1996, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation,
+ Inc.
+
+ This file is part of the GNU C Library.
+
+ 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 later version.
+
+ This program 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 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,
+ Inc., 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
+#endif
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#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 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__
+/* Don't include stdlib.h for non-GNU C libraries because some of them
+ contain conflicting prototypes for getopt. */
+# include <stdlib.h>
+# include <unistd.h>
+#endif /* GNU C library. */
+
+#include <string.h>
+
+#ifdef VMS
+# include <unixlib.h>
+#endif
+
+#ifdef _LIBC
+# include <libintl.h>
+#else
+/* This is for other GNU distributions with internationalized messages. */
+# include "gettext.h"
+#endif
+#define _(msgid) gettext (msgid)
+
+#if defined _LIBC && defined USE_IN_LIBIO
+# include <wchar.h>
+#endif
+
+#ifndef attribute_hidden
+# define attribute_hidden
+#endif
+
+/* This version of `getopt' appears to the caller like standard Unix `getopt'
+ but it behaves differently for the user, since it allows the user
+ to intersperse the options with the other arguments.
+
+ As `getopt' works, it permutes the elements of ARGV so that,
+ when it is done, all the options precede everything else. Thus
+ all application programs are extended to handle flexible argument order.
+
+ Setting the environment variable POSIXLY_CORRECT disables permutation.
+ Then the behavior is completely standard.
+
+ GNU application programs can use a third alternative mode in which
+ they can distinguish the relative order of options and other arguments. */
+
+#include "getopt.h"
+
+/* For communication from `getopt' to the caller.
+ When `getopt' finds an option that takes an argument,
+ the argument value is returned here.
+ Also, when `ordering' is RETURN_IN_ORDER,
+ each non-option ARGV-element is returned here. */
+
+char *optarg;
+
+/* Index in ARGV of the next element to be scanned.
+ This is used for communication to and from the caller
+ and for communication between successive calls to `getopt'.
+
+ On entry to `getopt', zero means this is the first call; initialize.
+
+ When `getopt' returns -1, this is the index of the first of the
+ non-option elements that the caller should itself scan.
+
+ Otherwise, `optind' communicates from one call to the next
+ how much of ARGV has been scanned so far. */
+
+/* 1003.2 says this must be 1 before any call. */
+int optind = 1;
+
+/* Formerly, initialization of getopt depended on optind==0, which
+ causes problems with re-calling getopt as programs generally don't
+ know that. */
+
+int __getopt_initialized attribute_hidden;
+
+/* The next char to be scanned in the option-element
+ in which the last option character we returned was found.
+ This allows us to pick up the scan where we left off.
+
+ If this is zero, or a null string, it means resume the scan
+ by advancing to the next ARGV-element. */
+
+static char *nextchar;
+
+/* Callers store zero here to inhibit the error message
+ for unrecognized options. */
+
+int opterr = 1;
+
+/* Set to an option character which was unrecognized.
+ This must be initialized on some systems to avoid linking in the
+ system's own getopt implementation. */
+
+int optopt = '?';
+
+/* Describe how to deal with options that follow non-option ARGV-elements.
+
+ If the caller did not specify anything,
+ the default is REQUIRE_ORDER if the environment variable
+ POSIXLY_CORRECT is defined, PERMUTE otherwise.
+
+ REQUIRE_ORDER means don't recognize them as options;
+ stop option processing when the first non-option is seen.
+ This is what Unix does.
+ This mode of operation is selected by either setting the environment
+ variable POSIXLY_CORRECT, or using `+' as the first character
+ of the list of option characters.
+
+ PERMUTE is the default. We permute the contents of ARGV as we scan,
+ so that eventually all the non-options are at the end. This allows options
+ to be given in any order, even with programs that were not written to
+ expect this.
+
+ RETURN_IN_ORDER is an option available to programs that were written
+ to expect options and other ARGV-elements in any order and that care about
+ the ordering of the two. We describe each non-option ARGV-element
+ as if it were the argument of an option with character code 1.
+ Using `-' as the first character of the list of option characters
+ selects this mode of operation.
+
+ The special argument `--' forces an end of option-scanning regardless
+ of the value of `ordering'. In the case of RETURN_IN_ORDER, only
+ `--' can cause `getopt' to return -1 with `optind' != ARGC. */
+
+static enum
+{
+ REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
+} ordering;
+
+/* Value of POSIXLY_CORRECT environment variable. */
+static char *posixly_correct;
+
+#ifndef __GNU_LIBRARY__
+
+/* Avoid depending on library functions or files
+ whose names are inconsistent. */
+
+#ifndef getenv
+extern char *getenv ();
+#endif
+
+#endif /* not __GNU_LIBRARY__ */
+
+/* Handle permutation of arguments. */
+
+/* Describe the part of ARGV that contains non-options that have
+ been skipped. `first_nonopt' is the index in ARGV of the first of them;
+ `last_nonopt' is the index after the last of them. */
+
+static int first_nonopt;
+static int last_nonopt;
+
+#ifdef _LIBC
+/* Stored original parameters.
+ XXX This is no good solution. We should rather copy the args so
+ that we can compare them later. But we must not use malloc(3). */
+extern int __libc_argc;
+extern char **__libc_argv;
+
+/* Bash 2.0 gives us an environment variable containing flags
+ indicating ARGV elements that should not be considered arguments. */
+
+# ifdef USE_NONOPTION_FLAGS
+/* Defined in getopt_init.c */
+extern char *__getopt_nonoption_flags;
+
+static int nonoption_flags_max_len;
+static int nonoption_flags_len;
+# endif
+
+# ifdef USE_NONOPTION_FLAGS
+# define SWAP_FLAGS(ch1, ch2) \
+ if (nonoption_flags_len > 0) \
+ { \
+ char __tmp = __getopt_nonoption_flags[ch1]; \
+ __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \
+ __getopt_nonoption_flags[ch2] = __tmp; \
+ }
+# else
+# define SWAP_FLAGS(ch1, ch2)
+# endif
+#else /* !_LIBC */
+# define SWAP_FLAGS(ch1, ch2)
+#endif /* _LIBC */
+
+/* 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. */
+
+static void
+exchange (char **argv)
+{
+ int bottom = first_nonopt;
+ int middle = last_nonopt;
+ int top = optind;
+ char *tem;
+
+ /* Exchange the shorter segment with the far end of the longer segment.
+ That puts the shorter segment into the right place.
+ It leaves the longer segment in the right place overall,
+ but it consists of two parts that need to be swapped next. */
+
+#if defined _LIBC && defined USE_NONOPTION_FLAGS
+ /* First make sure the handling of the `__getopt_nonoption_flags'
+ string can work normally. Our top argument must be in the range
+ of the string. */
+ if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len)
+ {
+ /* We must extend the array. The user plays games with us and
+ presents new arguments. */
+ char *new_str = malloc (top + 1);
+ if (new_str == NULL)
+ nonoption_flags_len = nonoption_flags_max_len = 0;
+ else
+ {
+ memset (__mempcpy (new_str, __getopt_nonoption_flags,
+ nonoption_flags_max_len),
+ '\0', top + 1 - nonoption_flags_max_len);
+ nonoption_flags_max_len = top + 1;
+ __getopt_nonoption_flags = new_str;
+ }
+ }
+#endif
+
+ while (top > middle && middle > bottom)
+ {
+ if (top - middle > middle - bottom)
+ {
+ /* Bottom segment is the short one. */
+ int len = middle - bottom;
+ register int i;
+
+ /* Swap it with the top part of the top segment. */
+ for (i = 0; i < len; i++)
+ {
+ tem = argv[bottom + i];
+ argv[bottom + i] = argv[top - (middle - bottom) + i];
+ argv[top - (middle - bottom) + i] = tem;
+ SWAP_FLAGS (bottom + i, top - (middle - bottom) + i);
+ }
+ /* Exclude the moved bottom segment from further swapping. */
+ top -= len;
+ }
+ else
+ {
+ /* Top segment is the short one. */
+ int len = top - middle;
+ register int i;
+
+ /* Swap it with the bottom part of the bottom segment. */
+ for (i = 0; i < len; i++)
+ {
+ tem = argv[bottom + i];
+ argv[bottom + i] = argv[middle + i];
+ argv[middle + i] = tem;
+ SWAP_FLAGS (bottom + i, middle + i);
+ }
+ /* Exclude the moved top segment from further swapping. */
+ bottom += len;
+ }
+ }
+
+ /* Update records for the slots the non-options now occupy. */
+
+ first_nonopt += (optind - last_nonopt);
+ last_nonopt = optind;
+}
+
+/* Initialize the internal data when the first call is made. */
+
+static const char *
+_getopt_initialize (int argc, char *const *argv, const char *optstring)
+{
+ /* Start processing options with ARGV-element 1 (since ARGV-element 0
+ is the program name); the sequence of previously skipped
+ non-option ARGV-elements is empty. */
+
+ first_nonopt = last_nonopt = optind;
+
+ nextchar = NULL;
+
+ posixly_correct = getenv ("POSIXLY_CORRECT");
+
+ /* Determine how to handle the ordering of options and nonoptions. */
+
+ if (optstring[0] == '-')
+ {
+ ordering = RETURN_IN_ORDER;
+ ++optstring;
+ }
+ else if (optstring[0] == '+')
+ {
+ ordering = REQUIRE_ORDER;
+ ++optstring;
+ }
+ else if (posixly_correct != NULL)
+ ordering = REQUIRE_ORDER;
+ else
+ ordering = PERMUTE;
+
+#if defined _LIBC && defined USE_NONOPTION_FLAGS
+ if (posixly_correct == NULL
+ && argc == __libc_argc && argv == __libc_argv)
+ {
+ if (nonoption_flags_max_len == 0)
+ {
+ if (__getopt_nonoption_flags == NULL
+ || __getopt_nonoption_flags[0] == '\0')
+ nonoption_flags_max_len = -1;
+ else
+ {
+ const char *orig_str = __getopt_nonoption_flags;
+ int len = nonoption_flags_max_len = strlen (orig_str);
+ if (nonoption_flags_max_len < argc)
+ nonoption_flags_max_len = argc;
+ __getopt_nonoption_flags =
+ (char *) malloc (nonoption_flags_max_len);
+ if (__getopt_nonoption_flags == NULL)
+ nonoption_flags_max_len = -1;
+ else
+ memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
+ '\0', nonoption_flags_max_len - len);
+ }
+ }
+ nonoption_flags_len = nonoption_flags_max_len;
+ }
+ else
+ nonoption_flags_len = 0;
+#endif
+
+ return optstring;
+}
+
+/* Scan elements of ARGV (whose length is ARGC) for option characters
+ given in OPTSTRING.
+
+ If an element of ARGV starts with '-', and is not exactly "-" or "--",
+ then it is an option element. The characters of this element
+ (aside from the initial '-') are option characters. If `getopt'
+ is called repeatedly, it returns successively each of the option characters
+ from each of the option elements.
+
+ If `getopt' finds another option character, it returns that character,
+ updating `optind' and `nextchar' so that the next call to `getopt' can
+ resume the scan with the following option character or ARGV-element.
+
+ If there are no more option characters, `getopt' returns -1.
+ Then `optind' is the index in ARGV of the first ARGV-element
+ that is not an option. (The ARGV-elements have been permuted
+ so that those that are not options now come last.)
+
+ OPTSTRING is a string containing the legitimate option characters.
+ If an option character is seen that is not listed in OPTSTRING,
+ return '?' after printing an error message. If you set `opterr' to
+ zero, the error message is suppressed but we still return '?'.
+
+ If a char in OPTSTRING is followed by a colon, that means it wants an arg,
+ so the following text in the same ARGV-element, or the text of the following
+ ARGV-element, is returned in `optarg'. Two colons mean an option that
+ wants an optional arg; if there is text in the current ARGV-element,
+ it is returned in `optarg', otherwise `optarg' is set to zero.
+
+ If OPTSTRING starts with `-' or `+', it requests different methods of
+ handling the non-option ARGV-elements.
+ See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.
+
+ Long-named options begin with `--' instead of `-'.
+ Their names may be abbreviated as long as the abbreviation is unique
+ or is an exact match for some defined option. If they have an
+ argument, it follows the option name in the same ARGV-element, separated
+ from the option name by a `=', or else the in next ARGV-element.
+ When `getopt' finds a long-named option, it returns 0 if that option's
+ `flag' field is nonzero, the value of the option's `val' field
+ if the `flag' field is zero.
+
+ The elements of ARGV aren't really const, because we permute them.
+ But we pretend they're const in the prototype to be compatible
+ with other systems.
+
+ LONGOPTS is a vector of `struct option' terminated by an
+ element containing a name which is zero.
+
+ LONGIND returns the index in LONGOPT of the long-named option found.
+ It is only valid when a long-named option has been found by the most
+ recent call.
+
+ If LONG_ONLY is nonzero, '-' as well as '--' can introduce
+ long-named options. */
+
+int
+_getopt_internal (int argc, char *const *argv,
+ const char *optstring, const struct option *longopts,
+ int *longind, int long_only)
+{
+ int print_errors = opterr;
+ if (optstring[0] == ':')
+ print_errors = 0;
+
+ if (argc < 1)
+ return -1;
+
+ optarg = NULL;
+
+ if (optind == 0 || !__getopt_initialized)
+ {
+ if (optind == 0)
+ optind = 1; /* Don't scan ARGV[0], the program name. */
+ optstring = _getopt_initialize (argc, argv, optstring);
+ __getopt_initialized = 1;
+ }
+
+ /* 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. The later information
+ is only used when the used in the GNU libc. */
+#if defined _LIBC && defined USE_NONOPTION_FLAGS
+# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0'
\
+ || (optind < nonoption_flags_len \
+ && __getopt_nonoption_flags[optind] == '1'))
+#else
+# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0')
+#endif
+
+ 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. */
+
+ if (first_nonopt != last_nonopt && last_nonopt != optind)
+ exchange ((char **) argv);
+ else if (last_nonopt != optind)
+ first_nonopt = optind;
+
+ /* Skip any additional non-options
+ and extend the range of non-options previously skipped. */
+
+ while (optind < argc && NONOPTION_P)
+ optind++;
+ last_nonopt = optind;
+ }
+
+ /* The special ARGV-element `--' means premature end of options.
+ Skip it like a null option,
+ then exchange with previous non-options as if it were an option,
+ then skip everything else like a non-option. */
+
+ if (optind != argc && !strcmp (argv[optind], "--"))
+ {
+ optind++;
+
+ if (first_nonopt != last_nonopt && last_nonopt != optind)
+ exchange ((char **) argv);
+ else if (first_nonopt == last_nonopt)
+ first_nonopt = optind;
+ last_nonopt = argc;
+
+ optind = argc;
+ }
+
+ /* If we have done all the ARGV-elements, stop the scan
+ and back over any non-options that we skipped and permuted. */
+
+ if (optind == argc)
+ {
+ /* Set the next-arg-index to point at the non-options
+ that we previously skipped, so the caller will digest them. */
+ if (first_nonopt != last_nonopt)
+ optind = first_nonopt;
+ return -1;
+ }
+
+ /* 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 (NONOPTION_P)
+ {
+ if (ordering == REQUIRE_ORDER)
+ return -1;
+ optarg = argv[optind++];
+ return 1;
+ }
+
+ /* We have found another option-ARGV-element.
+ Skip the initial punctuation. */
+
+ nextchar = (argv[optind] + 1
+ + (longopts != NULL && argv[optind][1] == '-'));
+ }
+
+ /* Decode the current option-ARGV-element. */
+
+ /* Check whether the ARGV-element is a long option.
+
+ If long_only and the ARGV-element has the form "-f", where f is
+ a valid short option, don't consider it an abbreviated form of
+ a long option that starts with f. Otherwise there would be no
+ way to give the -f short option.
+
+ On the other hand, if there's a long option "fubar" and
+ the ARGV-element is "-fu", do consider that an abbreviation of
+ the long option, just like "--fu", and not "-f" with arg "u".
+
+ This distinction seems to be the most useful approach. */
+
+ if (longopts != NULL
+ && (argv[optind][1] == '-'
+ || (long_only
+ && (argv[optind][2] || !strchr (optstring, argv[optind][1])))))
+ {
+ char *nameend;
+ const struct option *p;
+ const struct option *pfound = NULL;
+ int exact = 0;
+ int ambig = 0;
+ int indfound = -1;
+ int option_index;
+
+ for (nameend = nextchar; *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 ((unsigned int) (nameend - nextchar)
+ == (unsigned int) 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 if (long_only
+ || pfound->has_arg != p->has_arg
+ || pfound->flag != p->flag
+ || pfound->val != p->val)
+ /* Second or later nonexact match found. */
+ ambig = 1;
+ }
+
+ if (ambig && !exact)
+ {
+ if (print_errors)
+ {
+#if defined _LIBC && defined USE_IN_LIBIO
+ char *buf;
+
+ if (__asprintf (&buf, _("%s: option `%s' is ambiguous\n"),
+ argv[0], argv[optind]) >= 0)
+ {
+
+ if (_IO_fwide (stderr, 0) > 0)
+ __fwprintf (stderr, L"%s", buf);
+ else
+ fputs (buf, stderr);
+
+ free (buf);
+ }
+#else
+ fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
+ argv[0], argv[optind]);
+#endif
+ }
+ nextchar += strlen (nextchar);
+ optind++;
+ optopt = 0;
+ return '?';
+ }
+
+ if (pfound != NULL)
+ {
+ option_index = indfound;
+ optind++;
+ 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 (print_errors)
+ {
+#if defined _LIBC && defined USE_IN_LIBIO
+ char *buf;
+ int n;
+#endif
+
+ if (argv[optind - 1][1] == '-')
+ {
+ /* --option */
+#if defined _LIBC && defined USE_IN_LIBIO
+ n = __asprintf (&buf, _("\
+%s: option `--%s' doesn't allow an argument\n"),
+ argv[0], pfound->name);
+#else
+ fprintf (stderr, _("\
+%s: option `--%s' doesn't allow an argument\n"),
+ argv[0], pfound->name);
+#endif
+ }
+ else
+ {
+ /* +option or -option */
+#if defined _LIBC && defined USE_IN_LIBIO
+ n = __asprintf (&buf, _("\
+%s: option `%c%s' doesn't allow an argument\n"),
+ argv[0], argv[optind - 1][0],
+ pfound->name);
+#else
+ fprintf (stderr, _("\
+%s: option `%c%s' doesn't allow an argument\n"),
+ argv[0], argv[optind - 1][0], pfound->name);
+#endif
+ }
+
+#if defined _LIBC && defined USE_IN_LIBIO
+ if (n >= 0)
+ {
+ if (_IO_fwide (stderr, 0) > 0)
+ __fwprintf (stderr, L"%s", buf);
+ else
+ fputs (buf, stderr);
+
+ free (buf);
+ }
+#endif
+ }
+
+ nextchar += strlen (nextchar);
+
+ optopt = pfound->val;
+ return '?';
+ }
+ }
+ else if (pfound->has_arg == 1)
+ {
+ if (optind < argc)
+ optarg = argv[optind++];
+ else
+ {
+ if (print_errors)
+ {
+#if defined _LIBC && defined USE_IN_LIBIO
+ char *buf;
+
+ if (__asprintf (&buf, _("\
+%s: option `%s' requires an argument\n"),
+ argv[0], argv[optind - 1]) >= 0)
+ {
+ if (_IO_fwide (stderr, 0) > 0)
+ __fwprintf (stderr, L"%s", buf);
+ else
+ fputs (buf, stderr);
+
+ free (buf);
+ }
+#else
+ fprintf (stderr,
+ _("%s: option `%s' requires an argument\n"),
+ argv[0], argv[optind - 1]);
+#endif
+ }
+ nextchar += strlen (nextchar);
+ optopt = pfound->val;
+ return optstring[0] == ':' ? ':' : '?';
+ }
+ }
+ nextchar += strlen (nextchar);
+ if (longind != NULL)
+ *longind = option_index;
+ if (pfound->flag)
+ {
+ *(pfound->flag) = pfound->val;
+ return 0;
+ }
+ return pfound->val;
+ }
+
+ /* Can't find it as a long option. If this is not getopt_long_only,
+ or the option starts with '--' or is not a valid short
+ option, then it's an error.
+ Otherwise interpret it as a short option. */
+ if (!long_only || argv[optind][1] == '-'
+ || strchr (optstring, *nextchar) == NULL)
+ {
+ if (print_errors)
+ {
+#if defined _LIBC && defined USE_IN_LIBIO
+ char *buf;
+ int n;
+#endif
+
+ if (argv[optind][1] == '-')
+ {
+ /* --option */
+#if defined _LIBC && defined USE_IN_LIBIO
+ n = __asprintf (&buf, _("%s: unrecognized option `--%s'\n"),
+ argv[0], nextchar);
+#else
+ fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
+ argv[0], nextchar);
+#endif
+ }
+ else
+ {
+ /* +option or -option */
+#if defined _LIBC && defined USE_IN_LIBIO
+ n = __asprintf (&buf, _("%s: unrecognized option `%c%s'\n"),
+ argv[0], argv[optind][0], nextchar);
+#else
+ fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
+ argv[0], argv[optind][0], nextchar);
+#endif
+ }
+
+#if defined _LIBC && defined USE_IN_LIBIO
+ if (n >= 0)
+ {
+ if (_IO_fwide (stderr, 0) > 0)
+ __fwprintf (stderr, L"%s", buf);
+ else
+ fputs (buf, stderr);
+
+ free (buf);
+ }
+#endif
+ }
+ nextchar = (char *) "";
+ optind++;
+ optopt = 0;
+ return '?';
+ }
+ }
+
+ /* Look at and handle the next short option-character. */
+
+ {
+ char c = *nextchar++;
+ char *temp = strchr (optstring, c);
+
+ /* Increment `optind' when we start to process its last character. */
+ if (*nextchar == '\0')
+ ++optind;
+
+ if (temp == NULL || c == ':')
+ {
+ if (print_errors)
+ {
+#if defined _LIBC && defined USE_IN_LIBIO
+ char *buf;
+ int n;
+#endif
+
+ if (posixly_correct)
+ {
+ /* 1003.2 specifies the format of this message. */
+#if defined _LIBC && defined USE_IN_LIBIO
+ n = __asprintf (&buf, _("%s: illegal option -- %c\n"),
+ argv[0], c);
+#else
+ fprintf (stderr, _("%s: illegal option -- %c\n"), argv[0], c);
+#endif
+ }
+ else
+ {
+#if defined _LIBC && defined USE_IN_LIBIO
+ n = __asprintf (&buf, _("%s: invalid option -- %c\n"),
+ argv[0], c);
+#else
+ fprintf (stderr, _("%s: invalid option -- %c\n"), argv[0], c);
+#endif
+ }
+
+#if defined _LIBC && defined USE_IN_LIBIO
+ if (n >= 0)
+ {
+ if (_IO_fwide (stderr, 0) > 0)
+ __fwprintf (stderr, L"%s", buf);
+ else
+ fputs (buf, stderr);
+
+ free (buf);
+ }
+#endif
+ }
+ 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 = 0;
+ 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 (print_errors)
+ {
+ /* 1003.2 specifies the format of this message. */
+#if defined _LIBC && defined USE_IN_LIBIO
+ char *buf;
+
+ if (__asprintf (&buf,
+ _("%s: option requires an argument -- %c\n"),
+ argv[0], c) >= 0)
+ {
+ if (_IO_fwide (stderr, 0) > 0)
+ __fwprintf (stderr, L"%s", buf);
+ else
+ fputs (buf, stderr);
+
+ free (buf);
+ }
+#else
+ fprintf (stderr, _("%s: option requires an argument -- %c\n"),
+ argv[0], c);
+#endif
+ }
+ optopt = c;
+ if (optstring[0] == ':')
+ c = ':';
+ else
+ c = '?';
+ return 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 ((unsigned int) (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 (print_errors)
+ {
+#if defined _LIBC && defined USE_IN_LIBIO
+ char *buf;
+
+ if (__asprintf (&buf, _("%s: option `-W %s' is ambiguous\n"),
+ argv[0], argv[optind]) >= 0)
+ {
+ if (_IO_fwide (stderr, 0) > 0)
+ __fwprintf (stderr, L"%s", buf);
+ else
+ fputs (buf, stderr);
+
+ free (buf);
+ }
+#else
+ fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
+ argv[0], argv[optind]);
+#endif
+ }
+ 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 (print_errors)
+ {
+#if defined _LIBC && defined USE_IN_LIBIO
+ char *buf;
+
+ if (__asprintf (&buf, _("\
+%s: option `-W %s' doesn't allow an argument\n"),
+ argv[0], pfound->name) >= 0)
+ {
+ if (_IO_fwide (stderr, 0) > 0)
+ __fwprintf (stderr, L"%s", buf);
+ else
+ fputs (buf, stderr);
+
+ free (buf);
+ }
+#else
+ fprintf (stderr, _("\
+%s: option `-W %s' doesn't allow an argument\n"),
+ argv[0], pfound->name);
+#endif
+ }
+
+ nextchar += strlen (nextchar);
+ return '?';
+ }
+ }
+ else if (pfound->has_arg == 1)
+ {
+ if (optind < argc)
+ optarg = argv[optind++];
+ else
+ {
+ if (print_errors)
+ {
+#if defined _LIBC && defined USE_IN_LIBIO
+ char *buf;
+
+ if (__asprintf (&buf, _("\
+%s: option `%s' requires an argument\n"),
+ argv[0], argv[optind - 1]) >= 0)
+ {
+ if (_IO_fwide (stderr, 0) > 0)
+ __fwprintf (stderr, L"%s", buf);
+ else
+ fputs (buf, stderr);
+
+ free (buf);
+ }
+#else
+ fprintf (stderr,
+ _("%s: option `%s' requires an argument\n"),
+ argv[0], argv[optind - 1]);
+#endif
+ }
+ 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] == ':')
+ {
+ /* This is an option that accepts an argument optionally. */
+ if (*nextchar != '\0')
+ {
+ optarg = nextchar;
+ optind++;
+ }
+ else
+ optarg = NULL;
+ nextchar = NULL;
+ }
+ else
+ {
+ /* 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 (print_errors)
+ {
+ /* 1003.2 specifies the format of this message. */
+#if defined _LIBC && defined USE_IN_LIBIO
+ char *buf;
+
+ if (__asprintf (&buf, _("\
+%s: option requires an argument -- %c\n"),
+ argv[0], c) >= 0)
+ {
+ if (_IO_fwide (stderr, 0) > 0)
+ __fwprintf (stderr, L"%s", buf);
+ else
+ fputs (buf, stderr);
+
+ free (buf);
+ }
+#else
+ fprintf (stderr,
+ _("%s: option requires an argument -- %c\n"),
+ argv[0], c);
+#endif
+ }
+ 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++];
+ nextchar = NULL;
+ }
+ }
+ return c;
+ }
+}
+
+int
+getopt (int argc, char *const *argv, const char *optstring)
+{
+ return _getopt_internal (argc, argv, optstring,
+ (const struct option *) 0,
+ (int *) 0,
+ 0);
+}
+
+#endif /* Not ELIDE_CODE. */
+
+#ifdef TEST
+
+/* Compile with -DTEST to make an executable for use in testing
+ the above definition of `getopt'. */
+
+int
+main (int argc, char **argv)
+{
+ int c;
+ int digit_optind = 0;
+
+ while (1)
+ {
+ int this_option_optind = optind ? optind : 1;
+
+ c = getopt (argc, argv, "abc:d:0123456789");
+ if (c == -1)
+ break;
+
+ switch (c)
+ {
+ 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 '?':
+ 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 */
Index: gnulib/m4/getopt.h
===================================================================
RCS file: gnulib/m4/getopt.h
diff -N gnulib/m4/getopt.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnulib/m4/getopt.h 12 Sep 2003 15:16:59 -0000
@@ -0,0 +1,169 @@
+/* Declarations for getopt.
+
+ Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998,
+ 1999, 2001, 2003 Free Software Foundation, Inc.
+
+ This file is part of the GNU C Library.
+
+ 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 later version.
+
+ This program 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 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,
+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#ifndef _GETOPT_H
+
+#ifndef __need_getopt
+# define _GETOPT_H 1
+#endif
+
+/* If __GNU_LIBRARY__ is not already defined, either we are being used
+ standalone, or this is the first header included in the source file.
+ If we are being used with glibc, we need to include <features.h>, but
+ that does not exist if we are standalone. So: if __GNU_LIBRARY__ is
+ not defined, include <ctype.h>, which will pull in <features.h> for us
+ if it's from glibc. (Why ctype.h? It's guaranteed to exist and it
+ doesn't flood the namespace with stuff the way some other headers do.) */
+#if !defined __GNU_LIBRARY__
+# include <ctype.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* For communication from `getopt' to the caller.
+ When `getopt' finds an option that takes an argument,
+ the argument value is returned here.
+ Also, when `ordering' is RETURN_IN_ORDER,
+ each non-option ARGV-element is returned here. */
+
+extern char *optarg;
+
+/* Index in ARGV of the next element to be scanned.
+ This is used for communication to and from the caller
+ and for communication between successive calls to `getopt'.
+
+ On entry to `getopt', zero means this is the first call; initialize.
+
+ When `getopt' returns -1, this is the index of the first of the
+ non-option elements that the caller should itself scan.
+
+ Otherwise, `optind' communicates from one call to the next
+ how much of ARGV has been scanned so far. */
+
+extern int optind;
+
+/* Callers store zero here to inhibit the error message `getopt' prints
+ for unrecognized options. */
+
+extern int opterr;
+
+/* Set to an option character which was unrecognized. */
+
+extern int optopt;
+
+#ifndef __need_getopt
+/* Describe the long-named options requested by the application.
+ The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
+ of `struct option' terminated by an element containing a name which is
+ zero.
+
+ The field `has_arg' is:
+ no_argument (or 0) if the option does not take an argument,
+ required_argument (or 1) if the option requires an argument,
+ optional_argument (or 2) if the option takes an optional argument.
+
+ If the field `flag' is not NULL, it points to a variable that is set
+ to the value given in the field `val' when the option is found, but
+ left unchanged if the option is not found.
+
+ To have a long-named option do something other than set an `int' to
+ a compiled-in constant, such as set a value from `optarg', set the
+ option's `flag' field to zero and its `val' field to a nonzero
+ value (the equivalent single-letter option character, if there is
+ one). For long options that have a zero `flag' field, `getopt'
+ returns the contents of the `val' field. */
+
+struct option
+{
+ const char *name;
+ /* has_arg can't be an enum because some compilers complain about
+ type mismatches in all the code that assumes it is an int. */
+ int has_arg;
+ int *flag;
+ int val;
+};
+
+/* Names for the values of the `has_arg' field of `struct option'. */
+
+# define no_argument 0
+# define required_argument 1
+# define optional_argument 2
+#endif /* need getopt */
+
+
+/* Get definitions and prototypes for functions to process the
+ arguments in ARGV (ARGC of them, minus the program name) for
+ options given in OPTS.
+
+ Return the option character from OPTS just read. Return -1 when
+ there are no more options. For unrecognized options, or options
+ missing arguments, `optopt' is set to the option letter, and '?' is
+ returned.
+
+ The OPTS string is a list of characters which are recognized option
+ letters, optionally followed by colons, specifying that that letter
+ takes an argument, to be placed in `optarg'.
+
+ If a letter in OPTS is followed by two colons, its argument is
+ optional. This behavior is specific to the GNU `getopt'.
+
+ The argument `--' causes premature termination of argument
+ scanning, explicitly telling `getopt' that there are no more
+ options.
+
+ If OPTS begins with `--', then non-option arguments are treated as
+ arguments to the option '\0'. This behavior is specific to the GNU
+ `getopt'. */
+
+#ifdef __GNU_LIBRARY__
+/* Many other libraries have conflicting prototypes for getopt, with
+ differences in the consts, in stdlib.h. To avoid compilation
+ errors, only prototype getopt for the GNU C library. */
+extern int getopt (int ___argc, char *const *___argv, const char *__shortopts);
+#else /* not __GNU_LIBRARY__ */
+extern int getopt ();
+#endif /* __GNU_LIBRARY__ */
+
+#ifndef __need_getopt
+extern int getopt_long (int ___argc, char *const *___argv,
+ const char *__shortopts,
+ const struct option *__longopts, int *__longind);
+extern int getopt_long_only (int ___argc, char *const *___argv,
+ const char *__shortopts,
+ const struct option *__longopts, int *__longind);
+
+/* Internal only. Users should not call this directly. */
+extern int _getopt_internal (int ___argc, char *const *___argv,
+ const char *__shortopts,
+ const struct option *__longopts, int *__longind,
+ int __long_only);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Make sure we later can get all the definitions and declarations. */
+#undef __need_getopt
+
+#endif /* getopt.h */
Index: gnulib/m4/getopt1.c
===================================================================
RCS file: gnulib/m4/getopt1.c
diff -N gnulib/m4/getopt1.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnulib/m4/getopt1.c 12 Sep 2003 15:16:59 -0000
@@ -0,0 +1,185 @@
+/* getopt_long and getopt_long_only entry points for GNU getopt.
+
+ Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1996,
+ 1997, 1998, 2003 Free Software Foundation, Inc.
+
+ This file is part of the GNU C Library.
+
+ 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 later version.
+
+ This program 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 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,
+ 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 <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);
+}
+
+/* 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);
+}
+
+# ifdef _LIBC
+libc_hidden_def (getopt_long)
+libc_hidden_def (getopt_long_only)
+# endif
+
+#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 */
Index: po/POTFILES.in
===================================================================
RCS file: /cvsroot/m4/m4/po/POTFILES.in,v
retrieving revision 1.9
diff -u -p -u -r1.9 POTFILES.in
--- po/POTFILES.in 12 Sep 2003 13:27:54 -0000 1.9
+++ po/POTFILES.in 12 Sep 2003 15:16:59 -0000
@@ -1,3 +1,4 @@
+gnulib/m4/getopt.c
gnulib/m4/obstack.c
gnulib/m4/xmalloc.c
gnulib/m4/regex.c
@@ -18,6 +19,5 @@ modules/mpeval.c
modules/perl.c
modules/traditional.c
src/freeze.c
-src/getopt.c
src/main.c
src/stackovf.c
Index: po/cs.po
===================================================================
RCS file: /cvsroot/m4/m4/po/cs.po,v
retrieving revision 1.33
diff -u -p -u -r1.33 cs.po
--- po/cs.po 12 Sep 2003 13:27:54 -0000 1.33
+++ po/cs.po 12 Sep 2003 15:16:59 -0000
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: m4 1.4n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-12 13:22+0100\n"
+"POT-Creation-Date: 2003-09-12 15:21+0100\n"
"PO-Revision-Date: 1998-12-07 22:02+01:00\n"
"Last-Translator: Jiøí Pavlovský <address@hidden>\n"
"Language-Team: Czech <address@hidden>\n"
@@ -14,87 +14,144 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
+#: gnulib/m4/getopt.c:629 gnulib/m4/getopt.c:641
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:674 gnulib/m4/getopt.c:678
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:687 gnulib/m4/getopt.c:692
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:728 gnulib/m4/getopt.c:741 gnulib/m4/getopt.c:1030
+#: gnulib/m4/getopt.c:1043
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:779 gnulib/m4/getopt.c:782
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:790 gnulib/m4/getopt.c:793
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:840 gnulib/m4/getopt.c:843
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:849 gnulib/m4/getopt.c:852
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:899 gnulib/m4/getopt.c:910 gnulib/m4/getopt.c:1096
+#: gnulib/m4/getopt.c:1109
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:962 gnulib/m4/getopt.c:973
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:997 gnulib/m4/getopt.c:1009
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr ""
+
#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490 gnulib/m4/xmalloc.c:62
msgid "memory exhausted"
msgstr ""
-#: m4/regex.c:1021
+#: gnulib/m4/regex.c:1302
msgid "Success"
msgstr ""
-#: m4/regex.c:1024
+#: gnulib/m4/regex.c:1305
msgid "No match"
msgstr ""
# , c-format
-#: m4/regex.c:1027
+#: gnulib/m4/regex.c:1308
#, fuzzy
msgid "Invalid regular expression"
msgstr "©patný regulární výraz `%s': %s"
-#: m4/regex.c:1030
+#: gnulib/m4/regex.c:1311
msgid "Invalid collation character"
msgstr ""
-#: m4/regex.c:1033
+#: gnulib/m4/regex.c:1314
msgid "Invalid character class name"
msgstr ""
-#: m4/regex.c:1036
+#: gnulib/m4/regex.c:1317
msgid "Trailing backslash"
msgstr ""
-#: m4/regex.c:1039
+#: gnulib/m4/regex.c:1320
msgid "Invalid back reference"
msgstr ""
-#: m4/regex.c:1042
+#: gnulib/m4/regex.c:1323
msgid "Unmatched [ or [^"
msgstr ""
-#: m4/regex.c:1045
+#: gnulib/m4/regex.c:1326
msgid "Unmatched ( or \\("
msgstr ""
-#: m4/regex.c:1048
+#: gnulib/m4/regex.c:1329
msgid "Unmatched \\{"
msgstr ""
-#: m4/regex.c:1051
+#: gnulib/m4/regex.c:1332
msgid "Invalid content of \\{\\}"
msgstr ""
-#: m4/regex.c:1054
+#: gnulib/m4/regex.c:1335
msgid "Invalid range end"
msgstr ""
-#: m4/regex.c:1057
+#: gnulib/m4/regex.c:1338
msgid "Memory exhausted"
msgstr ""
# , c-format
-#: m4/regex.c:1060
+#: gnulib/m4/regex.c:1341
#, fuzzy
msgid "Invalid preceding regular expression"
msgstr "Chyba pøi porovnávání regulárního výrazu `%s'"
-#: m4/regex.c:1063
+#: gnulib/m4/regex.c:1344
#, fuzzy
msgid "Premature end of regular expression"
msgstr "Pøedèasný konec zmrazeného souboru"
# , c-format
-#: m4/regex.c:1066
+#: gnulib/m4/regex.c:1347
#, fuzzy
msgid "Regular expression too big"
msgstr "©patný regulární výraz `%s': %s"
-#: m4/regex.c:1069
+#: gnulib/m4/regex.c:1350
msgid "Unmatched ) or \\)"
msgstr ""
# , c-format
-#: m4/regex.c:5566
+#: gnulib/m4/regex.c:7915
#, fuzzy
msgid "No previous regular expression"
msgstr "Chyba pøi porovnávání regulárního výrazu `%s'"
@@ -389,61 +446,6 @@ msgstr "©patný formát zmrazeného souboru
#, c-format
msgid "`%s' from frozen file not found in builtin table!"
msgstr "`%s' ze zmrazeného souboru nenalezeno v tabulce vestavìných maker!"
-
-#: src/getopt.c:677
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr ""
-
-#: src/getopt.c:702
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr ""
-
-#: src/getopt.c:707
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr ""
-
-#: src/getopt.c:725 src/getopt.c:898
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr ""
-
-#: src/getopt.c:754
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr ""
-
-#: src/getopt.c:758
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr ""
-
-#: src/getopt.c:784
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: src/getopt.c:787
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr ""
-
-#: src/getopt.c:817 src/getopt.c:947
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr ""
-
-#: src/getopt.c:864
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr ""
-
-#: src/getopt.c:882
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr ""
#: src/main.c:74
#, fuzzy
Index: po/de.po
===================================================================
RCS file: /cvsroot/m4/m4/po/de.po,v
retrieving revision 1.33
diff -u -p -u -r1.33 de.po
--- po/de.po 12 Sep 2003 13:27:54 -0000 1.33
+++ po/de.po 12 Sep 2003 15:16:59 -0000
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: m4 1.4ppre2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-12 13:22+0100\n"
+"POT-Creation-Date: 2003-09-12 15:21+0100\n"
"PO-Revision-Date: 1999-03-20 00:46+01:00\n"
"Last-Translator: Martin von Löwis <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -16,83 +16,140 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
+#: gnulib/m4/getopt.c:629 gnulib/m4/getopt.c:641
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:674 gnulib/m4/getopt.c:678
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:687 gnulib/m4/getopt.c:692
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:728 gnulib/m4/getopt.c:741 gnulib/m4/getopt.c:1030
+#: gnulib/m4/getopt.c:1043
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:779 gnulib/m4/getopt.c:782
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:790 gnulib/m4/getopt.c:793
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:840 gnulib/m4/getopt.c:843
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:849 gnulib/m4/getopt.c:852
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:899 gnulib/m4/getopt.c:910 gnulib/m4/getopt.c:1096
+#: gnulib/m4/getopt.c:1109
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:962 gnulib/m4/getopt.c:973
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:997 gnulib/m4/getopt.c:1009
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr ""
+
#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490 gnulib/m4/xmalloc.c:62
msgid "memory exhausted"
msgstr ""
-#: m4/regex.c:1021
+#: gnulib/m4/regex.c:1302
msgid "Success"
msgstr ""
-#: m4/regex.c:1024
+#: gnulib/m4/regex.c:1305
msgid "No match"
msgstr ""
-#: m4/regex.c:1027
+#: gnulib/m4/regex.c:1308
#, fuzzy
msgid "Invalid regular expression"
msgstr "Falscher regulärer Ausdruck »%s«: %s"
-#: m4/regex.c:1030
+#: gnulib/m4/regex.c:1311
msgid "Invalid collation character"
msgstr ""
-#: m4/regex.c:1033
+#: gnulib/m4/regex.c:1314
msgid "Invalid character class name"
msgstr ""
-#: m4/regex.c:1036
+#: gnulib/m4/regex.c:1317
msgid "Trailing backslash"
msgstr ""
-#: m4/regex.c:1039
+#: gnulib/m4/regex.c:1320
msgid "Invalid back reference"
msgstr ""
-#: m4/regex.c:1042
+#: gnulib/m4/regex.c:1323
msgid "Unmatched [ or [^"
msgstr ""
-#: m4/regex.c:1045
+#: gnulib/m4/regex.c:1326
msgid "Unmatched ( or \\("
msgstr ""
-#: m4/regex.c:1048
+#: gnulib/m4/regex.c:1329
msgid "Unmatched \\{"
msgstr ""
-#: m4/regex.c:1051
+#: gnulib/m4/regex.c:1332
msgid "Invalid content of \\{\\}"
msgstr ""
-#: m4/regex.c:1054
+#: gnulib/m4/regex.c:1335
msgid "Invalid range end"
msgstr ""
-#: m4/regex.c:1057
+#: gnulib/m4/regex.c:1338
msgid "Memory exhausted"
msgstr ""
-#: m4/regex.c:1060
+#: gnulib/m4/regex.c:1341
#, fuzzy
msgid "Invalid preceding regular expression"
msgstr "Fehler beim Erkennen des regulären Ausdrucks »%s«"
-#: m4/regex.c:1063
+#: gnulib/m4/regex.c:1344
#, fuzzy
msgid "Premature end of regular expression"
msgstr "Vorzeitiges Ende der eingefrorenen Datei"
-#: m4/regex.c:1066
+#: gnulib/m4/regex.c:1347
#, fuzzy
msgid "Regular expression too big"
msgstr "Falscher regulärer Ausdruck »%s«: %s"
-#: m4/regex.c:1069
+#: gnulib/m4/regex.c:1350
msgid "Unmatched ) or \\)"
msgstr ""
-#: m4/regex.c:5566
+#: gnulib/m4/regex.c:7915
#, fuzzy
msgid "No previous regular expression"
msgstr "Fehler beim Erkennen des regulären Ausdrucks »%s«"
@@ -358,61 +415,6 @@ msgid "`%s' from frozen file not found i
msgstr ""
"»%s« aus eingefrorener Datei nicht in Tabelle der eingebauten Funktionen "
"gefunden!"
-
-#: src/getopt.c:677
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr ""
-
-#: src/getopt.c:702
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr ""
-
-#: src/getopt.c:707
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr ""
-
-#: src/getopt.c:725 src/getopt.c:898
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr ""
-
-#: src/getopt.c:754
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr ""
-
-#: src/getopt.c:758
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr ""
-
-#: src/getopt.c:784
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: src/getopt.c:787
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr ""
-
-#: src/getopt.c:817 src/getopt.c:947
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr ""
-
-#: src/getopt.c:864
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr ""
-
-#: src/getopt.c:882
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr ""
#: src/main.c:74
#, fuzzy
Index: po/el.po
===================================================================
RCS file: /cvsroot/m4/m4/po/el.po,v
retrieving revision 1.33
diff -u -p -u -r1.33 el.po
--- po/el.po 12 Sep 2003 13:27:54 -0000 1.33
+++ po/el.po 12 Sep 2003 15:16:59 -0000
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU m4 1.4n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-12 13:22+0100\n"
+"POT-Creation-Date: 2003-09-12 15:21+0100\n"
"PO-Revision-Date: 1999-06-24 00:25+0000\n"
"Last-Translator: Simos Xenitellis <address@hidden>\n"
"Language-Team: Greek <address@hidden>\n"
@@ -14,83 +14,140 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-7\n"
"Content-Transfer-Encoding: 8-bit\n"
+#: gnulib/m4/getopt.c:629 gnulib/m4/getopt.c:641
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:674 gnulib/m4/getopt.c:678
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:687 gnulib/m4/getopt.c:692
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:728 gnulib/m4/getopt.c:741 gnulib/m4/getopt.c:1030
+#: gnulib/m4/getopt.c:1043
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:779 gnulib/m4/getopt.c:782
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:790 gnulib/m4/getopt.c:793
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:840 gnulib/m4/getopt.c:843
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:849 gnulib/m4/getopt.c:852
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:899 gnulib/m4/getopt.c:910 gnulib/m4/getopt.c:1096
+#: gnulib/m4/getopt.c:1109
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:962 gnulib/m4/getopt.c:973
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:997 gnulib/m4/getopt.c:1009
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr ""
+
#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490 gnulib/m4/xmalloc.c:62
msgid "memory exhausted"
msgstr ""
-#: m4/regex.c:1021
+#: gnulib/m4/regex.c:1302
msgid "Success"
msgstr ""
-#: m4/regex.c:1024
+#: gnulib/m4/regex.c:1305
msgid "No match"
msgstr ""
-#: m4/regex.c:1027
+#: gnulib/m4/regex.c:1308
#, fuzzy
msgid "Invalid regular expression"
msgstr "ËÜèïò êáíïíéêÞ Ýêöñáóç `%s': %s"
-#: m4/regex.c:1030
+#: gnulib/m4/regex.c:1311
msgid "Invalid collation character"
msgstr ""
-#: m4/regex.c:1033
+#: gnulib/m4/regex.c:1314
msgid "Invalid character class name"
msgstr ""
-#: m4/regex.c:1036
+#: gnulib/m4/regex.c:1317
msgid "Trailing backslash"
msgstr ""
-#: m4/regex.c:1039
+#: gnulib/m4/regex.c:1320
msgid "Invalid back reference"
msgstr ""
-#: m4/regex.c:1042
+#: gnulib/m4/regex.c:1323
msgid "Unmatched [ or [^"
msgstr ""
-#: m4/regex.c:1045
+#: gnulib/m4/regex.c:1326
msgid "Unmatched ( or \\("
msgstr ""
-#: m4/regex.c:1048
+#: gnulib/m4/regex.c:1329
msgid "Unmatched \\{"
msgstr ""
-#: m4/regex.c:1051
+#: gnulib/m4/regex.c:1332
msgid "Invalid content of \\{\\}"
msgstr ""
-#: m4/regex.c:1054
+#: gnulib/m4/regex.c:1335
msgid "Invalid range end"
msgstr ""
-#: m4/regex.c:1057
+#: gnulib/m4/regex.c:1338
msgid "Memory exhausted"
msgstr ""
-#: m4/regex.c:1060
+#: gnulib/m4/regex.c:1341
#, fuzzy
msgid "Invalid preceding regular expression"
msgstr "ÓöÜëìá óôï ôáßñéáóìá óôçí êáíïíéêÞ Ýêöñáóç `%s'"
-#: m4/regex.c:1063
+#: gnulib/m4/regex.c:1344
#, fuzzy
msgid "Premature end of regular expression"
msgstr "Ðñüùñï ôÝëïò ðáãùìÝíïõ áñ÷åßïõ"
-#: m4/regex.c:1066
+#: gnulib/m4/regex.c:1347
#, fuzzy
msgid "Regular expression too big"
msgstr "ËÜèïò êáíïíéêÞ Ýêöñáóç `%s': %s"
-#: m4/regex.c:1069
+#: gnulib/m4/regex.c:1350
msgid "Unmatched ) or \\)"
msgstr ""
-#: m4/regex.c:5566
+#: gnulib/m4/regex.c:7915
#, fuzzy
msgid "No previous regular expression"
msgstr "ÓöÜëìá óôï ôáßñéáóìá óôçí êáíïíéêÞ Ýêöñáóç `%s'"
@@ -355,61 +412,6 @@ msgstr "Êáêü-ìïñöïðïéçìÝíï ðáãùìÝíï áñ÷å
#, c-format
msgid "`%s' from frozen file not found in builtin table!"
msgstr "ôï `%s' áðü ðáãùìÝíï áñ÷åßï äå âñÝèçêå óôïí ðßíáêá åóùäïìçìÝíùí"
-
-#: src/getopt.c:677
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr ""
-
-#: src/getopt.c:702
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr ""
-
-#: src/getopt.c:707
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr ""
-
-#: src/getopt.c:725 src/getopt.c:898
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr ""
-
-#: src/getopt.c:754
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr ""
-
-#: src/getopt.c:758
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr ""
-
-#: src/getopt.c:784
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: src/getopt.c:787
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr ""
-
-#: src/getopt.c:817 src/getopt.c:947
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr ""
-
-#: src/getopt.c:864
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr ""
-
-#: src/getopt.c:882
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr ""
#: src/main.c:74
#, fuzzy
Index: po/fr.po
===================================================================
RCS file: /cvsroot/m4/m4/po/fr.po,v
retrieving revision 1.33
diff -u -p -u -r1.33 fr.po
--- po/fr.po 12 Sep 2003 13:27:54 -0000 1.33
+++ po/fr.po 12 Sep 2003 15:16:59 -0000
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: m4 1.4d\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-12 13:22+0100\n"
+"POT-Creation-Date: 2003-09-12 15:21+0100\n"
"PO-Revision-Date: 1998-05-23 11:53+02:00\n"
"Last-Translator: Erick Branderhorst <address@hidden>\n"
"Language-Team: dutch <address@hidden>\n"
@@ -16,83 +16,140 @@ msgstr ""
"Content-Type: text/plain; charset=\n"
"Content-Transfer-Encoding: 8-bit\n"
+#: gnulib/m4/getopt.c:629 gnulib/m4/getopt.c:641
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:674 gnulib/m4/getopt.c:678
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:687 gnulib/m4/getopt.c:692
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:728 gnulib/m4/getopt.c:741 gnulib/m4/getopt.c:1030
+#: gnulib/m4/getopt.c:1043
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:779 gnulib/m4/getopt.c:782
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:790 gnulib/m4/getopt.c:793
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:840 gnulib/m4/getopt.c:843
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:849 gnulib/m4/getopt.c:852
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:899 gnulib/m4/getopt.c:910 gnulib/m4/getopt.c:1096
+#: gnulib/m4/getopt.c:1109
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:962 gnulib/m4/getopt.c:973
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:997 gnulib/m4/getopt.c:1009
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr ""
+
#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490 gnulib/m4/xmalloc.c:62
msgid "memory exhausted"
msgstr ""
-#: m4/regex.c:1021
+#: gnulib/m4/regex.c:1302
msgid "Success"
msgstr ""
-#: m4/regex.c:1024
+#: gnulib/m4/regex.c:1305
msgid "No match"
msgstr ""
-#: m4/regex.c:1027
+#: gnulib/m4/regex.c:1308
#, fuzzy
msgid "Invalid regular expression"
msgstr "Mauvaise expression régulière «%s»: %s"
-#: m4/regex.c:1030
+#: gnulib/m4/regex.c:1311
msgid "Invalid collation character"
msgstr ""
-#: m4/regex.c:1033
+#: gnulib/m4/regex.c:1314
msgid "Invalid character class name"
msgstr ""
-#: m4/regex.c:1036
+#: gnulib/m4/regex.c:1317
msgid "Trailing backslash"
msgstr ""
-#: m4/regex.c:1039
+#: gnulib/m4/regex.c:1320
msgid "Invalid back reference"
msgstr ""
-#: m4/regex.c:1042
+#: gnulib/m4/regex.c:1323
msgid "Unmatched [ or [^"
msgstr ""
-#: m4/regex.c:1045
+#: gnulib/m4/regex.c:1326
msgid "Unmatched ( or \\("
msgstr ""
-#: m4/regex.c:1048
+#: gnulib/m4/regex.c:1329
msgid "Unmatched \\{"
msgstr ""
-#: m4/regex.c:1051
+#: gnulib/m4/regex.c:1332
msgid "Invalid content of \\{\\}"
msgstr ""
-#: m4/regex.c:1054
+#: gnulib/m4/regex.c:1335
msgid "Invalid range end"
msgstr ""
-#: m4/regex.c:1057
+#: gnulib/m4/regex.c:1338
msgid "Memory exhausted"
msgstr ""
-#: m4/regex.c:1060
+#: gnulib/m4/regex.c:1341
#, fuzzy
msgid "Invalid preceding regular expression"
msgstr "Erreur d'appariement pour l'expressio régulière «%s»"
-#: m4/regex.c:1063
+#: gnulib/m4/regex.c:1344
#, fuzzy
msgid "Premature end of regular expression"
msgstr "Fin prématurée de fichier figé"
-#: m4/regex.c:1066
+#: gnulib/m4/regex.c:1347
#, fuzzy
msgid "Regular expression too big"
msgstr "Mauvaise expression régulière «%s»: %s"
-#: m4/regex.c:1069
+#: gnulib/m4/regex.c:1350
msgid "Unmatched ) or \\)"
msgstr ""
-#: m4/regex.c:5566
+#: gnulib/m4/regex.c:7915
#, fuzzy
msgid "No previous regular expression"
msgstr "Erreur d'appariement pour l'expressio régulière «%s»"
@@ -353,61 +410,6 @@ msgstr "Fichier figé difforme"
#, c-format
msgid "`%s' from frozen file not found in builtin table!"
msgstr "«%s» dans le fichier figé est introuvable dans la table des
prédéfinis!"
-
-#: src/getopt.c:677
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr ""
-
-#: src/getopt.c:702
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr ""
-
-#: src/getopt.c:707
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr ""
-
-#: src/getopt.c:725 src/getopt.c:898
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr ""
-
-#: src/getopt.c:754
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr ""
-
-#: src/getopt.c:758
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr ""
-
-#: src/getopt.c:784
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: src/getopt.c:787
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr ""
-
-#: src/getopt.c:817 src/getopt.c:947
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr ""
-
-#: src/getopt.c:864
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr ""
-
-#: src/getopt.c:882
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr ""
#: src/main.c:74
#, fuzzy
Index: po/it.po
===================================================================
RCS file: /cvsroot/m4/m4/po/it.po,v
retrieving revision 1.34
diff -u -p -u -r1.34 it.po
--- po/it.po 12 Sep 2003 13:27:54 -0000 1.34
+++ po/it.po 12 Sep 2003 15:16:59 -0000
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU M4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-12 13:22+0100\n"
+"POT-Creation-Date: 2003-09-12 15:21+0100\n"
"PO-Revision-Date: 2002-11-04 13:19+0100\n"
"Last-Translator: full name <address@hidden>\n"
"Language-Team: Italian <address@hidden>\n"
@@ -14,83 +14,140 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+#: gnulib/m4/getopt.c:629 gnulib/m4/getopt.c:641
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:674 gnulib/m4/getopt.c:678
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:687 gnulib/m4/getopt.c:692
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:728 gnulib/m4/getopt.c:741 gnulib/m4/getopt.c:1030
+#: gnulib/m4/getopt.c:1043
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:779 gnulib/m4/getopt.c:782
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:790 gnulib/m4/getopt.c:793
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:840 gnulib/m4/getopt.c:843
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:849 gnulib/m4/getopt.c:852
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:899 gnulib/m4/getopt.c:910 gnulib/m4/getopt.c:1096
+#: gnulib/m4/getopt.c:1109
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:962 gnulib/m4/getopt.c:973
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:997 gnulib/m4/getopt.c:1009
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr ""
+
#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490 gnulib/m4/xmalloc.c:62
msgid "memory exhausted"
msgstr ""
-#: m4/regex.c:1021
+#: gnulib/m4/regex.c:1302
msgid "Success"
msgstr ""
-#: m4/regex.c:1024
+#: gnulib/m4/regex.c:1305
msgid "No match"
msgstr ""
-#: m4/regex.c:1027
+#: gnulib/m4/regex.c:1308
#, fuzzy
msgid "Invalid regular expression"
msgstr "Espressione regolare errata `%s': %s"
-#: m4/regex.c:1030
+#: gnulib/m4/regex.c:1311
msgid "Invalid collation character"
msgstr ""
-#: m4/regex.c:1033
+#: gnulib/m4/regex.c:1314
msgid "Invalid character class name"
msgstr ""
-#: m4/regex.c:1036
+#: gnulib/m4/regex.c:1317
msgid "Trailing backslash"
msgstr ""
-#: m4/regex.c:1039
+#: gnulib/m4/regex.c:1320
msgid "Invalid back reference"
msgstr ""
-#: m4/regex.c:1042
+#: gnulib/m4/regex.c:1323
msgid "Unmatched [ or [^"
msgstr ""
-#: m4/regex.c:1045
+#: gnulib/m4/regex.c:1326
msgid "Unmatched ( or \\("
msgstr ""
-#: m4/regex.c:1048
+#: gnulib/m4/regex.c:1329
msgid "Unmatched \\{"
msgstr ""
-#: m4/regex.c:1051
+#: gnulib/m4/regex.c:1332
msgid "Invalid content of \\{\\}"
msgstr ""
-#: m4/regex.c:1054
+#: gnulib/m4/regex.c:1335
msgid "Invalid range end"
msgstr ""
-#: m4/regex.c:1057
+#: gnulib/m4/regex.c:1338
msgid "Memory exhausted"
msgstr ""
-#: m4/regex.c:1060
+#: gnulib/m4/regex.c:1341
#, fuzzy
msgid "Invalid preceding regular expression"
msgstr "Errore nel confronto dell' espressione regolare `%s'"
-#: m4/regex.c:1063
+#: gnulib/m4/regex.c:1344
#, fuzzy
msgid "Premature end of regular expression"
msgstr "Fine prematura dell' archivio congelato"
-#: m4/regex.c:1066
+#: gnulib/m4/regex.c:1347
#, fuzzy
msgid "Regular expression too big"
msgstr "Espressione regolare errata `%s': %s"
-#: m4/regex.c:1069
+#: gnulib/m4/regex.c:1350
msgid "Unmatched ) or \\)"
msgstr ""
-#: m4/regex.c:5566
+#: gnulib/m4/regex.c:7915
#, fuzzy
msgid "No previous regular expression"
msgstr "Errore nel confronto dell' espressione regolare `%s'"
@@ -350,61 +407,6 @@ msgstr "Archivio congelato malformato"
#: src/freeze.c:484
#, c-format
msgid "`%s' from frozen file not found in builtin table!"
-msgstr ""
-
-#: src/getopt.c:677
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr ""
-
-#: src/getopt.c:702
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr ""
-
-#: src/getopt.c:707
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr ""
-
-#: src/getopt.c:725 src/getopt.c:898
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr ""
-
-#: src/getopt.c:754
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr ""
-
-#: src/getopt.c:758
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr ""
-
-#: src/getopt.c:784
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: src/getopt.c:787
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr ""
-
-#: src/getopt.c:817 src/getopt.c:947
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr ""
-
-#: src/getopt.c:864
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr ""
-
-#: src/getopt.c:882
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
msgstr ""
#: src/main.c:74
Index: po/ja.po
===================================================================
RCS file: /cvsroot/m4/m4/po/ja.po,v
retrieving revision 1.33
diff -u -p -u -r1.33 ja.po
--- po/ja.po 12 Sep 2003 13:27:54 -0000 1.33
+++ po/ja.po 12 Sep 2003 15:16:59 -0000
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: GNU m4 1.4.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-12 13:22+0100\n"
+"POT-Creation-Date: 2003-09-12 15:21+0100\n"
"PO-Revision-Date: 1996-03-28 11:52 EST\n"
"Last-Translator: Akiko Matsushita <address@hidden>\n"
"Language-Team: Japanese <address@hidden>\n"
@@ -14,84 +14,141 @@ msgstr ""
"Content-Type: text/plain; charset=EUC\n"
"Content-Transfer-Encoding: 8-bit\n"
+#: gnulib/m4/getopt.c:629 gnulib/m4/getopt.c:641
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: `%s' ¤ÏÉÔÌÀÎƤʥª¥×¥·¥ç¥ó̾¤Ç¤¹¡£\n"
+
+#: gnulib/m4/getopt.c:674 gnulib/m4/getopt.c:678
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: ¥ª¥×¥·¥ç¥ó `--%s' ¤Ï°ú¿ô¤ò¼è¤ë¤³¤È¤¬¤Ç¤¤Þ¤»¤ó¡£\n"
+
+#: gnulib/m4/getopt.c:687 gnulib/m4/getopt.c:692
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: ¥ª¥×¥·¥ç¥ó `%c%s' ¤Ï°ú¿ô¤ò¼è¤ë¤³¤È¤¬¤Ç¤¤Þ¤»¤ó¡£\n"
+
+#: gnulib/m4/getopt.c:728 gnulib/m4/getopt.c:741 gnulib/m4/getopt.c:1030
+#: gnulib/m4/getopt.c:1043
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤Ï°ú¿ô¤òɬÍפȤ·¤Þ¤¹¡£\n"
+
+#: gnulib/m4/getopt.c:779 gnulib/m4/getopt.c:782
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: --%s ¤Ïǧ¼±¤µ¤ì¤Ê¤¤¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£\n"
+
+#: gnulib/m4/getopt.c:790 gnulib/m4/getopt.c:793
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: %c%s ¤Ïǧ¼±¤µ¤ì¤Ê¤¤¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£\n"
+
+#: gnulib/m4/getopt.c:840 gnulib/m4/getopt.c:843
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: %c ¤ÏÉÔÀµ¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£\n"
+
+#: gnulib/m4/getopt.c:849 gnulib/m4/getopt.c:852
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: %c ¤Ï̵¸ú¤Ê¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£\n"
+
+#: gnulib/m4/getopt.c:899 gnulib/m4/getopt.c:910 gnulib/m4/getopt.c:1096
+#: gnulib/m4/getopt.c:1109
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: %c ¥ª¥×¥·¥ç¥ó¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹¡£\n"
+
+#: gnulib/m4/getopt.c:962 gnulib/m4/getopt.c:973
+#, fuzzy, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: `%s' ¤ÏÉÔÌÀÎƤʥª¥×¥·¥ç¥ó̾¤Ç¤¹¡£\n"
+
+#: gnulib/m4/getopt.c:997 gnulib/m4/getopt.c:1009
+#, fuzzy, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: ¥ª¥×¥·¥ç¥ó `--%s' ¤Ï°ú¿ô¤ò¼è¤ë¤³¤È¤¬¤Ç¤¤Þ¤»¤ó¡£\n"
+
#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490 gnulib/m4/xmalloc.c:62
#, fuzzy
msgid "memory exhausted"
msgstr "¥á¥â¥ê¤¬»Ä¤Ã¤Æ¤¤¤Þ¤»¤ó¡£"
-#: m4/regex.c:1021
+#: gnulib/m4/regex.c:1302
msgid "Success"
msgstr ""
-#: m4/regex.c:1024
+#: gnulib/m4/regex.c:1305
msgid "No match"
msgstr ""
-#: m4/regex.c:1027
+#: gnulib/m4/regex.c:1308
#, fuzzy
msgid "Invalid regular expression"
msgstr "Àµµ¬É½¸½¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
-#: m4/regex.c:1030
+#: gnulib/m4/regex.c:1311
msgid "Invalid collation character"
msgstr ""
-#: m4/regex.c:1033
+#: gnulib/m4/regex.c:1314
msgid "Invalid character class name"
msgstr ""
-#: m4/regex.c:1036
+#: gnulib/m4/regex.c:1317
msgid "Trailing backslash"
msgstr ""
-#: m4/regex.c:1039
+#: gnulib/m4/regex.c:1320
msgid "Invalid back reference"
msgstr ""
-#: m4/regex.c:1042
+#: gnulib/m4/regex.c:1323
msgid "Unmatched [ or [^"
msgstr ""
-#: m4/regex.c:1045
+#: gnulib/m4/regex.c:1326
msgid "Unmatched ( or \\("
msgstr ""
-#: m4/regex.c:1048
+#: gnulib/m4/regex.c:1329
msgid "Unmatched \\{"
msgstr ""
-#: m4/regex.c:1051
+#: gnulib/m4/regex.c:1332
msgid "Invalid content of \\{\\}"
msgstr ""
-#: m4/regex.c:1054
+#: gnulib/m4/regex.c:1335
msgid "Invalid range end"
msgstr ""
-#: m4/regex.c:1057
+#: gnulib/m4/regex.c:1338
msgid "Memory exhausted"
msgstr "¥á¥â¥ê¤¬»Ä¤Ã¤Æ¤¤¤Þ¤»¤ó¡£"
-#: m4/regex.c:1060
+#: gnulib/m4/regex.c:1341
#, fuzzy
msgid "Invalid preceding regular expression"
msgstr "Àµµ¬É½¸½¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
-#: m4/regex.c:1063
+#: gnulib/m4/regex.c:1344
#, fuzzy
msgid "Premature end of regular expression"
msgstr "Àµµ¬É½¸½¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
-#: m4/regex.c:1066
+#: gnulib/m4/regex.c:1347
#, fuzzy
msgid "Regular expression too big"
msgstr "`%s' : %s ¤Ï¡¢ÉÔÀµ¤ÊÀµµ¬É½¸½¤Ç¤¹¡£"
-#: m4/regex.c:1069
+#: gnulib/m4/regex.c:1350
msgid "Unmatched ) or \\)"
msgstr ""
-#: m4/regex.c:5566
+#: gnulib/m4/regex.c:7915
msgid "No previous regular expression"
msgstr "Àµµ¬É½¸½¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
@@ -355,61 +412,6 @@ msgstr "ÆâÉô¥¨¥é¡¼¡§Åà·ë¥Õ¥¡¥¤¥ë¤Î¥Õ¥©¡¼
#, c-format
msgid "`%s' from frozen file not found in builtin table!"
msgstr "Åà·ë¥Õ¥¡¥¤¥ë¤Î %s ¤Ï¥Ó¥ë¥È¥¤¥ó¥³¥Þ¥ó¥É¤Î¥Æ¡¼¥Ö¥ë¤Ë¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
-
-#: src/getopt.c:677
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: `%s' ¤ÏÉÔÌÀÎƤʥª¥×¥·¥ç¥ó̾¤Ç¤¹¡£\n"
-
-#: src/getopt.c:702
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: ¥ª¥×¥·¥ç¥ó `--%s' ¤Ï°ú¿ô¤ò¼è¤ë¤³¤È¤¬¤Ç¤¤Þ¤»¤ó¡£\n"
-
-#: src/getopt.c:707
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: ¥ª¥×¥·¥ç¥ó `%c%s' ¤Ï°ú¿ô¤ò¼è¤ë¤³¤È¤¬¤Ç¤¤Þ¤»¤ó¡£\n"
-
-#: src/getopt.c:725 src/getopt.c:898
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤Ï°ú¿ô¤òɬÍפȤ·¤Þ¤¹¡£\n"
-
-#: src/getopt.c:754
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: --%s ¤Ïǧ¼±¤µ¤ì¤Ê¤¤¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£\n"
-
-#: src/getopt.c:758
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: %c%s ¤Ïǧ¼±¤µ¤ì¤Ê¤¤¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£\n"
-
-#: src/getopt.c:784
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: %c ¤ÏÉÔÀµ¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£\n"
-
-#: src/getopt.c:787
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: %c ¤Ï̵¸ú¤Ê¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£\n"
-
-#: src/getopt.c:817 src/getopt.c:947
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: %c ¥ª¥×¥·¥ç¥ó¤Ë¤Ï°ú¿ô¤¬É¬ÍפǤ¹¡£\n"
-
-#: src/getopt.c:864
-#, fuzzy, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: `%s' ¤ÏÉÔÌÀÎƤʥª¥×¥·¥ç¥ó̾¤Ç¤¹¡£\n"
-
-#: src/getopt.c:882
-#, fuzzy, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: ¥ª¥×¥·¥ç¥ó `--%s' ¤Ï°ú¿ô¤ò¼è¤ë¤³¤È¤¬¤Ç¤¤Þ¤»¤ó¡£\n"
#: src/main.c:74
#, fuzzy
Index: po/nl.po
===================================================================
RCS file: /cvsroot/m4/m4/po/nl.po,v
retrieving revision 1.33
diff -u -p -u -r1.33 nl.po
--- po/nl.po 12 Sep 2003 13:27:54 -0000 1.33
+++ po/nl.po 12 Sep 2003 15:16:59 -0000
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: m4 1.4d\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-12 13:22+0100\n"
+"POT-Creation-Date: 2003-09-12 15:21+0100\n"
"PO-Revision-Date: 1998-05-23 09:27+02:00\n"
"Last-Translator: Erick Branderhorst <address@hidden>\n"
"Language-Team: dutch <address@hidden>\n"
@@ -14,83 +14,140 @@ msgstr ""
"Content-Type: text/plain; charset=\n"
"Content-Transfer-Encoding: 8-bit\n"
+#: gnulib/m4/getopt.c:629 gnulib/m4/getopt.c:641
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:674 gnulib/m4/getopt.c:678
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:687 gnulib/m4/getopt.c:692
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:728 gnulib/m4/getopt.c:741 gnulib/m4/getopt.c:1030
+#: gnulib/m4/getopt.c:1043
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:779 gnulib/m4/getopt.c:782
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:790 gnulib/m4/getopt.c:793
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:840 gnulib/m4/getopt.c:843
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:849 gnulib/m4/getopt.c:852
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:899 gnulib/m4/getopt.c:910 gnulib/m4/getopt.c:1096
+#: gnulib/m4/getopt.c:1109
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:962 gnulib/m4/getopt.c:973
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:997 gnulib/m4/getopt.c:1009
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr ""
+
#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490 gnulib/m4/xmalloc.c:62
msgid "memory exhausted"
msgstr ""
-#: m4/regex.c:1021
+#: gnulib/m4/regex.c:1302
msgid "Success"
msgstr ""
-#: m4/regex.c:1024
+#: gnulib/m4/regex.c:1305
msgid "No match"
msgstr ""
-#: m4/regex.c:1027
+#: gnulib/m4/regex.c:1308
#, fuzzy
msgid "Invalid regular expression"
msgstr "Onjuiste reguliere expressie `%s': %s"
-#: m4/regex.c:1030
+#: gnulib/m4/regex.c:1311
msgid "Invalid collation character"
msgstr ""
-#: m4/regex.c:1033
+#: gnulib/m4/regex.c:1314
msgid "Invalid character class name"
msgstr ""
-#: m4/regex.c:1036
+#: gnulib/m4/regex.c:1317
msgid "Trailing backslash"
msgstr ""
-#: m4/regex.c:1039
+#: gnulib/m4/regex.c:1320
msgid "Invalid back reference"
msgstr ""
-#: m4/regex.c:1042
+#: gnulib/m4/regex.c:1323
msgid "Unmatched [ or [^"
msgstr ""
-#: m4/regex.c:1045
+#: gnulib/m4/regex.c:1326
msgid "Unmatched ( or \\("
msgstr ""
-#: m4/regex.c:1048
+#: gnulib/m4/regex.c:1329
msgid "Unmatched \\{"
msgstr ""
-#: m4/regex.c:1051
+#: gnulib/m4/regex.c:1332
msgid "Invalid content of \\{\\}"
msgstr ""
-#: m4/regex.c:1054
+#: gnulib/m4/regex.c:1335
msgid "Invalid range end"
msgstr ""
-#: m4/regex.c:1057
+#: gnulib/m4/regex.c:1338
msgid "Memory exhausted"
msgstr ""
-#: m4/regex.c:1060
+#: gnulib/m4/regex.c:1341
#, fuzzy
msgid "Invalid preceding regular expression"
msgstr "Fout overeenkomen reguliere expressies `%s'"
-#: m4/regex.c:1063
+#: gnulib/m4/regex.c:1344
#, fuzzy
msgid "Premature end of regular expression"
msgstr "Voorbarig einde van gefixeerd bestand"
-#: m4/regex.c:1066
+#: gnulib/m4/regex.c:1347
#, fuzzy
msgid "Regular expression too big"
msgstr "Onjuiste reguliere expressie `%s': %s"
-#: m4/regex.c:1069
+#: gnulib/m4/regex.c:1350
msgid "Unmatched ) or \\)"
msgstr ""
-#: m4/regex.c:5566
+#: gnulib/m4/regex.c:7915
#, fuzzy
msgid "No previous regular expression"
msgstr "Fout overeenkomen reguliere expressies `%s'"
@@ -352,61 +409,6 @@ msgstr "Slecht geformateerd gefixeerd be
#, c-format
msgid "`%s' from frozen file not found in builtin table!"
msgstr "`%s' van gefixeerd bestand niet gevonden in functie tabel!"
-
-#: src/getopt.c:677
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr ""
-
-#: src/getopt.c:702
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr ""
-
-#: src/getopt.c:707
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr ""
-
-#: src/getopt.c:725 src/getopt.c:898
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr ""
-
-#: src/getopt.c:754
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr ""
-
-#: src/getopt.c:758
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr ""
-
-#: src/getopt.c:784
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: src/getopt.c:787
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr ""
-
-#: src/getopt.c:817 src/getopt.c:947
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr ""
-
-#: src/getopt.c:864
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr ""
-
-#: src/getopt.c:882
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr ""
#: src/main.c:74
#, fuzzy
Index: po/pl.po
===================================================================
RCS file: /cvsroot/m4/m4/po/pl.po,v
retrieving revision 1.33
diff -u -p -u -r1.33 pl.po
--- po/pl.po 12 Sep 2003 13:27:54 -0000 1.33
+++ po/pl.po 12 Sep 2003 15:16:59 -0000
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: m4 1.4n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-12 13:22+0100\n"
+"POT-Creation-Date: 2003-09-12 15:21+0100\n"
"PO-Revision-Date: 1999-05-03 19:47+0200\n"
"Last-Translator: Rafa³ Maszkowski <address@hidden>\n"
"Language-Team: Polish <address@hidden>\n"
@@ -14,83 +14,140 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8-bit\n"
+#: gnulib/m4/getopt.c:629 gnulib/m4/getopt.c:641
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:674 gnulib/m4/getopt.c:678
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:687 gnulib/m4/getopt.c:692
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:728 gnulib/m4/getopt.c:741 gnulib/m4/getopt.c:1030
+#: gnulib/m4/getopt.c:1043
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:779 gnulib/m4/getopt.c:782
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:790 gnulib/m4/getopt.c:793
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:840 gnulib/m4/getopt.c:843
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:849 gnulib/m4/getopt.c:852
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:899 gnulib/m4/getopt.c:910 gnulib/m4/getopt.c:1096
+#: gnulib/m4/getopt.c:1109
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:962 gnulib/m4/getopt.c:973
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:997 gnulib/m4/getopt.c:1009
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr ""
+
#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490 gnulib/m4/xmalloc.c:62
msgid "memory exhausted"
msgstr ""
-#: m4/regex.c:1021
+#: gnulib/m4/regex.c:1302
msgid "Success"
msgstr ""
-#: m4/regex.c:1024
+#: gnulib/m4/regex.c:1305
msgid "No match"
msgstr ""
-#: m4/regex.c:1027
+#: gnulib/m4/regex.c:1308
#, fuzzy
msgid "Invalid regular expression"
msgstr "B³êdne wyra¿enie regularne `%s': %s"
-#: m4/regex.c:1030
+#: gnulib/m4/regex.c:1311
msgid "Invalid collation character"
msgstr ""
-#: m4/regex.c:1033
+#: gnulib/m4/regex.c:1314
msgid "Invalid character class name"
msgstr ""
-#: m4/regex.c:1036
+#: gnulib/m4/regex.c:1317
msgid "Trailing backslash"
msgstr ""
-#: m4/regex.c:1039
+#: gnulib/m4/regex.c:1320
msgid "Invalid back reference"
msgstr ""
-#: m4/regex.c:1042
+#: gnulib/m4/regex.c:1323
msgid "Unmatched [ or [^"
msgstr ""
-#: m4/regex.c:1045
+#: gnulib/m4/regex.c:1326
msgid "Unmatched ( or \\("
msgstr ""
-#: m4/regex.c:1048
+#: gnulib/m4/regex.c:1329
msgid "Unmatched \\{"
msgstr ""
-#: m4/regex.c:1051
+#: gnulib/m4/regex.c:1332
msgid "Invalid content of \\{\\}"
msgstr ""
-#: m4/regex.c:1054
+#: gnulib/m4/regex.c:1335
msgid "Invalid range end"
msgstr ""
-#: m4/regex.c:1057
+#: gnulib/m4/regex.c:1338
msgid "Memory exhausted"
msgstr ""
-#: m4/regex.c:1060
+#: gnulib/m4/regex.c:1341
#, fuzzy
msgid "Invalid preceding regular expression"
msgstr "B³±d dopasowania do wyra¿enia regularnego `%s'"
-#: m4/regex.c:1063
+#: gnulib/m4/regex.c:1344
#, fuzzy
msgid "Premature end of regular expression"
msgstr "Przedwczesny koniec pliku zamro¿onego"
-#: m4/regex.c:1066
+#: gnulib/m4/regex.c:1347
#, fuzzy
msgid "Regular expression too big"
msgstr "B³êdne wyra¿enie regularne `%s': %s"
-#: m4/regex.c:1069
+#: gnulib/m4/regex.c:1350
msgid "Unmatched ) or \\)"
msgstr ""
-#: m4/regex.c:5566
+#: gnulib/m4/regex.c:7915
#, fuzzy
msgid "No previous regular expression"
msgstr "B³±d dopasowania do wyra¿enia regularnego `%s'"
@@ -352,61 +409,6 @@ msgstr "¬le sformatowy plik zamro¿ony"
#, c-format
msgid "`%s' from frozen file not found in builtin table!"
msgstr "`%s' z pliku zamro¿onego nie znalezione w tablicy wbudowanych!"
-
-#: src/getopt.c:677
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr ""
-
-#: src/getopt.c:702
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr ""
-
-#: src/getopt.c:707
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr ""
-
-#: src/getopt.c:725 src/getopt.c:898
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr ""
-
-#: src/getopt.c:754
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr ""
-
-#: src/getopt.c:758
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr ""
-
-#: src/getopt.c:784
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: src/getopt.c:787
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr ""
-
-#: src/getopt.c:817 src/getopt.c:947
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr ""
-
-#: src/getopt.c:864
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr ""
-
-#: src/getopt.c:882
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr ""
#: src/main.c:74
#, fuzzy
Index: po/ru.po
===================================================================
RCS file: /cvsroot/m4/m4/po/ru.po,v
retrieving revision 1.33
diff -u -p -u -r1.33 ru.po
--- po/ru.po 12 Sep 2003 13:27:54 -0000 1.33
+++ po/ru.po 12 Sep 2003 15:16:59 -0000
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: m4 1.4n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-12 13:22+0100\n"
+"POT-Creation-Date: 2003-09-12 15:21+0100\n"
"PO-Revision-Date: 1999-04-17 20:58\n"
"Last-Translator: Denis Y. Pershin <address@hidden>\n"
"Language-Team: Russian <address@hidden>\n"
@@ -14,84 +14,141 @@ msgstr ""
"Content-Type: text/plain; charset=koi8-r\n"
"Content-Transfer-Encoding: 8-bit\n"
+#: gnulib/m4/getopt.c:629 gnulib/m4/getopt.c:641
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: ÏÐÃÉÑ `%s' ÎÅÏÄÎÏÚÎÁÞÎÁ\n"
+
+#: gnulib/m4/getopt.c:674 gnulib/m4/getopt.c:678
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: Õ ÏÐÃÉÉ `--%s' ÎÅ ÄÏÌÖÎÏ ÂÙÔØ ÁÒÇÕÍÅÎÔÏ×\n"
+
+#: gnulib/m4/getopt.c:687 gnulib/m4/getopt.c:692
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: Õ ÏÐÃÉÉ `%c%s' ÎÅ ÄÏÌÖÎÏ ÂÙÔØ ÁÒÇÕÍÅÎÔÏ×\n"
+
+#: gnulib/m4/getopt.c:728 gnulib/m4/getopt.c:741 gnulib/m4/getopt.c:1030
+#: gnulib/m4/getopt.c:1043
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: Õ ÏÐÃÉÉ `%s' ÄÏÌÖÅÎ ÂÙÔØ ÁÒÇÕÍÅÎÔ\n"
+
+#: gnulib/m4/getopt.c:779 gnulib/m4/getopt.c:782
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: ÎÅÉÚ×ÅÓÔÎÁÑ ÏÐÃÉÑ `--%s'\n"
+
+#: gnulib/m4/getopt.c:790 gnulib/m4/getopt.c:793
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: ÎÅÉÚ×ÅÓÔÎÁÑ ÏÐÃÉÑ '%c%s'\n"
+
+#: gnulib/m4/getopt.c:840 gnulib/m4/getopt.c:843
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ÚÁÐÒÅÝÅÎÎÁÑ ÏÐÃÉÑ -- %c\n"
+
+#: gnulib/m4/getopt.c:849 gnulib/m4/getopt.c:852
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ÎÅ×ÅÒÎÁÑ ÏÐÃÉÑ -- %c\n"
+
+#: gnulib/m4/getopt.c:899 gnulib/m4/getopt.c:910 gnulib/m4/getopt.c:1096
+#: gnulib/m4/getopt.c:1109
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: ÏÐÃÉÉ ÎÅÏÂÈÏÄÉÍ ÁÒÇÕÍÅÎÔ -- %c\n"
+
+#: gnulib/m4/getopt.c:962 gnulib/m4/getopt.c:973
+#, fuzzy, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: ÏÐÃÉÑ `%s' ÎÅÏÄÎÏÚÎÁÞÎÁ\n"
+
+#: gnulib/m4/getopt.c:997 gnulib/m4/getopt.c:1009
+#, fuzzy, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: Õ ÏÐÃÉÉ `--%s' ÎÅ ÄÏÌÖÎÏ ÂÙÔØ ÁÒÇÕÍÅÎÔÏ×\n"
+
#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490 gnulib/m4/xmalloc.c:62
#, fuzzy
msgid "memory exhausted"
msgstr "ðÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ"
-#: m4/regex.c:1021
+#: gnulib/m4/regex.c:1302
msgid "Success"
msgstr ""
-#: m4/regex.c:1024
+#: gnulib/m4/regex.c:1305
msgid "No match"
msgstr ""
-#: m4/regex.c:1027
+#: gnulib/m4/regex.c:1308
#, fuzzy
msgid "Invalid regular expression"
msgstr "îÅÔ ÐÒÅÄÛÅÄÓÔ×ÕÀÝÅÇÏ ÒÅÇÕÌÑÒÎÏÇÏ ×ÙÒÁÖÅÎÉÑ"
-#: m4/regex.c:1030
+#: gnulib/m4/regex.c:1311
msgid "Invalid collation character"
msgstr ""
-#: m4/regex.c:1033
+#: gnulib/m4/regex.c:1314
msgid "Invalid character class name"
msgstr ""
-#: m4/regex.c:1036
+#: gnulib/m4/regex.c:1317
msgid "Trailing backslash"
msgstr ""
-#: m4/regex.c:1039
+#: gnulib/m4/regex.c:1320
msgid "Invalid back reference"
msgstr ""
-#: m4/regex.c:1042
+#: gnulib/m4/regex.c:1323
msgid "Unmatched [ or [^"
msgstr ""
-#: m4/regex.c:1045
+#: gnulib/m4/regex.c:1326
msgid "Unmatched ( or \\("
msgstr ""
-#: m4/regex.c:1048
+#: gnulib/m4/regex.c:1329
msgid "Unmatched \\{"
msgstr ""
-#: m4/regex.c:1051
+#: gnulib/m4/regex.c:1332
msgid "Invalid content of \\{\\}"
msgstr ""
-#: m4/regex.c:1054
+#: gnulib/m4/regex.c:1335
msgid "Invalid range end"
msgstr ""
-#: m4/regex.c:1057
+#: gnulib/m4/regex.c:1338
msgid "Memory exhausted"
msgstr "ðÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ"
-#: m4/regex.c:1060
+#: gnulib/m4/regex.c:1341
#, fuzzy
msgid "Invalid preceding regular expression"
msgstr "îÅÔ ÐÒÅÄÛÅÄÓÔ×ÕÀÝÅÇÏ ÒÅÇÕÌÑÒÎÏÇÏ ×ÙÒÁÖÅÎÉÑ"
-#: m4/regex.c:1063
+#: gnulib/m4/regex.c:1344
#, fuzzy
msgid "Premature end of regular expression"
msgstr "îÅÔ ÐÒÅÄÛÅÄÓÔ×ÕÀÝÅÇÏ ÒÅÇÕÌÑÒÎÏÇÏ ×ÙÒÁÖÅÎÉÑ"
-#: m4/regex.c:1066
+#: gnulib/m4/regex.c:1347
#, fuzzy
msgid "Regular expression too big"
msgstr "îÅ×ÅÒÎÏÅ ÒÅÇÕÌÑÒÎÏÅ ×ÙÒÁÖÅÎÉÅ: '%s': %s"
-#: m4/regex.c:1069
+#: gnulib/m4/regex.c:1350
msgid "Unmatched ) or \\)"
msgstr ""
-#: m4/regex.c:5566
+#: gnulib/m4/regex.c:7915
msgid "No previous regular expression"
msgstr "îÅÔ ÐÒÅÄÛÅÄÓÔ×ÕÀÝÅÇÏ ÒÅÇÕÌÑÒÎÏÇÏ ×ÙÒÁÖÅÎÉÑ"
@@ -353,61 +410,6 @@ msgstr "îÅ×ÅÒÎÙÊ ÆÏÒÍÁÔ ÆÁÊÌÁ-ÏÂÒÁÚÁ ÐÁÍ
#, c-format
msgid "`%s' from frozen file not found in builtin table!"
msgstr "'%s' ÉÚ ÆÁÊÌÁ-ÏÂÒÁÚÁ ÐÁÍÑÔÉ ÎÅ ÎÁÊÄÅÎÁ ×Ï ×ÓÔÒÏÅÎÎÏÊ ÔÁÂÌÉÃÅ!"
-
-#: src/getopt.c:677
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: ÏÐÃÉÑ `%s' ÎÅÏÄÎÏÚÎÁÞÎÁ\n"
-
-#: src/getopt.c:702
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: Õ ÏÐÃÉÉ `--%s' ÎÅ ÄÏÌÖÎÏ ÂÙÔØ ÁÒÇÕÍÅÎÔÏ×\n"
-
-#: src/getopt.c:707
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: Õ ÏÐÃÉÉ `%c%s' ÎÅ ÄÏÌÖÎÏ ÂÙÔØ ÁÒÇÕÍÅÎÔÏ×\n"
-
-#: src/getopt.c:725 src/getopt.c:898
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: Õ ÏÐÃÉÉ `%s' ÄÏÌÖÅÎ ÂÙÔØ ÁÒÇÕÍÅÎÔ\n"
-
-#: src/getopt.c:754
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: ÎÅÉÚ×ÅÓÔÎÁÑ ÏÐÃÉÑ `--%s'\n"
-
-#: src/getopt.c:758
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: ÎÅÉÚ×ÅÓÔÎÁÑ ÏÐÃÉÑ '%c%s'\n"
-
-#: src/getopt.c:784
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ÚÁÐÒÅÝÅÎÎÁÑ ÏÐÃÉÑ -- %c\n"
-
-#: src/getopt.c:787
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ÎÅ×ÅÒÎÁÑ ÏÐÃÉÑ -- %c\n"
-
-#: src/getopt.c:817 src/getopt.c:947
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: ÏÐÃÉÉ ÎÅÏÂÈÏÄÉÍ ÁÒÇÕÍÅÎÔ -- %c\n"
-
-#: src/getopt.c:864
-#, fuzzy, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: ÏÐÃÉÑ `%s' ÎÅÏÄÎÏÚÎÁÞÎÁ\n"
-
-#: src/getopt.c:882
-#, fuzzy, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: Õ ÏÐÃÉÉ `--%s' ÎÅ ÄÏÌÖÎÏ ÂÙÔØ ÁÒÇÕÍÅÎÔÏ×\n"
#: src/main.c:74
#, fuzzy
Index: po/sv.po
===================================================================
RCS file: /cvsroot/m4/m4/po/sv.po,v
retrieving revision 1.34
diff -u -p -u -r1.34 sv.po
--- po/sv.po 12 Sep 2003 13:27:54 -0000 1.34
+++ po/sv.po 12 Sep 2003 15:16:59 -0000
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: m4 1.4n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-09-12 13:22+0100\n"
+"POT-Creation-Date: 2003-09-12 15:21+0100\n"
"PO-Revision-Date: 1999-03-28 18:56 +02:00\n"
"Last-Translator: Jan Djärv <address@hidden>\n"
"Language-Team: Swedish <address@hidden>\n"
@@ -15,83 +15,140 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+#: gnulib/m4/getopt.c:629 gnulib/m4/getopt.c:641
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:674 gnulib/m4/getopt.c:678
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:687 gnulib/m4/getopt.c:692
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:728 gnulib/m4/getopt.c:741 gnulib/m4/getopt.c:1030
+#: gnulib/m4/getopt.c:1043
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:779 gnulib/m4/getopt.c:782
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:790 gnulib/m4/getopt.c:793
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:840 gnulib/m4/getopt.c:843
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:849 gnulib/m4/getopt.c:852
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:899 gnulib/m4/getopt.c:910 gnulib/m4/getopt.c:1096
+#: gnulib/m4/getopt.c:1109
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:962 gnulib/m4/getopt.c:973
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr ""
+
+#: gnulib/m4/getopt.c:997 gnulib/m4/getopt.c:1009
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr ""
+
#: gnulib/m4/obstack.c:487 gnulib/m4/obstack.c:490 gnulib/m4/xmalloc.c:62
msgid "memory exhausted"
msgstr ""
-#: m4/regex.c:1021
+#: gnulib/m4/regex.c:1302
msgid "Success"
msgstr ""
-#: m4/regex.c:1024
+#: gnulib/m4/regex.c:1305
msgid "No match"
msgstr ""
-#: m4/regex.c:1027
+#: gnulib/m4/regex.c:1308
#, fuzzy
msgid "Invalid regular expression"
msgstr "Otillåtet reguljäruttryck \"%s\": %s"
-#: m4/regex.c:1030
+#: gnulib/m4/regex.c:1311
msgid "Invalid collation character"
msgstr ""
-#: m4/regex.c:1033
+#: gnulib/m4/regex.c:1314
msgid "Invalid character class name"
msgstr ""
-#: m4/regex.c:1036
+#: gnulib/m4/regex.c:1317
msgid "Trailing backslash"
msgstr ""
-#: m4/regex.c:1039
+#: gnulib/m4/regex.c:1320
msgid "Invalid back reference"
msgstr ""
-#: m4/regex.c:1042
+#: gnulib/m4/regex.c:1323
msgid "Unmatched [ or [^"
msgstr ""
-#: m4/regex.c:1045
+#: gnulib/m4/regex.c:1326
msgid "Unmatched ( or \\("
msgstr ""
-#: m4/regex.c:1048
+#: gnulib/m4/regex.c:1329
msgid "Unmatched \\{"
msgstr ""
-#: m4/regex.c:1051
+#: gnulib/m4/regex.c:1332
msgid "Invalid content of \\{\\}"
msgstr ""
-#: m4/regex.c:1054
+#: gnulib/m4/regex.c:1335
msgid "Invalid range end"
msgstr ""
-#: m4/regex.c:1057
+#: gnulib/m4/regex.c:1338
msgid "Memory exhausted"
msgstr ""
-#: m4/regex.c:1060
+#: gnulib/m4/regex.c:1341
#, fuzzy
msgid "Invalid preceding regular expression"
msgstr "Fel när reguljäruttrycket \"%s\" matchades"
-#: m4/regex.c:1063
+#: gnulib/m4/regex.c:1344
#, fuzzy
msgid "Premature end of regular expression"
msgstr "För tidigt filslut i fryst fil"
-#: m4/regex.c:1066
+#: gnulib/m4/regex.c:1347
#, fuzzy
msgid "Regular expression too big"
msgstr "Otillåtet reguljäruttryck \"%s\": %s"
-#: m4/regex.c:1069
+#: gnulib/m4/regex.c:1350
msgid "Unmatched ) or \\)"
msgstr ""
-#: m4/regex.c:5566
+#: gnulib/m4/regex.c:7915
#, fuzzy
msgid "No previous regular expression"
msgstr "Fel när reguljäruttrycket \"%s\" matchades"
@@ -352,61 +409,6 @@ msgstr "Korrupt fryst fil"
#, c-format
msgid "`%s' from frozen file not found in builtin table!"
msgstr "\"%s\" från fryst fil hittades inte i tabellen för inbyggda makron!"
-
-#: src/getopt.c:677
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr ""
-
-#: src/getopt.c:702
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr ""
-
-#: src/getopt.c:707
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr ""
-
-#: src/getopt.c:725 src/getopt.c:898
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr ""
-
-#: src/getopt.c:754
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr ""
-
-#: src/getopt.c:758
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr ""
-
-#: src/getopt.c:784
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: src/getopt.c:787
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr ""
-
-#: src/getopt.c:817 src/getopt.c:947
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr ""
-
-#: src/getopt.c:864
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr ""
-
-#: src/getopt.c:882
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr ""
#: src/main.c:74
#, fuzzy
Index: src/Makefile.am
===================================================================
RCS file: /cvsroot/m4/m4/src/Makefile.am,v
retrieving revision 1.11
diff -u -p -u -r1.11 Makefile.am
--- src/Makefile.am 5 Sep 2003 18:32:27 -0000 1.11
+++ src/Makefile.am 12 Sep 2003 15:16:59 -0000
@@ -23,15 +23,12 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_
-I$(top_builddir)/m4 -I$(top_srcdir)/m4 $(INTLINCL)
bin_PROGRAMS = m4
-m4_SOURCES = main.c m4.h freeze.c stackovf.c
-EXTRA_m4_SOURCES = getopt.c getopt1.c
-
-m4_LDADD = $(M4OBJS) $(top_builddir)/m4/libm4.la $(INTLLIBS)
+m4_SOURCES = $(top_srcdir)/gnulib/m4/getopt.c \
+ $(top_srcdir)/gnulib/m4/getopt1.c \
+ $(top_srcdir)/gnulib/m4/getopt.h \
+ main.c m4.h freeze.c stackovf.c
+m4_LDADD = $(top_builddir)/m4/libm4.la $(INTLLIBS)
m4_LDFLAGS = -no-undefined -export-dynamic $(DLPREOPEN)
-
-$(bin_PROGRAMS): $(M4OBJS)
-
-noinst_HEADERS = gnu-getopt.h
CLEANFILES = m4$(EXEEXT)
MAINTAINERCLEANFILES = Makefile.in
Index: src/getopt.c
===================================================================
RCS file: src/getopt.c
diff -N src/getopt.c
--- src/getopt.c 27 Aug 2003 17:10:13 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,1051 +0,0 @@
-/* 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 address@hidden
- before changing it!
-
- Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99
- Free Software Foundation, Inc.
-
- 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. */
-
-/* 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
-#endif
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#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 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__
-/* Don't include stdlib.h for non-GNU C libraries because some of them
- contain conflicting prototypes for getopt. */
-# include <stdlib.h>
-# include <unistd.h>
-#endif /* GNU C library. */
-
-#ifdef VMS
-# include <unixlib.h>
-# if HAVE_STRING_H - 0
-# include <string.h>
-# endif
-#endif
-
-#ifndef _
-/* This is for other GNU distributions with internationalized messages.
- When compiling libc, the _ macro is predefined. */
-# ifdef HAVE_LIBINTL_H
-# include <libintl.h>
-# define _(msgid) gettext (msgid)
-# else
-# define _(msgid) (msgid)
-# endif
-#endif
-
-/* This version of `getopt' appears to the caller like standard Unix `getopt'
- but it behaves differently for the user, since it allows the user
- to intersperse the options with the other arguments.
-
- As `getopt' works, it permutes the elements of ARGV so that,
- when it is done, all the options precede everything else. Thus
- all application programs are extended to handle flexible argument order.
-
- Setting the environment variable POSIXLY_CORRECT disables permutation.
- Then the behavior is completely standard.
-
- GNU application programs can use a third alternative mode in which
- they can distinguish the relative order of options and other arguments. */
-
-#include "getopt.h"
-
-/* For communication from `getopt' to the caller.
- When `getopt' finds an option that takes an argument,
- the argument value is returned here.
- Also, when `ordering' is RETURN_IN_ORDER,
- each non-option ARGV-element is returned here. */
-
-char *optarg;
-
-/* Index in ARGV of the next element to be scanned.
- This is used for communication to and from the caller
- and for communication between successive calls to `getopt'.
-
- On entry to `getopt', zero means this is the first call; initialize.
-
- When `getopt' returns -1, this is the index of the first of the
- non-option elements that the caller should itself scan.
-
- Otherwise, `optind' communicates from one call to the next
- how much of ARGV has been scanned so far. */
-
-/* 1003.2 says this must be 1 before any call. */
-int optind = 1;
-
-/* Formerly, initialization of getopt depended on optind==0, which
- causes problems with re-calling getopt as programs generally don't
- know that. */
-
-int __getopt_initialized;
-
-/* The next char to be scanned in the option-element
- in which the last option character we returned was found.
- This allows us to pick up the scan where we left off.
-
- If this is zero, or a null string, it means resume the scan
- by advancing to the next ARGV-element. */
-
-static char *nextchar;
-
-/* Callers store zero here to inhibit the error message
- for unrecognized options. */
-
-int opterr = 1;
-
-/* Set to an option character which was unrecognized.
- This must be initialized on some systems to avoid linking in the
- system's own getopt implementation. */
-
-int optopt = '?';
-
-/* Describe how to deal with options that follow non-option ARGV-elements.
-
- If the caller did not specify anything,
- the default is REQUIRE_ORDER if the environment variable
- POSIXLY_CORRECT is defined, PERMUTE otherwise.
-
- REQUIRE_ORDER means don't recognize them as options;
- stop option processing when the first non-option is seen.
- This is what Unix does.
- This mode of operation is selected by either setting the environment
- variable POSIXLY_CORRECT, or using `+' as the first character
- of the list of option characters.
-
- PERMUTE is the default. We permute the contents of ARGV as we scan,
- so that eventually all the non-options are at the end. This allows options
- to be given in any order, even with programs that were not written to
- expect this.
-
- RETURN_IN_ORDER is an option available to programs that were written
- to expect options and other ARGV-elements in any order and that care about
- the ordering of the two. We describe each non-option ARGV-element
- as if it were the argument of an option with character code 1.
- Using `-' as the first character of the list of option characters
- selects this mode of operation.
-
- The special argument `--' forces an end of option-scanning regardless
- of the value of `ordering'. In the case of RETURN_IN_ORDER, only
- `--' can cause `getopt' to return -1 with `optind' != ARGC. */
-
-static enum
-{
- REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
-} ordering;
-
-/* Value of POSIXLY_CORRECT environment variable. */
-static char *posixly_correct;
-
-#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>
-# define my_index strchr
-#else
-
-# if HAVE_STRING_H
-# include <string.h>
-# else
-# include <strings.h>
-# endif
-
-/* Avoid depending on library functions or files
- whose names are inconsistent. */
-
-#ifndef getenv
-extern char *getenv ();
-#endif
-
-static char *
-my_index (str, chr)
- const char *str;
- int chr;
-{
- while (*str)
- {
- if (*str == chr)
- return (char *) str;
- str++;
- }
- return 0;
-}
-
-/* If using GCC, we can safely declare strlen this way.
- If not using GCC, it is ok not to declare it. */
-#ifdef __GNUC__
-/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
- That was relevant to code that was here before. */
-# if (!defined __STDC__ || !__STDC__) && !defined strlen
-/* gcc with -traditional declares the built-in strlen to return int,
- and has done so at least since version 2.4.5. -- rms. */
-extern int strlen (const char *);
-# endif /* not __STDC__ */
-#endif /* __GNUC__ */
-
-#endif /* not __GNU_LIBRARY__ */
-
-/* Handle permutation of arguments. */
-
-/* Describe the part of ARGV that contains non-options that have
- been skipped. `first_nonopt' is the index in ARGV of the first of them;
- `last_nonopt' is the index after the last of them. */
-
-static int first_nonopt;
-static int last_nonopt;
-
-#ifdef _LIBC
-/* Bash 2.0 gives us an environment variable containing flags
- indicating ARGV elements that should not be considered arguments. */
-
-/* Defined in getopt_init.c */
-extern char *__getopt_nonoption_flags;
-
-static int nonoption_flags_max_len;
-static int nonoption_flags_len;
-
-static int original_argc;
-static char *const *original_argv;
-
-/* Make sure the environment variable bash 2.0 puts in the environment
- is valid for the getopt call we must make sure that the ARGV passed
- to getopt is that one passed to the process. */
-static void
-__attribute__ ((unused))
-store_args_and_env (int argc, char *const *argv)
-{
- /* XXX This is no good solution. We should rather copy the args so
- that we can compare them later. But we must not use malloc(3). */
- original_argc = argc;
- original_argv = argv;
-}
-# ifdef text_set_element
-text_set_element (__libc_subinit, store_args_and_env);
-# endif /* text_set_element */
-
-# define SWAP_FLAGS(ch1, ch2) \
- if (nonoption_flags_len > 0) \
- { \
- char __tmp = __getopt_nonoption_flags[ch1]; \
- __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \
- __getopt_nonoption_flags[ch2] = __tmp; \
- }
-#else /* !_LIBC */
-# define SWAP_FLAGS(ch1, ch2)
-#endif /* _LIBC */
-
-/* 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;
-{
- int bottom = first_nonopt;
- int middle = last_nonopt;
- int top = optind;
- char *tem;
-
- /* Exchange the shorter segment with the far end of the longer segment.
- That puts the shorter segment into the right place.
- It leaves the longer segment in the right place overall,
- but it consists of two parts that need to be swapped next. */
-
-#ifdef _LIBC
- /* First make sure the handling of the `__getopt_nonoption_flags'
- string can work normally. Our top argument must be in the range
- of the string. */
- if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len)
- {
- /* We must extend the array. The user plays games with us and
- presents new arguments. */
- char *new_str = malloc (top + 1);
- if (new_str == NULL)
- nonoption_flags_len = nonoption_flags_max_len = 0;
- else
- {
- memset (__mempcpy (new_str, __getopt_nonoption_flags,
- nonoption_flags_max_len),
- '\0', top + 1 - nonoption_flags_max_len);
- nonoption_flags_max_len = top + 1;
- __getopt_nonoption_flags = new_str;
- }
- }
-#endif
-
- while (top > middle && middle > bottom)
- {
- if (top - middle > middle - bottom)
- {
- /* Bottom segment is the short one. */
- int len = middle - bottom;
- register int i;
-
- /* Swap it with the top part of the top segment. */
- for (i = 0; i < len; i++)
- {
- tem = argv[bottom + i];
- argv[bottom + i] = argv[top - (middle - bottom) + i];
- argv[top - (middle - bottom) + i] = tem;
- SWAP_FLAGS (bottom + i, top - (middle - bottom) + i);
- }
- /* Exclude the moved bottom segment from further swapping. */
- top -= len;
- }
- else
- {
- /* Top segment is the short one. */
- int len = top - middle;
- register int i;
-
- /* Swap it with the bottom part of the bottom segment. */
- for (i = 0; i < len; i++)
- {
- tem = argv[bottom + i];
- argv[bottom + i] = argv[middle + i];
- argv[middle + i] = tem;
- SWAP_FLAGS (bottom + i, middle + i);
- }
- /* Exclude the moved top segment from further swapping. */
- bottom += len;
- }
- }
-
- /* Update records for the slots the non-options now occupy. */
-
- first_nonopt += (optind - last_nonopt);
- last_nonopt = optind;
-}
-
-/* Initialize the internal data when the first call is made. */
-
-#if defined __STDC__ && __STDC__
-static const char *_getopt_initialize (int, char *const *, const char *);
-#endif
-static const char *
-_getopt_initialize (argc, argv, optstring)
- int argc;
- char *const *argv;
- const char *optstring;
-{
- /* Start processing options with ARGV-element 1 (since ARGV-element 0
- is the program name); the sequence of previously skipped
- non-option ARGV-elements is empty. */
-
- first_nonopt = last_nonopt = optind;
-
- nextchar = NULL;
-
- posixly_correct = getenv ("POSIXLY_CORRECT");
-
- /* Determine how to handle the ordering of options and nonoptions. */
-
- if (optstring[0] == '-')
- {
- ordering = RETURN_IN_ORDER;
- ++optstring;
- }
- else if (optstring[0] == '+')
- {
- ordering = REQUIRE_ORDER;
- ++optstring;
- }
- else if (posixly_correct != NULL)
- ordering = REQUIRE_ORDER;
- else
- ordering = PERMUTE;
-
-#ifdef _LIBC
- if (posixly_correct == NULL
- && argc == original_argc && argv == original_argv)
- {
- if (nonoption_flags_max_len == 0)
- {
- if (__getopt_nonoption_flags == NULL
- || __getopt_nonoption_flags[0] == '\0')
- nonoption_flags_max_len = -1;
- else
- {
- const char *orig_str = __getopt_nonoption_flags;
- int len = nonoption_flags_max_len = strlen (orig_str);
- if (nonoption_flags_max_len < argc)
- nonoption_flags_max_len = argc;
- __getopt_nonoption_flags =
- (char *) malloc (nonoption_flags_max_len);
- if (__getopt_nonoption_flags == NULL)
- nonoption_flags_max_len = -1;
- else
- memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
- '\0', nonoption_flags_max_len - len);
- }
- }
- nonoption_flags_len = nonoption_flags_max_len;
- }
- else
- nonoption_flags_len = 0;
-#endif
-
- return optstring;
-}
-
-/* Scan elements of ARGV (whose length is ARGC) for option characters
- given in OPTSTRING.
-
- If an element of ARGV starts with '-', and is not exactly "-" or "--",
- then it is an option element. The characters of this element
- (aside from the initial '-') are option characters. If `getopt'
- is called repeatedly, it returns successively each of the option characters
- from each of the option elements.
-
- If `getopt' finds another option character, it returns that character,
- updating `optind' and `nextchar' so that the next call to `getopt' can
- resume the scan with the following option character or ARGV-element.
-
- If there are no more option characters, `getopt' returns -1.
- Then `optind' is the index in ARGV of the first ARGV-element
- that is not an option. (The ARGV-elements have been permuted
- so that those that are not options now come last.)
-
- OPTSTRING is a string containing the legitimate option characters.
- If an option character is seen that is not listed in OPTSTRING,
- return '?' after printing an error message. If you set `opterr' to
- zero, the error message is suppressed but we still return '?'.
-
- If a char in OPTSTRING is followed by a colon, that means it wants an arg,
- so the following text in the same ARGV-element, or the text of the following
- ARGV-element, is returned in `optarg'. Two colons mean an option that
- wants an optional arg; if there is text in the current ARGV-element,
- it is returned in `optarg', otherwise `optarg' is set to zero.
-
- If OPTSTRING starts with `-' or `+', it requests different methods of
- handling the non-option ARGV-elements.
- See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.
-
- Long-named options begin with `--' instead of `-'.
- Their names may be abbreviated as long as the abbreviation is unique
- or is an exact match for some defined option. If they have an
- argument, it follows the option name in the same ARGV-element, separated
- from the option name by a `=', or else the in next ARGV-element.
- When `getopt' finds a long-named option, it returns 0 if that option's
- `flag' field is nonzero, the value of the option's `val' field
- if the `flag' field is zero.
-
- The elements of ARGV aren't really const, because we permute them.
- But we pretend they're const in the prototype to be compatible
- with other systems.
-
- LONGOPTS is a vector of `struct option' terminated by an
- element containing a name which is zero.
-
- LONGIND returns the index in LONGOPT of the long-named option found.
- It is only valid when a long-named option has been found by the most
- recent call.
-
- If LONG_ONLY is nonzero, '-' as well as '--' can introduce
- long-named options. */
-
-int
-_getopt_internal (argc, argv, optstring, longopts, longind, long_only)
- int argc;
- char *const *argv;
- const char *optstring;
- const struct option *longopts;
- int *longind;
- int long_only;
-{
- optarg = NULL;
-
- if (optind == 0 || !__getopt_initialized)
- {
- if (optind == 0)
- optind = 1; /* Don't scan ARGV[0], the program name. */
- optstring = _getopt_initialize (argc, argv, optstring);
- __getopt_initialized = 1;
- }
-
- /* 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. The later information
- is only used when the used in the GNU libc. */
-#ifdef _LIBC
-# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0'
\
- || (optind < nonoption_flags_len \
- && __getopt_nonoption_flags[optind] == '1'))
-#else
-# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0')
-#endif
-
- 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. */
-
- if (first_nonopt != last_nonopt && last_nonopt != optind)
- exchange ((char **) argv);
- else if (last_nonopt != optind)
- first_nonopt = optind;
-
- /* Skip any additional non-options
- and extend the range of non-options previously skipped. */
-
- while (optind < argc && NONOPTION_P)
- optind++;
- last_nonopt = optind;
- }
-
- /* The special ARGV-element `--' means premature end of options.
- Skip it like a null option,
- then exchange with previous non-options as if it were an option,
- then skip everything else like a non-option. */
-
- if (optind != argc && !strcmp (argv[optind], "--"))
- {
- optind++;
-
- if (first_nonopt != last_nonopt && last_nonopt != optind)
- exchange ((char **) argv);
- else if (first_nonopt == last_nonopt)
- first_nonopt = optind;
- last_nonopt = argc;
-
- optind = argc;
- }
-
- /* If we have done all the ARGV-elements, stop the scan
- and back over any non-options that we skipped and permuted. */
-
- if (optind == argc)
- {
- /* Set the next-arg-index to point at the non-options
- that we previously skipped, so the caller will digest them. */
- if (first_nonopt != last_nonopt)
- optind = first_nonopt;
- return -1;
- }
-
- /* 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 (NONOPTION_P)
- {
- if (ordering == REQUIRE_ORDER)
- return -1;
- optarg = argv[optind++];
- return 1;
- }
-
- /* We have found another option-ARGV-element.
- Skip the initial punctuation. */
-
- nextchar = (argv[optind] + 1
- + (longopts != NULL && argv[optind][1] == '-'));
- }
-
- /* Decode the current option-ARGV-element. */
-
- /* Check whether the ARGV-element is a long option.
-
- If long_only and the ARGV-element has the form "-f", where f is
- a valid short option, don't consider it an abbreviated form of
- a long option that starts with f. Otherwise there would be no
- way to give the -f short option.
-
- On the other hand, if there's a long option "fubar" and
- the ARGV-element is "-fu", do consider that an abbreviation of
- the long option, just like "--fu", and not "-f" with arg "u".
-
- This distinction seems to be the most useful approach. */
-
- if (longopts != NULL
- && (argv[optind][1] == '-'
- || (long_only && (argv[optind][2] || !my_index (optstring,
argv[optind][1])))))
- {
- char *nameend;
- const struct option *p;
- const struct option *pfound = NULL;
- int exact = 0;
- int ambig = 0;
- int indfound = -1;
- int option_index;
-
- for (nameend = nextchar; *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 ((unsigned int) (nameend - nextchar)
- == (unsigned int) 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, _("%s: option `%s' is ambiguous\n"),
- argv[0], argv[optind]);
- nextchar += strlen (nextchar);
- optind++;
- optopt = 0;
- return '?';
- }
-
- if (pfound != NULL)
- {
- option_index = indfound;
- optind++;
- 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)
- {
- if (argv[optind - 1][1] == '-')
- /* --option */
- fprintf (stderr,
- _("%s: option `--%s' doesn't allow an
argument\n"),
- argv[0], pfound->name);
- else
- /* +option or -option */
- fprintf (stderr,
- _("%s: option `%c%s' doesn't allow an
argument\n"),
- argv[0], argv[optind - 1][0], pfound->name);
- }
-
- nextchar += strlen (nextchar);
-
- optopt = pfound->val;
- return '?';
- }
- }
- else if (pfound->has_arg == 1)
- {
- if (optind < argc)
- optarg = argv[optind++];
- else
- {
- if (opterr)
- fprintf (stderr,
- _("%s: option `%s' requires an argument\n"),
- argv[0], argv[optind - 1]);
- nextchar += strlen (nextchar);
- optopt = pfound->val;
- return optstring[0] == ':' ? ':' : '?';
- }
- }
- nextchar += strlen (nextchar);
- if (longind != NULL)
- *longind = option_index;
- if (pfound->flag)
- {
- *(pfound->flag) = pfound->val;
- return 0;
- }
- return pfound->val;
- }
-
- /* Can't find it as a long option. If this is not getopt_long_only,
- or the option starts with '--' or is not a valid short
- option, then it's an error.
- Otherwise interpret it as a short option. */
- if (!long_only || argv[optind][1] == '-'
- || my_index (optstring, *nextchar) == NULL)
- {
- if (opterr)
- {
- if (argv[optind][1] == '-')
- /* --option */
- fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
- argv[0], nextchar);
- else
- /* +option or -option */
- 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. */
-
- {
- char c = *nextchar++;
- char *temp = my_index (optstring, c);
-
- /* Increment `optind' when we start to process its last character. */
- if (*nextchar == '\0')
- ++optind;
-
- if (temp == NULL || c == ':')
- {
- if (opterr)
- {
- if (posixly_correct)
- /* 1003.2 specifies the format of this message. */
- fprintf (stderr, _("%s: illegal option -- %c\n"),
- argv[0], c);
- else
- fprintf (stderr, _("%s: invalid option -- %c\n"),
- argv[0], c);
- }
- 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 = 0;
- 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, _("%s: option requires an argument -- %c\n"),
- argv[0], c);
- }
- optopt = c;
- if (optstring[0] == ':')
- c = ':';
- else
- c = '?';
- return 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 ((unsigned int) (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, _("%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, _("\
-%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,
- _("%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] == ':')
- {
- /* This is an option that accepts an argument optionally. */
- if (*nextchar != '\0')
- {
- optarg = nextchar;
- optind++;
- }
- else
- optarg = NULL;
- nextchar = NULL;
- }
- else
- {
- /* 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,
- _("%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++];
- nextchar = NULL;
- }
- }
- return c;
- }
-}
-
-int
-getopt (argc, argv, optstring)
- int argc;
- char *const *argv;
- const char *optstring;
-{
- return _getopt_internal (argc, argv, optstring,
- (const struct option *) 0,
- (int *) 0,
- 0);
-}
-
-#endif /* Not ELIDE_CODE. */
-
-#ifdef TEST
-
-/* Compile with -DTEST to make an executable for use in testing
- the above definition of `getopt'. */
-
-int
-main (argc, argv)
- int argc;
- char **argv;
-{
- int c;
- int digit_optind = 0;
-
- while (1)
- {
- int this_option_optind = optind ? optind : 1;
-
- c = getopt (argc, argv, "abc:d:0123456789");
- if (c == -1)
- break;
-
- switch (c)
- {
- 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 '?':
- 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 */
Index: src/getopt1.c
===================================================================
RCS file: src/getopt1.c
diff -N src/getopt1.c
--- src/getopt1.c 27 Aug 2003 17:10:13 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,188 +0,0 @@
-/* getopt_long and getopt_long_only entry points for GNU getopt.
- Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98
- 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 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 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 (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 */
Index: src/gnu-getopt.h
===================================================================
RCS file: src/gnu-getopt.h
diff -N src/gnu-getopt.h
--- src/gnu-getopt.h 27 Nov 2000 22:54:22 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,180 +0,0 @@
-/* Declarations for getopt.
- Copyright (C) 1989,90,91,92,93,94,96,97,98,99 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 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. */
-
-#ifndef _GETOPT_H
-
-#ifndef __need_getopt
-# define _GETOPT_H 1
-#endif
-
-/* If __GNU_LIBRARY__ is not already defined, either we are being used
- standalone, or this is the first header included in the source file.
- If we are being used with glibc, we need to include <features.h>, but
- that does not exist if we are standalone. So: if __GNU_LIBRARY__ is
- not defined, include <ctype.h>, which will pull in <features.h> for us
- if it's from glibc. (Why ctype.h? It's guaranteed to exist and it
- doesn't flood the namespace with stuff the way some other headers do.) */
-#if !defined __GNU_LIBRARY__
-# include <ctype.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* For communication from `getopt' to the caller.
- When `getopt' finds an option that takes an argument,
- the argument value is returned here.
- Also, when `ordering' is RETURN_IN_ORDER,
- each non-option ARGV-element is returned here. */
-
-extern char *optarg;
-
-/* Index in ARGV of the next element to be scanned.
- This is used for communication to and from the caller
- and for communication between successive calls to `getopt'.
-
- On entry to `getopt', zero means this is the first call; initialize.
-
- When `getopt' returns -1, this is the index of the first of the
- non-option elements that the caller should itself scan.
-
- Otherwise, `optind' communicates from one call to the next
- how much of ARGV has been scanned so far. */
-
-extern int optind;
-
-/* Callers store zero here to inhibit the error message `getopt' prints
- for unrecognized options. */
-
-extern int opterr;
-
-/* Set to an option character which was unrecognized. */
-
-extern int optopt;
-
-#ifndef __need_getopt
-/* Describe the long-named options requested by the application.
- The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
- of `struct option' terminated by an element containing a name which is
- zero.
-
- The field `has_arg' is:
- no_argument (or 0) if the option does not take an argument,
- required_argument (or 1) if the option requires an argument,
- optional_argument (or 2) if the option takes an optional argument.
-
- If the field `flag' is not NULL, it points to a variable that is set
- to the value given in the field `val' when the option is found, but
- left unchanged if the option is not found.
-
- To have a long-named option do something other than set an `int' to
- a compiled-in constant, such as set a value from `optarg', set the
- option's `flag' field to zero and its `val' field to a nonzero
- value (the equivalent single-letter option character, if there is
- one). For long options that have a zero `flag' field, `getopt'
- returns the contents of the `val' field. */
-
-struct option
-{
-# if defined __STDC__ && __STDC__
- const char *name;
-# else
- char *name;
-# endif
- /* has_arg can't be an enum because some compilers complain about
- type mismatches in all the code that assumes it is an int. */
- int has_arg;
- int *flag;
- int val;
-};
-
-/* Names for the values of the `has_arg' field of `struct option'. */
-
-# define no_argument 0
-# define required_argument 1
-# define optional_argument 2
-#endif /* need getopt */
-
-
-/* Get definitions and prototypes for functions to process the
- arguments in ARGV (ARGC of them, minus the program name) for
- options given in OPTS.
-
- Return the option character from OPTS just read. Return -1 when
- there are no more options. For unrecognized options, or options
- missing arguments, `optopt' is set to the option letter, and '?' is
- returned.
-
- The OPTS string is a list of characters which are recognized option
- letters, optionally followed by colons, specifying that that letter
- takes an argument, to be placed in `optarg'.
-
- If a letter in OPTS is followed by two colons, its argument is
- optional. This behavior is specific to the GNU `getopt'.
-
- The argument `--' causes premature termination of argument
- scanning, explicitly telling `getopt' that there are no more
- options.
-
- If OPTS begins with `--', then non-option arguments are treated as
- arguments to the option '\0'. This behavior is specific to the GNU
- `getopt'. */
-
-#if defined __STDC__ && __STDC__
-# ifdef __GNU_LIBRARY__
-/* Many other libraries have conflicting prototypes for getopt, with
- differences in the consts, in stdlib.h. To avoid compilation
- errors, only prototype getopt for the GNU C library. */
-extern int getopt (int __argc, char *const *__argv, const char *__shortopts);
-# else /* not __GNU_LIBRARY__ */
-extern int getopt ();
-# endif /* __GNU_LIBRARY__ */
-
-# ifndef __need_getopt
-extern int getopt_long (int __argc, char *const *__argv, const char
*__shortopts,
- const struct option *__longopts, int *__longind);
-extern int getopt_long_only (int __argc, char *const *__argv,
- const char *__shortopts,
- const struct option *__longopts, int *__longind);
-
-/* Internal only. Users should not call this directly. */
-extern int _getopt_internal (int __argc, char *const *__argv,
- const char *__shortopts,
- const struct option *__longopts, int *__longind,
- int __long_only);
-# endif
-#else /* not __STDC__ */
-extern int getopt ();
-# ifndef __need_getopt
-extern int getopt_long ();
-extern int getopt_long_only ();
-
-extern int _getopt_internal ();
-# endif
-#endif /* __STDC__ */
-
-#ifdef __cplusplus
-}
-#endif
-
-/* Make sure we later can get all the definitions and declarations. */
-#undef __need_getopt
-
-#endif /* getopt.h */
Index: src/main.c
===================================================================
RCS file: /cvsroot/m4/m4/src/main.c,v
retrieving revision 1.52
diff -u -p -u -r1.52 main.c
--- src/main.c 11 Sep 2003 16:38:12 -0000 1.52
+++ src/main.c 12 Sep 2003 15:16:59 -0000
@@ -17,12 +17,12 @@
02111-1307 USA
*/
-#include <getopt.h>
#include <signal.h>
#include "m4.h"
#include "m4private.h"
#include "m4/progname.h"
+#include "m4/getopt.h"
static void print_program_name_CB (void);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- FYI: 66-gary-gnulib-getopt-import.patch,
Gary V. Vaughan <=