update from FSF

This commit is contained in:
David MacKenzie 1993-08-07 00:06:35 +00:00
parent 31f55aa540
commit 3c14065d00
2 changed files with 30 additions and 20 deletions

View File

@ -1,3 +1,11 @@
Fri Aug 6 17:05:47 1993 David J. Mackenzie (djm@thepub.cygnus.com)
* getopt.h: Update to latest FSF version.
Mon Aug 2 16:37:14 1993 Stu Grossman (grossman at cygnus.com)
* coff/i386.h: Add Lynx magic number.
Mon Aug 2 14:45:29 1993 John Gilmore (gnu@cygnus.com) Mon Aug 2 14:45:29 1993 John Gilmore (gnu@cygnus.com)
* dis-asm.h: Move enum outside of struct defn to avoid warnings. * dis-asm.h: Move enum outside of struct defn to avoid warnings.

View File

@ -1,19 +1,19 @@
/* Declarations for getopt. /* Declarations for getopt.
Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc. Copyright (C) 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published under the terms of the GNU General Public License as published by the
by the Free Software Foundation; either version 2, or (at your option) Free Software Foundation; either version 2, or (at your option) any
any later version. later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU Library General Public You should have received a copy of the GNU General Public License
License along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#ifndef _GETOPT_H #ifndef _GETOPT_H
#define _GETOPT_H 1 #define _GETOPT_H 1
@ -49,6 +49,10 @@ extern int optind;
extern int opterr; extern int opterr;
/* Set to an option character which was unrecognized. */
extern int optopt;
/* Describe the long-named options requested by the application. /* Describe the long-named options requested by the application.
The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector 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 of `struct option' terminated by an element containing a name which is
@ -84,23 +88,21 @@ struct option
int val; int val;
}; };
/* Names for the values of the `has_arg' field of `struct option'. /* Names for the values of the `has_arg' field of `struct option'. */
We wouldn't mind doing this:
enum _argtype
{
no_argument,
required_argument,
optional_argument
};
...if we could also change the "int has_arg" above. For now, use
defines. */
#define no_argument 0 #define no_argument 0
#define required_argument 1 #define required_argument 1
#define optional_argument 2 #define optional_argument 2
#if __STDC__ #if __STDC__
#if defined(__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); extern int getopt (int argc, char *const *argv, const char *shortopts);
#else /* not __GNU_LIBRARY__ */
extern int getopt ();
#endif /* not __GNU_LIBRARY__ */
extern int getopt_long (int argc, char *const *argv, const char *shortopts, extern int getopt_long (int argc, char *const *argv, const char *shortopts,
const struct option *longopts, int *longind); const struct option *longopts, int *longind);
extern int getopt_long_only (int argc, char *const *argv, extern int getopt_long_only (int argc, char *const *argv,