[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
merged gnulib getopt into Emacs
|
From: |
Paul Eggert |
|
Subject: |
merged gnulib getopt into Emacs |
|
Date: |
Tue, 26 Jul 2005 14:49:20 -0700 |
At RMS's request I installed the following patch to merge gnulib
getopt into Emacs. This should fix some portability bugs with getopt.
Please let me know if you run into problems with it. For more about
gnulib, please see <http://www.gnu.org/software/gnulib/>.
2005-07-26 Paul Eggert <address@hidden>
Merge gnulib getopt implementation into Emacs.
* Makefile.in (AUTOCONF_INPUTS): New macro.
($(srcdir)/configure, $(srcdir)/src/stamp-h.in): Depend on it,
so that these files also depend on m4/getopt.m4.
* configure.in: Configure getopt by including m4/getopt.m4,
and configuring a getopt replacement if necessary.
* make-dist: Add m4 subdirectory. Unlink lib-src/getopt.h.
* m4/getopt.m4: New file.
* lib-src/Makefile.in (mostlyclean): Remove getopt.h, getopt.h-t.
(GETOPT_H): New macro, from gnulib.
(getopt.h): New rule, from gnulib.
(GETOPTOBJS): Now autoconfigured.
(GETOPTDEPS): getopt.h is now autoconfigured.
(getopt.o, getopt1.o): Depend on $(GETOPT_H), not ${srcdir}/getopt.h.
(getopt.o): Depend on ${srcdir}/gettext.h.
(movemail.o): Depend on $(GETOPT_H).
* lib-src/getopt.c, lib-src/getopt1.c: Sync from gnulib.
* lib-src/getopt_.h, lib-src/getopt_int.h, lib-src/gettext.h:
New files, from gnulib.
* lib-src/getopt.h: Removed (now is getopt_.h).
* nt/inc/gettext.h: Remove; no longer needed now that
lib-src/gettext.h exists.
* src/s/cygwin.h (C_SWITCH_SYSTEM): Remove, since gettext.h is
now part of lib-src.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/emacs/emacs/Makefile.in,v
retrieving revision 1.303
diff -p -c -r1.303 Makefile.in
*** Makefile.in 4 Jul 2005 14:04:09 -0000 1.303
--- Makefile.in 26 Jul 2005 21:36:26 -0000
***************
*** 2,8 ****
# DIST: make most of the changes to this file you might want, so try
# DIST: that first.
! # Copyright (C) 1992,93,94,95,96,97,98,1999,2000,01,02,03,2004
# Free Software Foundation, Inc.
# This file is part of GNU Emacs.
--- 2,8 ----
# DIST: make most of the changes to this file you might want, so try
# DIST: that first.
! # Copyright (C) 1992,93,94,95,96,97,98,1999,2000,01,02,03,04,2005
# Free Software Foundation, Inc.
# This file is part of GNU Emacs.
*************** Makefile: $(srcdir)/Makefile.in config.s
*** 302,313 ****
config.status: ${srcdir}/configure
./config.status --recheck
! ${srcdir}/configure: @MAINT@ ${srcdir}/configure.in
cd ${srcdir} && autoconf
$(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in
@true
! $(srcdir)/src/stamp-h.in: @MAINT@ ${srcdir}/configure.in
cd ${srcdir} && autoheader
rm -f $(srcdir)/src/stamp-h.in
echo timestamp > $(srcdir)/src/stamp-h.in
--- 302,315 ----
config.status: ${srcdir}/configure
./config.status --recheck
! AUTOCONF_INPUTS = @MAINT@ $(srcdir)/configure.in $(srcdir)/m4/getopt.m4
!
! $(srcdir)/configure: $(AUTOCONF_INPUTS)
cd ${srcdir} && autoconf
$(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in
@true
! $(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS)
cd ${srcdir} && autoheader
rm -f $(srcdir)/src/stamp-h.in
echo timestamp > $(srcdir)/src/stamp-h.in
Index: configure.in
===================================================================
RCS file: /cvsroot/emacs/emacs/configure.in,v
retrieving revision 1.394
diff -p -c -r1.394 configure.in
*** configure.in 6 Jul 2005 12:03:35 -0000 1.394
--- configure.in 26 Jul 2005 21:36:27 -0000
*************** if test "${HAVE_CARBON}" = "yes"; then
*** 2353,2359 ****
CFLAGS="$CFLAGS -framework Carbon"
AC_CHECK_FUNC(CancelMenuTracking, have_cmt=yes, have_cmt=no)
if test "$have_cmt" = yes; then
! AC_DEFINE(HAVE_CANCELMENUTRACKING, 1,
[Define to 1 if CancelMenuTracking is available (Mac OSX).])
fi
CFLAGS="$tmp_CFLAGS"
--- 2353,2359 ----
CFLAGS="$CFLAGS -framework Carbon"
AC_CHECK_FUNC(CancelMenuTracking, have_cmt=yes, have_cmt=no)
if test "$have_cmt" = yes; then
! AC_DEFINE(HAVE_CANCELMENUTRACKING, 1,
[Define to 1 if CancelMenuTracking is available (Mac OSX).])
fi
CFLAGS="$tmp_CFLAGS"
*************** fi
*** 2433,2438 ****
--- 2433,2447 ----
AC_FUNC_GETLOADAVG
AC_FUNC_FSEEKO
+
+ # Configure getopt.
+ m4_include([m4/getopt.m4])
+ gl_GETOPT_IFELSE([
+ gl_GETOPT_SUBSTITUTE_HEADER
+ gl_PREREQ_GETOPT
+ GETOPTOBJS='getopt.o getopt1.o'
+ ])
+ AC_SUBST(GETOPTOBJS)
AC_FUNC_GETPGRP
Index: make-dist
===================================================================
RCS file: /cvsroot/emacs/emacs/make-dist,v
retrieving revision 1.213
diff -p -c -r1.213 make-dist
*** make-dist 4 Jul 2005 14:04:09 -0000 1.213
--- make-dist 26 Jul 2005 21:36:27 -0000
***************
*** 6,12 ****
#### be distributed. This means that if you add a file with an odd name,
#### you should make sure that this script will include it.
! # Copyright (C) 1995, 1997, 1998, 2000, 2001, 2002, 2005
# Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
--- 6,12 ----
#### be distributed. This means that if you add a file with an odd name,
#### you should make sure that this script will include it.
! # Copyright (C) 1995, 1997, 1998, 2000, 2001, 2002, 2005
# Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
*************** for subdir in lisp site-lisp lispref lis
*** 323,329 ****
nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \
etc etc/e etc/images etc/images/gnus etc/images/smilies \
etc/tree-widget etc/tree-widget/default etc/tree-widget/folder \
! info man msdos vms mac mac/inc mac/inc/sys \
mac/src mac/Emacs.app mac/Emacs.app/Contents \
mac/Emacs.app/Contents/MacOS mac/Emacs.app/Contents/Resources \
mac/Emacs.app/Contents/Resources/English.lproj
--- 323,329 ----
nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \
etc etc/e etc/images etc/images/gnus etc/images/smilies \
etc/tree-widget etc/tree-widget/default etc/tree-widget/folder \
! info man m4 msdos vms mac mac/inc mac/inc/sys \
mac/src mac/Emacs.app mac/Emacs.app/Contents \
mac/Emacs.app/Contents/MacOS mac/Emacs.app/Contents/Resources \
mac/Emacs.app/Contents/Resources/English.lproj
*************** echo "Making links to \`lib-src'"
*** 487,493 ****
--- 487,498 ----
done
cd ../${tempdir}/lib-src
rm -f Makefile.c
+ rm -f getopt.h
rm -f =* TAGS)
+
+ echo "Making links to \`m4'"
+ (cd m4
+ ln *.m4 ../${tempdir}/m4)
echo "Making links to \`nt'"
(cd nt
Index: lib-src/Makefile.in
===================================================================
RCS file: /cvsroot/emacs/emacs/lib-src/Makefile.in,v
retrieving revision 1.142
diff -p -c -r1.142 Makefile.in
*** lib-src/Makefile.in 4 Jul 2005 15:24:11 -0000 1.142
--- lib-src/Makefile.in 26 Jul 2005 21:36:27 -0000
***************
*** 1,5 ****
# Makefile for lib-src subdirectory in GNU Emacs.
! # Copyright (C) 1985, 1987, 1988, 1993, 1994, 2002, 2003, 2004
# Free Software Foundation, Inc.
# This file is part of GNU Emacs.
--- 1,5 ----
# Makefile for lib-src subdirectory in GNU Emacs.
! # Copyright (C) 1985, 1987, 1988, 1993, 1994, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
# This file is part of GNU Emacs.
*************** uninstall:
*** 344,350 ****
rm -f ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS})
mostlyclean:
! -rm -f core *.o
clean: mostlyclean
-rm -f ${INSTALLABLES} ${UTILITIES} ${DONT_INSTALL}
--- 344,350 ----
rm -f ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS})
mostlyclean:
! -rm -f core *.o getopt.h getopt.h-t
clean: mostlyclean
-rm -f ${INSTALLABLES} ${UTILITIES} ${DONT_INSTALL}
*************** test-distrib${EXEEXT}: ${srcdir}/test-di
*** 382,392 ****
$(CC) ${ALL_CFLAGS} -o test-distrib ${srcdir}/test-distrib.c
./test-distrib ${srcdir}/testfile
! GETOPTOBJS = getopt.o getopt1.o
! GETOPTDEPS = $(GETOPTOBJS) ${srcdir}/getopt.h
! getopt.o: ${srcdir}/getopt.c ${srcdir}/getopt.h
${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt.c
! getopt1.o: ${srcdir}/getopt1.c ${srcdir}/getopt.h
${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt1.c
#ifdef REGEXP_IN_LIBC
--- 382,399 ----
$(CC) ${ALL_CFLAGS} -o test-distrib ${srcdir}/test-distrib.c
./test-distrib ${srcdir}/testfile
! /* We need the following in order to create a <getopt.h> when the system
! doesn't have one that works with the given compiler. */
! GETOPT_H = @GETOPT_H@
! getopt.h: getopt_.h
! cp $(srcdir)/getopt_.h address@hidden
! mv address@hidden $@
!
! GETOPTOBJS = @GETOPTOBJS@
! GETOPTDEPS = $(GETOPTOBJS) $(GETOPT_H)
! getopt.o: ${srcdir}/getopt.c $(GETOPT_H) ${srcdir}/gettext.h
${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt.c
! getopt1.o: ${srcdir}/getopt1.c $(GETOPT_H)
${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt1.c
#ifdef REGEXP_IN_LIBC
*************** b2m${EXEEXT}: ${srcdir}/b2m.c ../src/con
*** 430,436 ****
movemail${EXEEXT}: movemail.o pop.o $(GETOPTDEPS)
$(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} movemail.o pop.o $(GETOPTOBJS)
$(LOADLIBES) $(LIBS_MAIL) $(LIBS_MOVE) -o movemail
! movemail.o: ${srcdir}/movemail.c ../src/config.h
$(CC) -c ${CPP_CFLAGS} -Demacs ${MOVE_FLAGS} ${srcdir}/movemail.c
pop.o: ${srcdir}/pop.c ../src/config.h
--- 437,443 ----
movemail${EXEEXT}: movemail.o pop.o $(GETOPTDEPS)
$(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} movemail.o pop.o $(GETOPTOBJS)
$(LOADLIBES) $(LIBS_MAIL) $(LIBS_MOVE) -o movemail
! movemail.o: ${srcdir}/movemail.c ../src/config.h $(GETOPT_H)
$(CC) -c ${CPP_CFLAGS} -Demacs ${MOVE_FLAGS} ${srcdir}/movemail.c
pop.o: ${srcdir}/pop.c ../src/config.h
Index: lib-src/getopt.c
===================================================================
RCS file: /cvsroot/emacs/emacs/lib-src/getopt.c,v
retrieving revision 1.25
diff -p -c -r1.25 getopt.c
*** lib-src/getopt.c 4 Jul 2005 15:24:11 -0000 1.25
--- lib-src/getopt.c 26 Jul 2005 21:36:27 -0000
***************
*** 2,9 ****
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
! 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
--- 2,9 ----
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
! 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
***************
*** 30,64 ****
# 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__
--- 30,37 ----
***************
*** 68,99 ****
# include <unistd.h>
#endif /* GNU C library. */
#ifdef VMS
# include <unixlib.h>
- # if HAVE_STRING_H - 0
- # include <string.h>
- # endif
#endif
! #if HAVE_LIBINTL_H
# include <libintl.h>
! #endif /* HAVE_LIBINTL_H */
!
! #if 0
! # ifdef _LIBC
! # include <libintl.h>
! # else /* not #ifdef _LIBC */
! /* This is for other GNU distributions with internationalized messages. */
! # include "gettext.h"
! # endif /* end #ifdef _LIBC */
! #endif /* end #if 0 */
!
! #if HAVE_LIBINTL_H
! /* Should I include libintl.h here as in regex.c ? */
! # define _(msgid) gettext (msgid)
! #else /* not #if HAVE_LIBINTL_H */
! # define _(msgid) (msgid)
! #endif /* end #if HAVE_LIBINTL_H */
#if defined _LIBC && defined USE_IN_LIBIO
# include <wchar.h>
--- 41,58 ----
# include <unistd.h>
#endif /* GNU C library. */
+ #include <string.h>
+
#ifdef VMS
# include <unixlib.h>
#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>
***************
*** 103,123 ****
# 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,
--- 62,83 ----
# define attribute_hidden
#endif
! /* Unlike standard Unix `getopt', functions like `getopt_long'
! let the user intersperse the options with the other arguments.
! As `getopt_long' 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.
! Using `getopt' or setting the environment variable POSIXLY_CORRECT
! disables permutation.
! Then the application's 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"
+ #include "getopt_int.h"
/* For communication from `getopt' to the caller.
When `getopt' finds an option that takes an argument,
*************** char *optarg;
*** 142,162 ****
/* 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. */
--- 102,107 ----
*************** int opterr = 1;
*** 168,224 ****
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. */
--- 113,124 ----
int optopt = '?';
! /* Keep a global copy of all internal members of getopt_data. */
! static struct _getopt_data getopt_data;
! #ifndef __GNU_LIBRARY__
/* Avoid depending on library functions or files
whose names are inconsistent. */
*************** static char *posixly_correct;
*** 227,269 ****
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
--- 127,134 ----
*************** extern char **__libc_argv;
*** 277,290 ****
# 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]; \
--- 142,152 ----
# ifdef USE_NONOPTION_FLAGS
/* Defined in getopt_init.c */
extern char *__getopt_nonoption_flags;
# endif
# ifdef USE_NONOPTION_FLAGS
# define SWAP_FLAGS(ch1, ch2) \
! if (d->__nonoption_flags_len > 0) \
{ \
char __tmp = __getopt_nonoption_flags[ch1]; \
__getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \
*************** static int nonoption_flags_len;
*** 306,322 ****
`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.
--- 168,179 ----
`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, struct _getopt_data *d)
{
! int bottom = d->__first_nonopt;
! int middle = d->__last_nonopt;
! int top = d->optind;
char *tem;
/* Exchange the shorter segment with the far end of the longer segment.
*************** exchange (argv)
*** 328,346 ****
/* 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;
}
}
--- 185,203 ----
/* 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)
{
/* 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;
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;
__getopt_nonoption_flags = new_str;
}
}
*************** exchange (argv)
*** 386,461 ****
/* 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;
#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;
--- 243,313 ----
/* Update records for the slots the non-options now occupy. */
! d->__first_nonopt += (d->optind - d->__last_nonopt);
! d->__last_nonopt = d->optind;
}
/* Initialize the internal data when the first call is made. */
static const char *
! _getopt_initialize (int argc, char **argv, const char *optstring,
! int posixly_correct, struct _getopt_data *d)
{
/* 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;
! d->__nextchar = NULL;
! d->__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;
++optstring;
}
else if (optstring[0] == '+')
{
! d->__ordering = REQUIRE_ORDER;
++optstring;
}
! else if (d->__posixly_correct)
! d->__ordering = REQUIRE_ORDER;
else
! d->__ordering = PERMUTE;
#if defined _LIBC && defined USE_NONOPTION_FLAGS
! if (!d->__posixly_correct
&& argc == __libc_argc && argv == __libc_argv)
{
! if (d->__nonoption_flags_max_len == 0)
{
if (__getopt_nonoption_flags == NULL
|| __getopt_nonoption_flags[0] == '\0')
! d->__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;
__getopt_nonoption_flags =
! (char *) malloc (d->__nonoption_flags_max_len);
if (__getopt_nonoption_flags == NULL)
! d->__nonoption_flags_max_len = -1;
else
memset (__mempcpy (__getopt_nonoption_flags, orig_str, len),
! '\0', d->__nonoption_flags_max_len - len);
}
}
! d->__nonoption_flags_len = d->__nonoption_flags_max_len;
}
else
! d->__nonoption_flags_len = 0;
#endif
return optstring;
*************** _getopt_initialize (argc, argv, optstrin
*** 503,512 ****
`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.
--- 355,360 ----
*************** _getopt_initialize (argc, argv, optstrin
*** 515,546 ****
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;
{
! 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.
--- 363,394 ----
recent call.
If LONG_ONLY is nonzero, '-' as well as '--' can introduce
! long-named options.
!
! If POSIXLY_CORRECT is nonzero, behave as if the POSIXLY_CORRECT
! environment variable were set. */
int
! _getopt_internal_r (int argc, char **argv, const char *optstring,
! const struct option *longopts, int *longind,
! int long_only, int posixly_correct, struct _getopt_data *d)
{
! int print_errors = d->opterr;
if (optstring[0] == ':')
print_errors = 0;
if (argc < 1)
return -1;
! d->optarg = NULL;
! if (d->optind == 0 || !d->__initialized)
{
! if (d->optind == 0)
! d->optind = 1; /* Don't scan ARGV[0], the program name. */
! optstring = _getopt_initialize (argc, argv, optstring,
! posixly_correct, d);
! d->__initialized = 1;
}
/* Test whether ARGV[optind] points to a non-option argument.
*************** _getopt_internal (argc, argv, optstring,
*** 548,587 ****
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.
--- 396,436 ----
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'))
#else
! # define NONOPTION_P (argv[d->optind][0] != '-' || argv[d->optind][1] == '\0')
#endif
! if (d->__nextchar == NULL || *d->__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 (d->__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;
/* 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;
}
/* The special ARGV-element `--' means premature end of options.
*************** _getopt_internal (argc, argv, optstring,
*** 589,616 ****
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;
}
--- 438,466 ----
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], "--"))
{
! d->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;
! d->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)
{
/* 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;
return -1;
}
*************** _getopt_internal (argc, argv, optstring,
*** 619,635 ****
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. */
--- 469,485 ----
if (NONOPTION_P)
{
! if (d->__ordering == REQUIRE_ORDER)
return -1;
! d->optarg = argv[d->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] == '-'));
}
/* Decode the current option-ARGV-element. */
*************** _getopt_internal (argc, argv, optstring,
*** 648,655 ****
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;
--- 498,506 ----
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])))))
{
char *nameend;
const struct option *p;
*************** _getopt_internal (argc, argv, optstring,
*** 659,673 ****
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. */
--- 510,524 ----
int indfound = -1;
int option_index;
! for (nameend = d->__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 ((unsigned int) (nameend - d->__nextchar)
== (unsigned int) strlen (p->name))
{
/* Exact match found. */
*************** _getopt_internal (argc, argv, optstring,
*** 698,734 ****
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)
--- 549,592 ----
char *buf;
if (__asprintf (&buf, _("%s: option `%s' is ambiguous\n"),
! argv[0], argv[d->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]);
#endif
}
! d->__nextchar += strlen (d->__nextchar);
! d->optind++;
! d->optopt = 0;
return '?';
}
if (pfound != NULL)
{
option_index = indfound;
! d->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;
else
{
if (print_errors)
*************** _getopt_internal (argc, argv, optstring,
*** 738,744 ****
int n;
#endif
! if (argv[optind - 1][1] == '-')
{
/* --option */
#if defined _LIBC && defined USE_IN_LIBIO
--- 596,602 ----
int n;
#endif
! if (argv[d->optind - 1][1] == '-')
{
/* --option */
#if defined _LIBC && defined USE_IN_LIBIO
*************** _getopt_internal (argc, argv, optstring,
*** 757,794 ****
#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)
--- 615,662 ----
#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],
pfound->name);
#else
fprintf (stderr, _("\
%s: option `%c%s' doesn't allow an argument\n"),
! argv[0], argv[d->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);
! d->optopt = pfound->val;
return '?';
}
}
else if (pfound->has_arg == 1)
{
! if (d->optind < argc)
! d->optarg = argv[d->optind++];
else
{
if (print_errors)
*************** _getopt_internal (argc, argv, optstring,
*** 798,824 ****
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)
--- 666,701 ----
if (__asprintf (&buf, _("\
%s: option `%s' requires an argument\n"),
! argv[0], argv[d->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]);
#endif
}
! d->__nextchar += strlen (d->__nextchar);
! d->optopt = pfound->val;
return optstring[0] == ':' ? ':' : '?';
}
}
! d->__nextchar += strlen (d->__nextchar);
if (longind != NULL)
*longind = option_index;
if (pfound->flag)
*************** _getopt_internal (argc, argv, optstring,
*** 833,840 ****
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 (print_errors)
{
--- 710,717 ----
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 (print_errors)
{
*************** _getopt_internal (argc, argv, optstring,
*** 843,857 ****
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
--- 720,734 ----
int n;
#endif
! if (argv[d->optind][1] == '-')
{
/* --option */
#if defined _LIBC && defined USE_IN_LIBIO
n = __asprintf (&buf, _("%s: unrecognized option `--%s'\n"),
! argv[0], d->__nextchar);
#else
fprintf (stderr, _("%s: unrecognized option `--%s'\n"),
! argv[0], d->__nextchar);
#endif
}
else
*************** _getopt_internal (argc, argv, optstring,
*** 859,886 ****
/* +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 '?';
}
}
--- 736,771 ----
/* +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);
#else
fprintf (stderr, _("%s: unrecognized option `%c%s'\n"),
! argv[0], argv[d->optind][0], d->__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;
return '?';
}
}
*************** _getopt_internal (argc, argv, optstring,
*** 888,899 ****
/* 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 == ':')
{
--- 773,784 ----
/* Look at and handle the next short option-character. */
{
! char c = *d->__nextchar++;
! char *temp = strchr (optstring, c);
/* Increment `optind' when we start to process its last character. */
! if (*d->__nextchar == '\0')
! ++d->optind;
if (temp == NULL || c == ':')
{
*************** _getopt_internal (argc, argv, optstring,
*** 904,910 ****
int n;
#endif
! if (posixly_correct)
{
/* 1003.2 specifies the format of this message. */
#if defined _LIBC && defined USE_IN_LIBIO
--- 789,795 ----
int n;
#endif
! if (d->__posixly_correct)
{
/* 1003.2 specifies the format of this message. */
#if defined _LIBC && defined USE_IN_LIBIO
*************** _getopt_internal (argc, argv, optstring,
*** 927,942 ****
#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 */
--- 812,835 ----
#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;
return '?';
}
/* Convenience. Treat POSIX -W foo same as long option --foo */
*************** _getopt_internal (argc, argv, optstring,
*** 951,964 ****
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)
{
--- 844,857 ----
int option_index;
/* This is an option that requires an argument. */
! if (*d->__nextchar != '\0')
{
! d->optarg = d->__nextchar;
/* If we end this ARGV-element by taking the rest as an arg,
we must advance to the next element now. */
! d->optind++;
}
! else if (d->optind == argc)
{
if (print_errors)
{
*************** _getopt_internal (argc, argv, optstring,
*** 970,980 ****
--- 863,881 ----
_("%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
*************** _getopt_internal (argc, argv, optstring,
*** 982,988 ****
argv[0], c);
#endif
}
! optopt = c;
if (optstring[0] == ':')
c = ':';
else
--- 883,889 ----
argv[0], c);
#endif
}
! d->optopt = c;
if (optstring[0] == ':')
c = ':';
else
*************** _getopt_internal (argc, argv, optstring,
*** 990,1011 ****
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;
--- 891,913 ----
return c;
}
else
! /* We already incremented `d->optind' once;
increment it again when taking next ARGV-elt as argument. */
! d->optarg = argv[d->optind++];
/* optarg is now the argument, see if it's in the
table of longopts. */
! for (d->__nextchar = nameend = d->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 ((unsigned int) (nameend - d->__nextchar) == strlen (p->name))
{
/* Exact match found. */
pfound = p;
*************** _getopt_internal (argc, argv, optstring,
*** 1031,1052 ****
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)
--- 933,962 ----
char *buf;
if (__asprintf (&buf, _("%s: option `-W %s' is ambiguous\n"),
! argv[0], argv[d->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]);
#endif
}
! d->__nextchar += strlen (d->__nextchar);
! d->optind++;
return '?';
}
if (pfound != NULL)
*************** _getopt_internal (argc, argv, optstring,
*** 1057,1063 ****
/* 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)
--- 967,973 ----
/* 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;
else
{
if (print_errors)
*************** _getopt_internal (argc, argv, optstring,
*** 1069,1079 ****
--- 979,998 ----
%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
*************** _getopt_internal (argc, argv, optstring,
*** 1083,1096 ****
#endif
}
! nextchar += strlen (nextchar);
return '?';
}
}
else if (pfound->has_arg == 1)
{
! if (optind < argc)
! optarg = argv[optind++];
else
{
if (print_errors)
--- 1002,1015 ----
#endif
}
! d->__nextchar += strlen (d->__nextchar);
return '?';
}
}
else if (pfound->has_arg == 1)
{
! if (d->optind < argc)
! d->optarg = argv[d->optind++];
else
{
if (print_errors)
*************** _getopt_internal (argc, argv, optstring,
*** 1100,1125 ****
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)
--- 1019,1053 ----
if (__asprintf (&buf, _("\
%s: option `%s' requires an argument\n"),
! argv[0], argv[d->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]);
#endif
}
! d->__nextchar += strlen (d->__nextchar);
return optstring[0] == ':' ? ':' : '?';
}
}
! d->__nextchar += strlen (d->__nextchar);
if (longind != NULL)
*longind = option_index;
if (pfound->flag)
*************** _getopt_internal (argc, argv, optstring,
*** 1129,1135 ****
}
return pfound->val;
}
! nextchar = NULL;
return 'W'; /* Let the application handle it. */
}
if (temp[1] == ':')
--- 1057,1063 ----
}
return pfound->val;
}
! d->__nextchar = NULL;
return 'W'; /* Let the application handle it. */
}
if (temp[1] == ':')
*************** _getopt_internal (argc, argv, optstring,
*** 1137,1162 ****
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)
{
--- 1065,1090 ----
if (temp[2] == ':')
{
/* This is an option that accepts an argument optionally. */
! if (*d->__nextchar != '\0')
{
! d->optarg = d->__nextchar;
! d->optind++;
}
else
! d->optarg = NULL;
! d->__nextchar = NULL;
}
else
{
/* This is an option that requires an argument. */
! if (*d->__nextchar != '\0')
{
! d->optarg = d->__nextchar;
/* If we end this ARGV-element by taking the rest as an arg,
we must advance to the next element now. */
! d->optind++;
}
! else if (d->optind == argc)
{
if (print_errors)
{
*************** _getopt_internal (argc, argv, optstring,
*** 1168,1178 ****
--- 1096,1114 ----
%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
*************** _getopt_internal (argc, argv, optstring,
*** 1181,1187 ****
argv[0], c);
#endif
}
! optopt = c;
if (optstring[0] == ':')
c = ':';
else
--- 1117,1123 ----
argv[0], c);
#endif
}
! d->optopt = c;
if (optstring[0] == ':')
c = ':';
else
*************** _getopt_internal (argc, argv, optstring,
*** 1190,1197 ****
else
/* We already incremented `optind' once;
increment it again when taking next ARGV-elt as argument. */
! optarg = argv[optind++];
! nextchar = NULL;
}
}
return c;
--- 1126,1133 ----
else
/* We already incremented `optind' once;
increment it again when taking next ARGV-elt as argument. */
! d->optarg = argv[d->optind++];
! d->__nextchar = NULL;
}
}
return c;
*************** _getopt_internal (argc, argv, optstring,
*** 1199,1216 ****
}
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
--- 1135,1174 ----
}
int
! _getopt_internal (int argc, char **argv, const char *optstring,
! const struct option *longopts, int *longind,
! int long_only, int posixly_correct)
! {
! int result;
!
! getopt_data.optind = optind;
! getopt_data.opterr = opterr;
!
! result = _getopt_internal_r (argc, argv, optstring, longopts, longind,
! long_only, posixly_correct, &getopt_data);
!
! optind = getopt_data.optind;
! optarg = getopt_data.optarg;
! optopt = getopt_data.optopt;
!
! return result;
! }
!
! /* glibc gets a LSB-compliant getopt.
! Standalone applications get a POSIX-compliant getopt. */
! #if _LIBC
! enum { POSIXLY_CORRECT = 0 };
! #else
! enum { POSIXLY_CORRECT = 1 };
! #endif
!
! int
! getopt (int argc, char *const *argv, const char *optstring)
{
! return _getopt_internal (argc, (char **) argv, optstring, NULL, NULL, 0,
! POSIXLY_CORRECT);
}
#ifdef TEST
*************** getopt (argc, argv, optstring)
*** 1218,1226 ****
the above definition of `getopt'. */
int
! main (argc, argv)
! int argc;
! char **argv;
{
int c;
int digit_optind = 0;
--- 1176,1182 ----
the above definition of `getopt'. */
int
! main (int argc, char **argv)
{
int c;
int digit_optind = 0;
*************** main (argc, argv)
*** 1283,1288 ****
}
#endif /* TEST */
-
- /* arch-tag: 0e6da124-7269-4785-a9de-094c263d20dc
- (do not change this comment) */
--- 1239,1241 ----
Index: lib-src/getopt1.c
===================================================================
RCS file: /cvsroot/emacs/emacs/lib-src/getopt1.c,v
retrieving revision 1.9
diff -p -c -r1.9 getopt1.c
*** lib-src/getopt1.c 4 Jul 2005 15:24:11 -0000 1.9
--- lib-src/getopt1.c 26 Jul 2005 21:36:27 -0000
***************
*** 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
Free Software Foundation, Inc.
This file is part of the GNU C Library.
--- 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
Free Software Foundation, Inc.
This file is part of the GNU C Library.
***************
*** 26,61 ****
#else
# include "getopt.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__
--- 26,35 ----
#else
# include "getopt.h"
#endif
! #include "getopt_int.h"
#include <stdio.h>
/* This needs to come after some library #include
to get __GNU_LIBRARY__ defined. */
#ifdef __GNU_LIBRARY__
***************
*** 67,80 ****
#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.
--- 41,60 ----
#endif
int
! getopt_long (int argc, char *__getopt_argv_const *argv, const char *options,
! const struct option *long_options, int *opt_index)
{
! return _getopt_internal (argc, (char **) argv, options, long_options,
! opt_index, 0, 0);
! }
!
! int
! _getopt_long_r (int argc, char **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, 0, d);
}
/* Like getopt_long, but '-' as well as '--' can indicate a long option.
*************** getopt_long (argc, argv, options, long_o
*** 83,113 ****
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);
}
! # 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 (argc, argv)
! int argc;
! char **argv;
{
int c;
int digit_optind = 0;
--- 63,92 ----
instead. */
int
! getopt_long_only (int argc, char *__getopt_argv_const *argv,
! const char *options,
! const struct option *long_options, int *opt_index)
{
! return _getopt_internal (argc, (char **) argv, options, long_options,
! opt_index, 1, 0);
}
! int
! _getopt_long_only_r (int argc, char **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, 0, d);
! }
#ifdef TEST
#include <stdio.h>
int
! main (int argc, char **argv)
{
int c;
int digit_optind = 0;
*************** main (argc, argv)
*** 193,198 ****
}
#endif /* TEST */
-
- /* arch-tag: 28a5c558-b0c0-4bff-b5bc-e2e20291d4b6
- (do not change this comment) */
--- 172,174 ----
Index: src/config.in
===================================================================
RCS file: /cvsroot/emacs/emacs/src/config.in,v
retrieving revision 1.210
diff -p -c -r1.210 config.in
*** src/config.in 4 Jul 2005 16:06:30 -0000 1.210
--- src/config.in 26 Jul 2005 21:36:28 -0000
*************** Boston, MA 02110-1301, USA. */
*** 191,196 ****
--- 191,202 ----
/* Define to 1 if you have the `getloadavg' function. */
#undef HAVE_GETLOADAVG
+ /* Define to 1 if you have the <getopt.h> header file. */
+ #undef HAVE_GETOPT_H
+
+ /* Define to 1 if you have the `getopt_long_only' function. */
+ #undef HAVE_GETOPT_LONG_ONLY
+
/* Define to 1 if you have the `getpagesize' function. */
#undef HAVE_GETPAGESIZE
*************** Boston, MA 02110-1301, USA. */
*** 785,793 ****
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
automatically deduced at run-time.
! STACK_DIRECTION > 0 => grows toward higher addresses
! STACK_DIRECTION < 0 => grows toward lower addresses
! STACK_DIRECTION = 0 => direction of growth unknown */
#undef STACK_DIRECTION
/* Define to 1 if you have the ANSI C header files. */
--- 791,799 ----
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
automatically deduced at run-time.
! STACK_DIRECTION > 0 => grows toward higher addresses
! STACK_DIRECTION < 0 => grows toward lower addresses
! STACK_DIRECTION = 0 => direction of growth unknown */
#undef STACK_DIRECTION
/* Define to 1 if you have the ANSI C header files. */
*************** Boston, MA 02110-1301, USA. */
*** 845,850 ****
--- 851,860 ----
/* Define for large files, on AIX-style hosts. */
#undef _LARGE_FILES
+
+ /* Define to rpl_ if the getopt replacement functions and variables should be
+ used. */
+ #undef __GETOPT_PREFIX
/* Define like PROTOTYPES; this can be used by system headers. */
#undef __PROTOTYPES
Index: src/s/cygwin.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/s/cygwin.h,v
retrieving revision 1.5
diff -p -c -r1.5 cygwin.h
*** src/s/cygwin.h 4 Jul 2005 15:42:51 -0000 1.5
--- src/s/cygwin.h 26 Jul 2005 21:36:28 -0000
***************
*** 1,7 ****
/* Template for system description header files.
This file describes the parameters that system description files
should define or not.
! Copyright (C) 1985, 1986, 1992, 1999 Free Software Foundation, Inc.
This file is part of GNU Emacs.
--- 1,7 ----
/* Template for system description header files.
This file describes the parameters that system description files
should define or not.
! Copyright (C) 1985, 1986, 1992, 1999, 2005 Free Software Foundation, Inc.
This file is part of GNU Emacs.
*************** Boston, MA 02110-1301, USA. */
*** 123,130 ****
emacs lisp pointers */
#define DATA_SEG_BITS 0x20000000
#define LINKER $(CC) -Wl,--image-base,DATA_SEG_BITS
- /* gettext.h is in a strange place */
- #define C_SWITCH_SYSTEM -I/usr/share/gettext
/* Use terminfo instead of termcap. Fewer environment variables to
go wrong, more terminal types. */
--- 123,128 ----
*** /dev/null Mon Jun 27 15:40:05 2005
--- lib-src/getopt_.h Wed Jun 29 11:33:16 2005
***************
*** 0 ****
--- 1,227 ----
+ /* Declarations for getopt.
+ Copyright (C) 1989-1994,1996-1999,2001,2003,2004
+ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+ #ifndef _GETOPT_H
+
+ #ifndef __need_getopt
+ # define _GETOPT_H 1
+ #endif
+
+ /* Standalone applications should #define __GETOPT_PREFIX to an
+ identifier that prefixes the external functions and variables
+ defined in this header. When this happens, include the
+ headers that might declare getopt so that they will not cause
+ confusion if included after this file. Then systematically rename
+ identifiers so that they do not collide with the system functions
+ and variables. Renaming avoids problems with some compilers and
+ linkers. */
+ #if defined __GETOPT_PREFIX && !defined __need_getopt
+ # include <stdlib.h>
+ # include <stdio.h>
+ # if HAVE_UNISTD_H
+ # include <unistd.h>
+ # endif
+ # undef __need_getopt
+ # undef getopt
+ # undef getopt_long
+ # undef getopt_long_only
+ # undef optarg
+ # undef opterr
+ # undef optind
+ # undef optopt
+ # define __GETOPT_CONCAT(x, y) x ## y
+ # define __GETOPT_XCONCAT(x, y) __GETOPT_CONCAT (x, y)
+ # define __GETOPT_ID(y) __GETOPT_XCONCAT (__GETOPT_PREFIX, y)
+ # define getopt __GETOPT_ID (getopt)
+ # define getopt_long __GETOPT_ID (getopt_long)
+ # define getopt_long_only __GETOPT_ID (getopt_long_only)
+ # define optarg __GETOPT_ID (optarg)
+ # define opterr __GETOPT_ID (opterr)
+ # define optind __GETOPT_ID (optind)
+ # define optopt __GETOPT_ID (optopt)
+ #endif
+
+ /* Standalone applications get correct prototypes for getopt_long and
+ getopt_long_only; they declare "char **argv". libc uses prototypes
+ with "char *const *argv" that are incorrect because getopt_long and
+ getopt_long_only can permute argv; this is required for backward
+ compatibility (e.g., for LSB 2.0.1).
+
+ This used to be `#if defined __GETOPT_PREFIX && !defined __need_getopt',
+ but it caused redefinition warnings if both unistd.h and getopt.h were
+ included, since unistd.h includes getopt.h having previously defined
+ __need_getopt.
+
+ The only place where __getopt_argv_const is used is in definitions
+ of getopt_long and getopt_long_only below, but these are visible
+ only if __need_getopt is not defined, so it is quite safe to rewrite
+ the conditional as follows:
+ */
+ #if !defined __need_getopt
+ # if defined __GETOPT_PREFIX
+ # define __getopt_argv_const /* empty */
+ # else
+ # define __getopt_argv_const const
+ # endif
+ #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
+
+ #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
+
+ /* 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'. */
+
+ extern int getopt (int ___argc, char *const *___argv, const char *__shortopts)
+ __THROW;
+
+ #ifndef __need_getopt
+ extern int getopt_long (int ___argc, char *__getopt_argv_const *___argv,
+ const char *__shortopts,
+ const struct option *__longopts, int *__longind)
+ __THROW;
+ extern int getopt_long_only (int ___argc, char *__getopt_argv_const *___argv,
+ const char *__shortopts,
+ const struct option *__longopts, int *__longind)
+ __THROW;
+
+ #endif
+
+ #ifdef __cplusplus
+ }
+ #endif
+
+ /* Make sure we later can get all the definitions and declarations. */
+ #undef __need_getopt
+
+ #endif /* getopt.h */
*** /dev/null Mon Jun 27 15:40:05 2005
--- lib-src/getopt_int.h Wed Jun 29 11:35:49 2005
***************
*** 0 ****
--- 1,131 ----
+ /* Internal declarations for getopt.
+ Copyright (C) 1989-1994,1996-1999,2001,2003,2004
+ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+ #ifndef _GETOPT_INT_H
+ #define _GETOPT_INT_H 1
+
+ extern int _getopt_internal (int ___argc, char **___argv,
+ const char *__shortopts,
+ const struct option *__longopts, int *__longind,
+ int __long_only, int __posixly_correct);
+
+
+ /* Reentrant versions which can handle parsing multiple argument
+ vectors at the same time. */
+
+ /* Data type for reentrant functions. */
+ struct _getopt_data
+ {
+ /* These have exactly the same meaning as the corresponding global
+ variables, except that they are used for the reentrant
+ versions of getopt. */
+ int optind;
+ int opterr;
+ int optopt;
+ char *optarg;
+
+ /* Internal members. */
+
+ /* True if the internal members have been initialized. */
+ int __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. */
+ char *__nextchar;
+
+ /* 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, or by calling getopt.
+
+ 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. */
+
+ enum
+ {
+ REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
+ } __ordering;
+
+ /* If the POSIXLY_CORRECT environment variable is set
+ or getopt was called. */
+ int __posixly_correct;
+
+
+ /* 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. */
+
+ int __first_nonopt;
+ int __last_nonopt;
+
+ #if defined _LIBC && defined USE_NONOPTION_FLAGS
+ int __nonoption_flags_max_len;
+ int __nonoption_flags_len;
+ # endif
+ };
+
+ /* The initializer is necessary to set OPTIND and OPTERR to their
+ default values and to clear the initialization flag. */
+ #define _GETOPT_DATA_INITIALIZER { 1, 1 }
+
+ extern int _getopt_internal_r (int ___argc, char **___argv,
+ const char *__shortopts,
+ const struct option *__longopts, int *__longind,
+ int __long_only, int __posixly_correct,
+ struct _getopt_data *__data);
+
+ extern int _getopt_long_r (int ___argc, char **___argv,
+ const char *__shortopts,
+ const struct option *__longopts, int *__longind,
+ struct _getopt_data *__data);
+
+ extern int _getopt_long_only_r (int ___argc, char **___argv,
+ const char *__shortopts,
+ const struct option *__longopts,
+ int *__longind,
+ struct _getopt_data *__data);
+
+ #endif /* getopt_int.h */
*** /dev/null Mon Jun 27 15:40:05 2005
--- lib-src/gettext.h Wed Jun 29 13:21:03 2005
***************
*** 0 ****
--- 1,78 ----
+ /* Convenience header for conditional use of GNU <libintl.h>.
+ Copyright (C) 1995-1998, 2000-2002, 2004 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+ #ifndef _LIBGETTEXT_H
+ #define _LIBGETTEXT_H 1
+
+ /* NLS can be disabled through the configure --disable-nls option. */
+ #if ENABLE_NLS
+
+ /* Get declarations of GNU message catalog functions. */
+ # include <libintl.h>
+
+ #else
+
+ /* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which
+ chokes if dcgettext is defined as a macro. So include it now, to make
+ later inclusions of <locale.h> a NOP. We don't include <libintl.h>
+ as well because people using "gettext.h" will not include <libintl.h>,
+ and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
+ is OK. */
+ #if defined(__sun)
+ # include <locale.h>
+ #endif
+
+ /* Many header files from the libstdc++ coming with g++ 3.3 or newer include
+ <libintl.h>, which chokes if dcgettext is defined as a macro. So include
+ it now, to make later inclusions of <libintl.h> a NOP. */
+ #if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3)
+ # include <cstdlib>
+ # if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H
+ # include <libintl.h>
+ # endif
+ #endif
+
+ /* Disabled NLS.
+ The casts to 'const char *' serve the purpose of producing warnings
+ for invalid uses of the value returned from these functions.
+ On pre-ANSI systems without 'const', the config.h file is supposed to
+ contain "#define const". */
+ # define gettext(Msgid) ((const char *) (Msgid))
+ # define dgettext(Domainname, Msgid) ((const char *) (Msgid))
+ # define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid))
+ # define ngettext(Msgid1, Msgid2, N) \
+ ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+ # define dngettext(Domainname, Msgid1, Msgid2, N) \
+ ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+ # define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
+ ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+ # define textdomain(Domainname) ((const char *) (Domainname))
+ # define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
+ # define bind_textdomain_codeset(Domainname, Codeset) ((const char *)
(Codeset))
+
+ #endif
+
+ /* A pseudo function call that serves as a marker for the automated
+ extraction of messages, but does not call gettext(). The run-time
+ translation is done at a different place in the code.
+ The argument, String, should be a literal string. Concatenated strings
+ and other string expressions won't work.
+ The macro's expansion is not parenthesized, so that it is suitable as
+ initializer for static 'char[]' or 'const char[]' variables. */
+ #define gettext_noop(String) String
+
+ #endif /* _LIBGETTEXT_H */
*** /dev/null Mon Jun 27 15:40:05 2005
--- m4/getopt.m4 Mon Jul 18 15:35:46 2005
***************
*** 0 ****
--- 1,78 ----
+ # getopt.m4 serial 10
+ dnl Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+
+ # The getopt module assume you want GNU getopt, with getopt_long etc,
+ # rather than vanilla POSIX getopt. This means your your code should
+ # always include <getopt.h> for the getopt prototypes.
+
+ AC_DEFUN([gl_GETOPT_SUBSTITUTE],
+ [
+ AC_LIBOBJ([getopt])
+ AC_LIBOBJ([getopt1])
+ gl_GETOPT_SUBSTITUTE_HEADER
+ gl_PREREQ_GETOPT
+ ])
+
+ AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER],
+ [
+ GETOPT_H=getopt.h
+ AC_DEFINE([__GETOPT_PREFIX], [[rpl_]],
+ [Define to rpl_ if the getopt replacement functions and variables
+ should be used.])
+ AC_SUBST([GETOPT_H])
+ ])
+
+ AC_DEFUN([gl_GETOPT_CHECK_HEADERS],
+ [
+ GETOPT_H=
+ AC_CHECK_HEADERS([getopt.h], [], [GETOPT_H=getopt.h])
+ if test -z "$GETOPT_H"; then
+ AC_CHECK_FUNCS([getopt_long_only], [], [GETOPT_H=getopt.h])
+ fi
+
+ dnl BSD getopt_long uses an incompatible method to reset option processing,
+ dnl and (as of 2004-10-15) mishandles optional option-arguments.
+ if test -z "$GETOPT_H"; then
+ AC_CHECK_DECL([optreset], [GETOPT_H=getopt.h], [], [#include <getopt.h>])
+ fi
+
+ dnl Solaris 10 getopt doesn't handle `+' as a leading character in an
+ dnl option string (as of 2005-05-05).
+ if test -z "$GETOPT_H"; then
+ AC_CACHE_CHECK([for working GNU getopt function], [gl_cv_func_gnu_getopt],
+ [AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM([#include <getopt.h>],
+ [[
+ char *myargv[3];
+ myargv[0] = "conftest";
+ myargv[1] = "-+";
+ myargv[2] = 0;
+ return getopt (2, myargv, "+a") != '?';
+ ]])],
+ [gl_cv_func_gnu_getopt=yes],
+ [gl_cv_func_gnu_getopt=no],
+ [dnl cross compiling - pessimistically guess based on decls
+ dnl Solaris 10 getopt doesn't handle `+' as a leading character in an
+ dnl option string (as of 2005-05-05).
+ AC_CHECK_DECL([getopt_clip],
+ [gl_cv_func_gnu_getopt=no], [gl_cv_func_gnu_getopt=yes],
+ [#include <getopt.h>])])])
+ if test "$gl_cv_func_gnu_getopt" = "no"; then
+ GETOPT_H=getopt.h
+ fi
+ fi
+ ])
+
+ AC_DEFUN([gl_GETOPT_IFELSE],
+ [
+ AC_REQUIRE([gl_GETOPT_CHECK_HEADERS])
+ AS_IF([test -n "$GETOPT_H"], [$1], [$2])
+ ])
+
+ AC_DEFUN([gl_GETOPT], [gl_GETOPT_IFELSE([gl_GETOPT_SUBSTITUTE])])
+
+ # Prerequisites of lib/getopt*.
+ AC_DEFUN([gl_PREREQ_GETOPT], [:])
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- merged gnulib getopt into Emacs,
Paul Eggert <=