[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Groff-commit] groff ./ChangeLog src/include/Makefile.sub src/...
|
From: |
Werner LEMBERG |
|
Subject: |
[Groff-commit] groff ./ChangeLog src/include/Makefile.sub src/... |
|
Date: |
Mon, 02 May 2005 06:25:02 -0400 |
CVSROOT: /cvsroot/groff
Module name: groff
Branch:
Changes by: Werner LEMBERG <address@hidden> 05/05/02 10:25:02
Modified files:
. : ChangeLog
src/include : Makefile.sub getopt.h groff-getopt.h
src/libs/libgroff: getopt.c getopt1.c
Removed files:
src/include : getopt_int.h
Log message:
Undo getopt changes from 2004-04-30. We don't want a dependency
on gettext.
* src/include/getopt_int.h: Removed.
* src/include/getopt.h, src/include/groff-getopt.h,
src/include/Makefile.sub, src/libs/libgroff/getopt.c,
src/libs/libgroff/getopt1.c: Revert to previous version.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.816&tr2=1.817&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/include/Makefile.sub.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/include/getopt.h.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/include/groff-getopt.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/libs/libgroff/getopt.c.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/libs/libgroff/getopt1.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.816 groff/ChangeLog:1.817
--- groff/ChangeLog:1.816 Sat Apr 30 07:03:13 2005
+++ groff/ChangeLog Mon May 2 10:25:01 2005
@@ -1,3 +1,14 @@
+2004-05-02 Werner LEMBERG <address@hidden>
+
+ Undo getopt changes from 2004-04-30. We don't want a dependency
+ on gettext.
+
+ * src/include/getopt_int.h: Removed.
+
+ * src/include/getopt.h, src/include/groff-getopt.h,
+ src/include/Makefile.sub, src/libs/libgroff/getopt.c,
+ src/libs/libgroff/getopt1.c: Revert to previous version.
+
2004-04-30 Werner LEMBERG <address@hidden>
AC_TYPE_SIGNAL from current autoconf can fail if CC=g++.
Index: groff/src/include/Makefile.sub
diff -u groff/src/include/Makefile.sub:1.14 groff/src/include/Makefile.sub:1.15
--- groff/src/include/Makefile.sub:1.14 Sat Apr 30 07:03:14 2005
+++ groff/src/include/Makefile.sub Mon May 2 10:25:02 2005
@@ -11,7 +11,6 @@
font.h \
geometry.h \
getopt.h \
- getopt_int.h \
groff-getopt.h \
htmlhint.h \
index.h \
Index: groff/src/include/getopt.h
diff -u groff/src/include/getopt.h:1.5 groff/src/include/getopt.h:1.6
--- groff/src/include/getopt.h:1.5 Sat Apr 30 07:03:14 2005
+++ groff/src/include/getopt.h Mon May 2 10:25:02 2005
@@ -1,6 +1,5 @@
/* Declarations for getopt.
- Copyright (C) 1989-1994,1996-1999,2001,2003,2004
- Free Software Foundation, Inc.
+ Copyright (C) 1989-1994, 1996-1999, 2001 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
@@ -35,17 +34,6 @@
# include <ctype.h>
#endif
-#ifndef __THROW
-# ifndef __GNUC_PREREQ
-# define __GNUC_PREREQ(maj, min) (0)
-# endif
-# if defined __cplusplus && __GNUC_PREREQ (2,8)
-# define __THROW throw ()
-# else
-# define __THROW
-# endif
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -105,7 +93,11 @@
struct option
{
+# if (defined __STDC__ && __STDC__) || defined __cplusplus
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;
@@ -145,27 +137,39 @@
arguments to the option '\0'. This behavior is specific to the GNU
`getopt'. */
-#ifdef __GNU_LIBRARY__
+#if (defined __STDC__ && __STDC__) || defined __cplusplus
+# 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)
- __THROW;
-#else /* not __GNU_LIBRARY__ */
+extern int getopt (int ___argc, char *const *___argv, const char *__shortopts);
+# else /* not __GNU_LIBRARY__ */
extern int getopt ();
-#endif /* __GNU_LIBRARY__ */
+# endif /* __GNU_LIBRARY__ */
-#ifndef __need_getopt
+# ifndef __need_getopt
extern int getopt_long (int ___argc, char *const *___argv,
const char *__shortopts,
- const struct option *__longopts, int *__longind)
- __THROW;
+ 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)
- __THROW;
+ const struct option *__longopts, int *__longind);
-#endif
+/* 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
}
Index: groff/src/include/groff-getopt.h
diff -u groff/src/include/groff-getopt.h:1.3
groff/src/include/groff-getopt.h:1.4
--- groff/src/include/groff-getopt.h:1.3 Sat Apr 30 07:03:14 2005
+++ groff/src/include/groff-getopt.h Mon May 2 10:25:02 2005
@@ -1,5 +1,5 @@
// -*- C++ -*-
-/* Copyright (C) 2000, 2001, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2001 Free Software Foundation, Inc.
Written by Werner Lemberg (address@hidden)
This file is part of groff.
@@ -49,20 +49,17 @@
extern int getopt(int, // __argc
char *const *, // __argv
- const char *) // __shortopts
- throw();
+ const char *); // __shortopts
extern int getopt_long(int, // __argc
char *const *, // __argv
const char *, // __shortopts
const struct option *, // __longopts
- int *) // __longind
- throw();
+ int *); // __longind
extern int getopt_long_only(int, // __argc
char *const *, // __argv
const char *, // __shortopts
const struct option *, // __longopts
- int *) // __longind
- throw();
+ int *); // __longind
#ifdef __cplusplus
}
Index: groff/src/libs/libgroff/getopt.c
diff -u groff/src/libs/libgroff/getopt.c:1.6
groff/src/libs/libgroff/getopt.c:1.7
--- groff/src/libs/libgroff/getopt.c:1.6 Sat Apr 30 07:03:14 2005
+++ groff/src/libs/libgroff/getopt.c Mon May 2 10:25:02 2005
@@ -2,7 +2,7 @@
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,98,99,2000,2001,2002,2003,2004
+ Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -31,6 +31,14 @@
# 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
@@ -61,21 +69,26 @@
# include <unistd.h>
#endif /* GNU C library. */
-#include <string.h>
-
#ifdef VMS
# include <unixlib.h>
+# if HAVE_STRING_H - 0
+# include <string.h>
+# endif
#endif
-#ifdef _LIBC
-# include <libintl.h>
-#else
-# include "gettext.h"
-# define _(msgid) gettext (msgid)
-#endif
-
-#if defined _LIBC && defined USE_IN_LIBIO
-# include <wchar.h>
+#ifndef _
+/* This is for other GNU distributions with internationalized messages. */
+# if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC
+# include <libintl.h>
+# ifndef _
+# define _(msgid) gettext (msgid)
+# endif
+# else
+# define _(msgid) (msgid)
+# endif
+# if defined _LIBC && defined USE_IN_LIBIO
+# include <wchar.h>
+# endif
#endif
#ifndef attribute_hidden
@@ -97,7 +110,6 @@
they can distinguish the relative order of options and other arguments. */
#include "getopt.h"
-#include "getopt_int.h"
/* For communication from `getopt' to the caller.
When `getopt' finds an option that takes an argument,
@@ -122,6 +134,21 @@
/* 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. */
@@ -133,12 +160,57 @@
int optopt = '?';
-/* Keep a global copy of all internal members of getopt_data. */
+/* 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 struct _getopt_data getopt_data;
+static enum
+{
+ REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
+} ordering;
+/* Value of POSIXLY_CORRECT environment variable. */
+static char *posixly_correct;
-#ifndef __GNU_LIBRARY__
+#ifdef __GNU_LIBRARY__
+/* We want to avoid inclusion of string.h with non-GNU libraries
+ because there are many ways it can cause trouble.
+ On some systems, it contains special magic macros that don't work
+ in GCC. */
+# include <string.h>
+# 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. */
@@ -147,8 +219,43 @@
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
/* Stored original parameters.
XXX This is no good solution. We should rather copy the args so
@@ -162,11 +269,14 @@
# 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 (d->__nonoption_flags_len > 0) \
+ if (nonoption_flags_len > 0) \
{ \
char __tmp = __getopt_nonoption_flags[ch1]; \
__getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \
@@ -188,12 +298,17 @@
`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 (char **argv, struct _getopt_data *d)
+exchange (argv)
+ char **argv;
{
- int bottom = d->__first_nonopt;
- int middle = d->__last_nonopt;
- int top = d->optind;
+ 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.
@@ -205,19 +320,19 @@
/* 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 (d->__nonoption_flags_len > 0 && top >= d->__nonoption_flags_max_len)
+ 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)
- d->__nonoption_flags_len = d->__nonoption_flags_max_len = 0;
+ nonoption_flags_len = nonoption_flags_max_len = 0;
else
{
memset (__mempcpy (new_str, __getopt_nonoption_flags,
- d->__nonoption_flags_max_len),
- '\0', top + 1 - d->__nonoption_flags_max_len);
- d->__nonoption_flags_max_len = top + 1;
+ nonoption_flags_max_len),
+ '\0', top + 1 - nonoption_flags_max_len);
+ nonoption_flags_max_len = top + 1;
__getopt_nonoption_flags = new_str;
}
}
@@ -263,71 +378,76 @@
/* Update records for the slots the non-options now occupy. */
- d->__first_nonopt += (d->optind - d->__last_nonopt);
- d->__last_nonopt = d->optind;
+ 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 (int argc, char *const *argv, const char *optstring,
- struct _getopt_data *d)
+_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. */
- d->__first_nonopt = d->__last_nonopt = d->optind;
+ first_nonopt = last_nonopt = optind;
- d->__nextchar = NULL;
+ nextchar = NULL;
- d->__posixly_correct = !!getenv ("POSIXLY_CORRECT");
+ posixly_correct = getenv ("POSIXLY_CORRECT");
/* Determine how to handle the ordering of options and nonoptions. */
if (optstring[0] == '-')
{
- d->__ordering = RETURN_IN_ORDER;
+ ordering = RETURN_IN_ORDER;
++optstring;
}
else if (optstring[0] == '+')
{
- d->__ordering = REQUIRE_ORDER;
+ ordering = REQUIRE_ORDER;
++optstring;
}
- else if (d->__posixly_correct)
- d->__ordering = REQUIRE_ORDER;
+ else if (posixly_correct != NULL)
+ ordering = REQUIRE_ORDER;
else
- d->__ordering = PERMUTE;
+ ordering = PERMUTE;
#if defined _LIBC && defined USE_NONOPTION_FLAGS
- if (!d->__posixly_correct
+ if (posixly_correct == NULL
&& argc == __libc_argc && argv == __libc_argv)
{
- if (d->__nonoption_flags_max_len == 0)
+ if (nonoption_flags_max_len == 0)
{
if (__getopt_nonoption_flags == NULL
|| __getopt_nonoption_flags[0] == '\0')
- d->__nonoption_flags_max_len = -1;
+ nonoption_flags_max_len = -1;
else
{
const char *orig_str = __getopt_nonoption_flags;
- int len = d->__nonoption_flags_max_len = strlen (orig_str);
- if (d->__nonoption_flags_max_len < argc)
- d->__nonoption_flags_max_len = argc;
+ 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 (d->__nonoption_flags_max_len);
+ (char *) malloc (nonoption_flags_max_len);
if (__getopt_nonoption_flags == NULL)
- d->__nonoption_flags_max_len = -1;
+ nonoption_flags_max_len = -1;
else
memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
- '\0', d->__nonoption_flags_max_len - len);
+ '\0', nonoption_flags_max_len - len);
}
}
- d->__nonoption_flags_len = d->__nonoption_flags_max_len;
+ nonoption_flags_len = nonoption_flags_max_len;
}
else
- d->__nonoption_flags_len = 0;
+ nonoption_flags_len = 0;
#endif
return optstring;
@@ -390,25 +510,29 @@
long-named options. */
int
-_getopt_internal_r (int argc, char *const *argv, const char *optstring,
- const struct option *longopts, int *longind,
- int long_only, struct _getopt_data *d)
+_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;
{
- int print_errors = d->opterr;
+ int print_errors = opterr;
if (optstring[0] == ':')
print_errors = 0;
if (argc < 1)
return -1;
- d->optarg = NULL;
+ optarg = NULL;
- if (d->optind == 0 || !d->__initialized)
+ if (optind == 0 || !__getopt_initialized)
{
- if (d->optind == 0)
- d->optind = 1; /* Don't scan ARGV[0], the program name. */
- optstring = _getopt_initialize (argc, argv, optstring, d);
- d->__initialized = 1;
+ 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.
@@ -416,41 +540,40 @@
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[d->optind][0] != '-' || argv[d->optind][1] == '\0' \
- || (d->optind < d->__nonoption_flags_len \
- && __getopt_nonoption_flags[d->optind] == '1'))
+# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0'
\
+ || (optind < nonoption_flags_len \
+ && __getopt_nonoption_flags[optind] == '1'))
#else
-# define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0')
+# define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0')
#endif
- if (d->__nextchar == NULL || *d->__nextchar == '\0')
+ 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 (d->__last_nonopt > d->optind)
- d->__last_nonopt = d->optind;
- if (d->__first_nonopt > d->optind)
- d->__first_nonopt = d->optind;
+ if (last_nonopt > optind)
+ last_nonopt = optind;
+ if (first_nonopt > optind)
+ first_nonopt = optind;
- if (d->__ordering == PERMUTE)
+ if (ordering == PERMUTE)
{
/* If we have just processed some options following some non-options,
exchange them so that the options come first. */
- if (d->__first_nonopt != d->__last_nonopt
- && d->__last_nonopt != d->optind)
- exchange ((char **) argv, d);
- else if (d->__last_nonopt != d->optind)
- d->__first_nonopt = d->optind;
+ 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 (d->optind < argc && NONOPTION_P)
- d->optind++;
- d->__last_nonopt = d->optind;
+ while (optind < argc && NONOPTION_P)
+ optind++;
+ last_nonopt = optind;
}
/* The special ARGV-element `--' means premature end of options.
@@ -458,29 +581,28 @@
then exchange with previous non-options as if it were an option,
then skip everything else like a non-option. */
- if (d->optind != argc && !strcmp (argv[d->optind], "--"))
+ if (optind != argc && !strcmp (argv[optind], "--"))
{
- d->optind++;
+ optind++;
- if (d->__first_nonopt != d->__last_nonopt
- && d->__last_nonopt != d->optind)
- exchange ((char **) argv, d);
- else if (d->__first_nonopt == d->__last_nonopt)
- d->__first_nonopt = d->optind;
- d->__last_nonopt = argc;
+ if (first_nonopt != last_nonopt && last_nonopt != optind)
+ exchange ((char **) argv);
+ else if (first_nonopt == last_nonopt)
+ first_nonopt = optind;
+ last_nonopt = argc;
- d->optind = 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 (d->optind == argc)
+ 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 (d->__first_nonopt != d->__last_nonopt)
- d->optind = d->__first_nonopt;
+ if (first_nonopt != last_nonopt)
+ optind = first_nonopt;
return -1;
}
@@ -489,17 +611,17 @@
if (NONOPTION_P)
{
- if (d->__ordering == REQUIRE_ORDER)
+ if (ordering == REQUIRE_ORDER)
return -1;
- d->optarg = argv[d->optind++];
+ optarg = argv[optind++];
return 1;
}
/* We have found another option-ARGV-element.
Skip the initial punctuation. */
- d->__nextchar = (argv[d->optind] + 1
- + (longopts != NULL && argv[d->optind][1] == '-'));
+ nextchar = (argv[optind] + 1
+ + (longopts != NULL && argv[optind][1] == '-'));
}
/* Decode the current option-ARGV-element. */
@@ -518,9 +640,8 @@
This distinction seems to be the most useful approach. */
if (longopts != NULL
- && (argv[d->optind][1] == '-'
- || (long_only && (argv[d->optind][2]
- || !strchr (optstring, argv[d->optind][1])))))
+ && (argv[optind][1] == '-'
+ || (long_only && (argv[optind][2] || !my_index (optstring,
argv[optind][1])))))
{
char *nameend;
const struct option *p;
@@ -530,15 +651,15 @@
int indfound = -1;
int option_index;
- for (nameend = d->__nextchar; *nameend && *nameend != '='; nameend++)
+ 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, d->__nextchar, nameend - d->__nextchar))
+ if (!strncmp (p->name, nextchar, nameend - nextchar))
{
- if ((unsigned int) (nameend - d->__nextchar)
+ if ((unsigned int) (nameend - nextchar)
== (unsigned int) strlen (p->name))
{
/* Exact match found. */
@@ -569,44 +690,37 @@
char *buf;
if (__asprintf (&buf, _("%s: option `%s' is ambiguous\n"),
- argv[0], argv[d->optind]) >= 0)
+ argv[0], argv[optind]) >= 0)
{
- _IO_flockfile (stderr);
-
- int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
- ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s", buf);
else
fputs (buf, stderr);
- ((_IO_FILE *) stderr)->_flags2 = old_flags2;
- _IO_funlockfile (stderr);
-
free (buf);
}
#else
fprintf (stderr, _("%s: option `%s' is ambiguous\n"),
- argv[0], argv[d->optind]);
+ argv[0], argv[optind]);
#endif
}
- d->__nextchar += strlen (d->__nextchar);
- d->optind++;
- d->optopt = 0;
+ nextchar += strlen (nextchar);
+ optind++;
+ optopt = 0;
return '?';
}
if (pfound != NULL)
{
option_index = indfound;
- d->optind++;
+ 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)
- d->optarg = nameend + 1;
+ optarg = nameend + 1;
else
{
if (print_errors)
@@ -616,7 +730,7 @@
int n;
#endif
- if (argv[d->optind - 1][1] == '-')
+ if (argv[optind - 1][1] == '-')
{
/* --option */
#if defined _LIBC && defined USE_IN_LIBIO
@@ -635,48 +749,38 @@
#if defined _LIBC && defined USE_IN_LIBIO
n = __asprintf (&buf, _("\
%s: option `%c%s' doesn't allow an argument\n"),
- argv[0], argv[d->optind - 1][0],
+ argv[0], argv[optind - 1][0],
pfound->name);
#else
fprintf (stderr, _("\
%s: option `%c%s' doesn't allow an argument\n"),
- argv[0], argv[d->optind - 1][0],
- pfound->name);
+ argv[0], argv[optind - 1][0], pfound->name);
#endif
}
#if defined _LIBC && defined USE_IN_LIBIO
if (n >= 0)
{
- _IO_flockfile (stderr);
-
- int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
- ((_IO_FILE *) stderr)->_flags2
- |= _IO_FLAGS2_NOTCANCEL;
-
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s", buf);
else
fputs (buf, stderr);
- ((_IO_FILE *) stderr)->_flags2 = old_flags2;
- _IO_funlockfile (stderr);
-
free (buf);
}
#endif
}
- d->__nextchar += strlen (d->__nextchar);
+ nextchar += strlen (nextchar);
- d->optopt = pfound->val;
+ optopt = pfound->val;
return '?';
}
}
else if (pfound->has_arg == 1)
{
- if (d->optind < argc)
- d->optarg = argv[d->optind++];
+ if (optind < argc)
+ optarg = argv[optind++];
else
{
if (print_errors)
@@ -686,36 +790,27 @@
if (__asprintf (&buf, _("\
%s: option `%s' requires an argument\n"),
- argv[0], argv[d->optind - 1]) >= 0)
+ argv[0], argv[optind - 1]) >= 0)
{
- _IO_flockfile (stderr);
-
- int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
- ((_IO_FILE *) stderr)->_flags2
- |= _IO_FLAGS2_NOTCANCEL;
-
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s", buf);
else
fputs (buf, stderr);
- ((_IO_FILE *) stderr)->_flags2 = old_flags2;
- _IO_funlockfile (stderr);
-
free (buf);
}
#else
fprintf (stderr,
_("%s: option `%s' requires an argument\n"),
- argv[0], argv[d->optind - 1]);
+ argv[0], argv[optind - 1]);
#endif
}
- d->__nextchar += strlen (d->__nextchar);
- d->optopt = pfound->val;
+ nextchar += strlen (nextchar);
+ optopt = pfound->val;
return optstring[0] == ':' ? ':' : '?';
}
}
- d->__nextchar += strlen (d->__nextchar);
+ nextchar += strlen (nextchar);
if (longind != NULL)
*longind = option_index;
if (pfound->flag)
@@ -730,8 +825,8 @@
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[d->optind][1] == '-'
- || strchr (optstring, *d->__nextchar) == NULL)
+ if (!long_only || argv[optind][1] == '-'
+ || my_index (optstring, *nextchar) == NULL)
{
if (print_errors)
{
@@ -740,15 +835,15 @@
int n;
#endif
- if (argv[d->optind][1] == '-')
+ if (argv[optind][1] == '-')
{
/* --option */
#if defined _LIBC && defined USE_IN_LIBIO
n = __asprintf (&buf, _("%s: unrecognized option `--%s'\n"),
- argv[0], d->__nextchar);
+ argv[0], nextchar);
#else
fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
- argv[0], d->__nextchar);
+ argv[0], nextchar);
#endif
}
else
@@ -756,36 +851,28 @@
/* +option or -option */
#if defined _LIBC && defined USE_IN_LIBIO
n = __asprintf (&buf, _("%s: unrecognized option `%c%s'\n"),
- argv[0], argv[d->optind][0], d->__nextchar);
+ argv[0], argv[optind][0], nextchar);
#else
fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
- argv[0], argv[d->optind][0], d->__nextchar);
+ argv[0], argv[optind][0], nextchar);
#endif
}
#if defined _LIBC && defined USE_IN_LIBIO
if (n >= 0)
{
- _IO_flockfile (stderr);
-
- int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
- ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
-
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s", buf);
else
fputs (buf, stderr);
- ((_IO_FILE *) stderr)->_flags2 = old_flags2;
- _IO_funlockfile (stderr);
-
free (buf);
}
#endif
}
- d->__nextchar = (char *) "";
- d->optind++;
- d->optopt = 0;
+ nextchar = (char *) "";
+ optind++;
+ optopt = 0;
return '?';
}
}
@@ -793,12 +880,12 @@
/* Look at and handle the next short option-character. */
{
- char c = *d->__nextchar++;
- char *temp = strchr (optstring, c);
+ char c = *nextchar++;
+ char *temp = my_index (optstring, c);
/* Increment `optind' when we start to process its last character. */
- if (*d->__nextchar == '\0')
- ++d->optind;
+ if (*nextchar == '\0')
+ ++optind;
if (temp == NULL || c == ':')
{
@@ -809,7 +896,7 @@
int n;
#endif
- if (d->__posixly_correct)
+ if (posixly_correct)
{
/* 1003.2 specifies the format of this message. */
#if defined _LIBC && defined USE_IN_LIBIO
@@ -832,24 +919,16 @@
#if defined _LIBC && defined USE_IN_LIBIO
if (n >= 0)
{
- _IO_flockfile (stderr);
-
- int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
- ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
-
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s", buf);
else
fputs (buf, stderr);
- ((_IO_FILE *) stderr)->_flags2 = old_flags2;
- _IO_funlockfile (stderr);
-
free (buf);
}
#endif
}
- d->optopt = c;
+ optopt = c;
return '?';
}
/* Convenience. Treat POSIX -W foo same as long option --foo */
@@ -864,14 +943,14 @@
int option_index;
/* This is an option that requires an argument. */
- if (*d->__nextchar != '\0')
+ if (*nextchar != '\0')
{
- d->optarg = d->__nextchar;
+ optarg = nextchar;
/* If we end this ARGV-element by taking the rest as an arg,
we must advance to the next element now. */
- d->optind++;
+ optind++;
}
- else if (d->optind == argc)
+ else if (optind == argc)
{
if (print_errors)
{
@@ -883,19 +962,11 @@
_("%s: option requires an argument -- %c\n"),
argv[0], c) >= 0)
{
- _IO_flockfile (stderr);
-
- int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
- ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
-
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s", buf);
else
fputs (buf, stderr);
- ((_IO_FILE *) stderr)->_flags2 = old_flags2;
- _IO_funlockfile (stderr);
-
free (buf);
}
#else
@@ -903,7 +974,7 @@
argv[0], c);
#endif
}
- d->optopt = c;
+ optopt = c;
if (optstring[0] == ':')
c = ':';
else
@@ -911,23 +982,22 @@
return c;
}
else
- /* We already incremented `d->optind' once;
+ /* We already incremented `optind' once;
increment it again when taking next ARGV-elt as argument. */
- d->optarg = argv[d->optind++];
+ optarg = argv[optind++];
/* optarg is now the argument, see if it's in the
table of longopts. */
- for (d->__nextchar = nameend = d->optarg; *nameend && *nameend != '=';
- nameend++)
+ 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, d->__nextchar, nameend - d->__nextchar))
+ if (!strncmp (p->name, nextchar, nameend - nextchar))
{
- if ((unsigned int) (nameend - d->__nextchar) == strlen (p->name))
+ if ((unsigned int) (nameend - nextchar) == strlen (p->name))
{
/* Exact match found. */
pfound = p;
@@ -953,30 +1023,22 @@
char *buf;
if (__asprintf (&buf, _("%s: option `-W %s' is ambiguous\n"),
- argv[0], argv[d->optind]) >= 0)
+ argv[0], argv[optind]) >= 0)
{
- _IO_flockfile (stderr);
-
- int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
- ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
-
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s", buf);
else
fputs (buf, stderr);
- ((_IO_FILE *) stderr)->_flags2 = old_flags2;
- _IO_funlockfile (stderr);
-
free (buf);
}
#else
fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"),
- argv[0], argv[d->optind]);
+ argv[0], argv[optind]);
#endif
}
- d->__nextchar += strlen (d->__nextchar);
- d->optind++;
+ nextchar += strlen (nextchar);
+ optind++;
return '?';
}
if (pfound != NULL)
@@ -987,7 +1049,7 @@
/* Don't test has_arg with >, because some C compilers don't
allow it to be used on enums. */
if (pfound->has_arg)
- d->optarg = nameend + 1;
+ optarg = nameend + 1;
else
{
if (print_errors)
@@ -999,20 +1061,11 @@
%s: option `-W %s' doesn't allow an argument\n"),
argv[0], pfound->name) >= 0)
{
- _IO_flockfile (stderr);
-
- int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
- ((_IO_FILE *) stderr)->_flags2
- |= _IO_FLAGS2_NOTCANCEL;
-
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s", buf);
else
fputs (buf, stderr);
- ((_IO_FILE *) stderr)->_flags2 = old_flags2;
- _IO_funlockfile (stderr);
-
free (buf);
}
#else
@@ -1022,14 +1075,14 @@
#endif
}
- d->__nextchar += strlen (d->__nextchar);
+ nextchar += strlen (nextchar);
return '?';
}
}
else if (pfound->has_arg == 1)
{
- if (d->optind < argc)
- d->optarg = argv[d->optind++];
+ if (optind < argc)
+ optarg = argv[optind++];
else
{
if (print_errors)
@@ -1039,35 +1092,26 @@
if (__asprintf (&buf, _("\
%s: option `%s' requires an argument\n"),
- argv[0], argv[d->optind - 1]) >= 0)
+ argv[0], argv[optind - 1]) >= 0)
{
- _IO_flockfile (stderr);
-
- int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
- ((_IO_FILE *) stderr)->_flags2
- |= _IO_FLAGS2_NOTCANCEL;
-
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s", buf);
else
fputs (buf, stderr);
- ((_IO_FILE *) stderr)->_flags2 = old_flags2;
- _IO_funlockfile (stderr);
-
free (buf);
}
#else
fprintf (stderr,
_("%s: option `%s' requires an argument\n"),
- argv[0], argv[d->optind - 1]);
+ argv[0], argv[optind - 1]);
#endif
}
- d->__nextchar += strlen (d->__nextchar);
+ nextchar += strlen (nextchar);
return optstring[0] == ':' ? ':' : '?';
}
}
- d->__nextchar += strlen (d->__nextchar);
+ nextchar += strlen (nextchar);
if (longind != NULL)
*longind = option_index;
if (pfound->flag)
@@ -1077,7 +1121,7 @@
}
return pfound->val;
}
- d->__nextchar = NULL;
+ nextchar = NULL;
return 'W'; /* Let the application handle it. */
}
if (temp[1] == ':')
@@ -1085,26 +1129,26 @@
if (temp[2] == ':')
{
/* This is an option that accepts an argument optionally. */
- if (*d->__nextchar != '\0')
+ if (*nextchar != '\0')
{
- d->optarg = d->__nextchar;
- d->optind++;
+ optarg = nextchar;
+ optind++;
}
else
- d->optarg = NULL;
- d->__nextchar = NULL;
+ optarg = NULL;
+ nextchar = NULL;
}
else
{
/* This is an option that requires an argument. */
- if (*d->__nextchar != '\0')
+ if (*nextchar != '\0')
{
- d->optarg = d->__nextchar;
+ optarg = nextchar;
/* If we end this ARGV-element by taking the rest as an arg,
we must advance to the next element now. */
- d->optind++;
+ optind++;
}
- else if (d->optind == argc)
+ else if (optind == argc)
{
if (print_errors)
{
@@ -1116,19 +1160,11 @@
%s: option requires an argument -- %c\n"),
argv[0], c) >= 0)
{
- _IO_flockfile (stderr);
-
- int old_flags2 = ((_IO_FILE *) stderr)->_flags2;
- ((_IO_FILE *) stderr)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
-
if (_IO_fwide (stderr, 0) > 0)
__fwprintf (stderr, L"%s", buf);
else
fputs (buf, stderr);
- ((_IO_FILE *) stderr)->_flags2 = old_flags2;
- _IO_funlockfile (stderr);
-
free (buf);
}
#else
@@ -1137,7 +1173,7 @@
argv[0], c);
#endif
}
- d->optopt = c;
+ optopt = c;
if (optstring[0] == ':')
c = ':';
else
@@ -1146,8 +1182,8 @@
else
/* We already incremented `optind' once;
increment it again when taking next ARGV-elt as argument. */
- d->optarg = argv[d->optind++];
- d->__nextchar = NULL;
+ optarg = argv[optind++];
+ nextchar = NULL;
}
}
return c;
@@ -1155,26 +1191,10 @@
}
int
-_getopt_internal (int argc, char *const *argv, const char *optstring,
- const struct option *longopts, int *longind, int long_only)
-{
- int result;
-
- getopt_data.optind = optind;
- getopt_data.opterr = opterr;
-
- result = _getopt_internal_r (argc, argv, optstring, longopts,
- longind, long_only, &getopt_data);
-
- optind = getopt_data.optind;
- optarg = getopt_data.optarg;
- optopt = getopt_data.optopt;
-
- return result;
-}
-
-int
-getopt (int argc, char *const *argv, const char *optstring)
+getopt (argc, argv, optstring)
+ int argc;
+ char *const *argv;
+ const char *optstring;
{
return _getopt_internal (argc, argv, optstring,
(const struct option *) 0,
@@ -1190,7 +1210,9 @@
the above definition of `getopt'. */
int
-main (int argc, char **argv)
+main (argc, argv)
+ int argc;
+ char **argv;
{
int c;
int digit_optind = 0;
Index: groff/src/libs/libgroff/getopt1.c
diff -u groff/src/libs/libgroff/getopt1.c:1.4
groff/src/libs/libgroff/getopt1.c:1.5
--- groff/src/libs/libgroff/getopt1.c:1.4 Sat Apr 30 07:03:14 2005
+++ groff/src/libs/libgroff/getopt1.c Mon May 2 10:25:02 2005
@@ -1,5 +1,5 @@
/* getopt_long and getopt_long_only entry points for GNU getopt.
- Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2004
+ 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.
@@ -22,12 +22,15 @@
#include <config.h>
#endif
-#ifdef _LIBC
-# include <getopt.h>
-#else
-# include "getopt.h"
+#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 "getopt_int.h"
#include <stdio.h>
@@ -61,41 +64,32 @@
#endif
int
-getopt_long (int argc, char *const *argv, const char *options,
- const struct option *long_options, int *opt_index)
+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);
}
-int
-_getopt_long_r (int argc, char *const *argv, const char *options,
- const struct option *long_options, int *opt_index,
- struct _getopt_data *d)
-{
- return _getopt_internal_r (argc, argv, options, long_options, opt_index,
- 0, d);
-}
-
/* Like getopt_long, but '-' as well as '--' can indicate a long option.
If an option that starts with '-' (not '--') doesn't match a long option,
but does match a short option, it is parsed as a short option
instead. */
int
-getopt_long_only (int argc, char *const *argv, const char *options,
- const struct option *long_options, int *opt_index)
+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);
}
-int
-_getopt_long_only_r (int argc, char *const *argv, const char *options,
- const struct option *long_options, int *opt_index,
- struct _getopt_data *d)
-{
- return _getopt_internal_r (argc, argv, options, long_options, opt_index,
- 1, d);
-}
#endif /* Not ELIDE_CODE. */
@@ -104,7 +98,9 @@
#include <stdio.h>
int
-main (int argc, char **argv)
+main (argc, argv)
+ int argc;
+ char **argv;
{
int c;
int digit_optind = 0;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Groff-commit] groff ./ChangeLog src/include/Makefile.sub src/...,
Werner LEMBERG <=