This commit was manufactured by cvs2svn to create tag 'FreeBSD-release/1.0'.

[unix-history] / gnu / usr.bin / gzip / getopt.h

diff --git a/gnu/usr.bin/gzip/getopt.h b/gnu/usr.bin/gzip/getopt.h
index 764f2f4..0abce6e 100644 (file)
--- a/gnu/usr.bin/gzip/getopt.h
+++ b/gnu/usr.bin/gzip/getopt.h
@@ -1,16 +1,16 @@
 /* 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
    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 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.
    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, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */


@@ -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.
    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
 /* 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


@@ -86,12 +90,9 @@ struct option
 
 /* Names for the values of the `has_arg' field of `struct option'.  */
 
 
 /* Names for the values of the `has_arg' field of `struct option'.  */
 

-enum _argtype
-{
-  no_argument,
-  required_argument,
-  optional_argument
-};
+#define        no_argument             0
+#define required_argument      1
+#define optional_argument      2

 
 #if __STDC__ || defined(PROTO)
 #if defined(__GNU_LIBRARY__)
 
 #if __STDC__ || defined(PROTO)
 #if defined(__GNU_LIBRARY__)


@@ -99,8 +100,6 @@ enum _argtype
    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);
    differences in the consts, in stdlib.h.  To avoid compilation
    errors, only prototype getopt for the GNU C library.  */
 extern int getopt (int argc, char *const *argv, const char *shortopts);

-#else /* not __GNU_LIBRARY__ */
-extern int getopt ();

 #endif /* not __GNU_LIBRARY__ */
 extern int getopt_long (int argc, char *const *argv, const char *shortopts,
                        const struct option *longopts, int *longind);
 #endif /* not __GNU_LIBRARY__ */
 extern int getopt_long (int argc, char *const *argv, const char *shortopts,
                        const struct option *longopts, int *longind);