texinfo update (Tue Sep 14 08:44:01 EDT 2004)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.389
retrieving revision 1.390
diff -c -r1.389 -r1.390
*** ChangeLog   9 Sep 2004 17:50:27 -0000       1.389
--- ChangeLog   14 Sep 2004 12:35:59 -0000      1.390
***************
*** 1,3 ****
--- 1,9 ----
+ 2004-09-14  Karl Berry  <address@hidden>
+ 
+       * util/srclist.txt (getopt.h): renamed to getopt_.h.
+       * lib/getopt_.h: new file.
+       * lib/getopt.h: just include getopt.h.
+ 
  2004-09-09  Karl Berry  <address@hidden>
  
        * doc/texinfo.txi (Image Syntax): mention @noindent, @center.
Index: lib/getopt.h
===================================================================
RCS file: /cvsroot/texinfo/texinfo/lib/getopt.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** lib/getopt.h        11 Apr 2004 17:56:46 -0000      1.5
--- lib/getopt.h        14 Sep 2004 12:36:00 -0000      1.6
***************
*** 1,176 ****
! /* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
! 
! #ifndef _GETOPT_H
! 
! #ifndef __need_getopt
! # define _GETOPT_H 1
! #endif
! 
! /* If __GNU_LIBRARY__ is not already defined, either we are being used
!    standalone, or this is the first header included in the source file.
!    If we are being used with glibc, we need to include <features.h>, but
!    that does not exist if we are standalone.  So: if __GNU_LIBRARY__ is
!    not defined, include <ctype.h>, which will pull in <features.h> for us
!    if it's from glibc.  (Why ctype.h?  It's guaranteed to exist and it
!    doesn't flood the namespace with stuff the way some other headers do.)  */
! #if !defined __GNU_LIBRARY__
! # include <ctype.h>
! #endif
! 
! #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'.  */
! 
! #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 ();
! #endif /* __GNU_LIBRARY__ */
! 
! #ifndef __need_getopt
! extern int getopt_long (int ___argc, char *const *___argv,
!                       const char *__shortopts,
!                       const struct option *__longopts, int *__longind)
!        __THROW;
! extern int getopt_long_only (int ___argc, char *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 */
--- 1,10 ----
! /* getopt.h -- wrapper for gnulib getopt_.h.
!    $Id: getopt.h,v 1.6 2004/09/14 12:36:00 karl Exp $
!    Copyright (C) 2004 Free Software Foundation, Inc.
! 
!    Copying and distribution of this file, with or without modification,
!    are permitted in any medium without royalty provided the copyright
!    notice and this notice are preserved.
! */
  
! #include "getopt_.h"
Index: lib/strdup.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/lib/strdup.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** lib/strdup.c        11 Apr 2004 17:56:46 -0000      1.7
--- lib/strdup.c        14 Sep 2004 12:36:50 -0000      1.8
***************
*** 23,29 ****
  
  #ifndef _LIBC
  /* Get specification.  */
! #include "strdup.h"
  #endif
  
  #include <stdlib.h>
--- 23,29 ----
  
  #ifndef _LIBC
  /* Get specification.  */
! # include "strdup.h"
  #endif
  
  #include <stdlib.h>
Index: util/srclist.txt
===================================================================
RCS file: /cvsroot/texinfo/texinfo/util/srclist.txt,v
retrieving revision 1.16
retrieving revision 1.17
diff -c -r1.16 -r1.17
*** util/srclist.txt    19 Apr 2004 13:48:19 -0000      1.16
--- util/srclist.txt    14 Sep 2004 12:36:00 -0000      1.17
***************
*** 1,4 ****
! # $Id: srclist.txt,v 1.16 2004/04/19 13:48:19 karl Exp $
  # Files which we keep in sync from other places.
  # This is input for the script config/srclist-update in the gnulib
  # project on savannah.
--- 1,4 ----
! # $Id: srclist.txt,v 1.17 2004/09/14 12:36:00 karl Exp $
  # Files which we keep in sync from other places.
  # This is input for the script config/srclist-update in the gnulib
  # project on savannah.
***************
*** 79,85 ****
  #
  $GNULIBSRC/lib/alloca.c               lib
  $GNULIBSRC/lib/getopt.c               lib
! $GNULIBSRC/lib/getopt.h               lib
  $GNULIBSRC/lib/getopt1.c      lib
  $GNULIBSRC/lib/gettext.h      lib
  $GNULIBSRC/lib/memcpy.c               lib
--- 79,85 ----
  #
  $GNULIBSRC/lib/alloca.c               lib
  $GNULIBSRC/lib/getopt.c               lib
! $GNULIBSRC/lib/getopt_.h      lib
  $GNULIBSRC/lib/getopt1.c      lib
  $GNULIBSRC/lib/gettext.h      lib
  $GNULIBSRC/lib/memcpy.c               lib
P ChangeLog
U lib/getopt.h
U lib/getopt_.h
P lib/strdup.c
P util/srclist.txt