mirror of https://github.com/moparisthebest/wget
Remove original getopt.[ch] in favor of gnulib's.
This commit is contained in:
Micah Cowan
parent
981d279da3
commit
3f45148eba
|
|
@ -1,7 +1,8 @@
|
|||
2007-10-13 Micah Cowan <micah@cowan.name>
|
||||
|
||||
* GNUMakefile, maint.mk: Added as part of the gnulib-ization.
|
||||
* Makefile.am, configure.ac: gnulib-ized.
|
||||
* Makefile.am: gnulib-ized.
|
||||
* configure.ac: gnulib-ized. Removed built-in getopt checks.
|
||||
|
||||
2007-10-12 Micah Cowan <micah@cowan.name>
|
||||
|
||||
|
|
|
|||
|
|
@ -220,13 +220,6 @@ WGET_NANOSLEEP
|
|||
WGET_POSIX_CLOCK
|
||||
WGET_NSL_SOCKET
|
||||
|
||||
dnl
|
||||
dnl Check if we need to compile in getopt.c.
|
||||
dnl
|
||||
AC_CHECK_FUNC(getopt_long, [], [
|
||||
AC_LIBOBJ([getopt])
|
||||
])
|
||||
|
||||
dnl
|
||||
dnl Checks for libraries.
|
||||
dnl
|
||||
|
|
|
|||
|
|
@ -2,7 +2,8 @@
|
|||
|
||||
* Makefile.am: Make version.c depend on Wget dependencies (source
|
||||
files, plus such things as LIBOBJS so we get things like
|
||||
http-ntlm.c or gen-md5.c).
|
||||
http-ntlm.c). Removed getopt.[ch], as we're now using gnulib for
|
||||
these.
|
||||
|
||||
2007-10-10 Micah Cowan <micah@cowan.name>
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ wget_SOURCES = cmpt.c connect.c convert.c cookies.c ftp.c ftp-basic.c \
|
|||
res.c retr.c safe-ctype.c snprintf.c spider.c url.c \
|
||||
utils.c version.c xmalloc.c \
|
||||
config-post.h connect.h convert.h cookies.h \
|
||||
ftp.h gen-md5.h getopt.h gnu-md5.h hash.h host.h html-parse.h \
|
||||
ftp.h gen-md5.h gnu-md5.h hash.h host.h html-parse.h \
|
||||
http.h http-ntlm.h init.h log.h mswindows.h netrc.h \
|
||||
options.h progress.h ptimer.h recur.h res.h retr.h safe-ctype.h \
|
||||
spider.h ssl.h sysdep.h url.h utils.h wget.h xmalloc.h
|
||||
|
|
|
|||
1071
src/getopt.c
1071
src/getopt.c
File diff suppressed because it is too large
Load Diff
124
src/getopt.h
124
src/getopt.h
|
|
@ -1,124 +0,0 @@
|
|||
/* Declarations for getopt.
|
||||
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 3, 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, see <http://www.gnu.org/licenses/>. */
|
||||
|
||||
#ifndef _GETOPT_H
|
||||
#define _GETOPT_H 1
|
||||
|
||||
#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 EOF, 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;
|
||||
|
||||
/* 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
|
||||
|
||||
#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);
|
||||
#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);
|
||||
extern int getopt_long_only (int argc, char *const *argv,
|
||||
const char *shortopts,
|
||||
const struct option *longopts, int *longind);
|
||||
|
||||
/* Internal only. Users should not call this directly. */
|
||||
extern int _getopt_internal (int argc, char *const *argv,
|
||||
const char *shortopts,
|
||||
const struct option *longopts, int *longind,
|
||||
int long_only);
|
||||
#else /* not __STDC__ */
|
||||
extern int getopt ();
|
||||
extern int getopt_long ();
|
||||
extern int getopt_long_only ();
|
||||
|
||||
extern int _getopt_internal ();
|
||||
#endif /* not __STDC__ */
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* _GETOPT_H */
|
||||
|
|
@ -55,8 +55,7 @@ so, delete this exception statement from your version. */
|
|||
#include "spider.h"
|
||||
#include "http.h" /* for save_cookies */
|
||||
|
||||
/* On GNU system this will include system-wide getopt.h. */
|
||||
#include "getopt.h"
|
||||
#include <getopt.h>
|
||||
|
||||
#ifndef PATH_SEPARATOR
|
||||
# define PATH_SEPARATOR '/'
|
||||
|
|
|
|||
Loading…
Reference in New Issue