mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-04-28 21:20:48 +00:00
lib: Remove getopt.c and getopt1.c
Why do we need getopt code that is standard in everything that we compile against? Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp
parent
2cc428bee2
commit
2c38c794a0
1011
lib/getopt.c
1011
lib/getopt.c
File diff suppressed because it is too large
Load Diff
143
lib/getopt.h
143
lib/getopt.h
@ -1,143 +0,0 @@
|
|||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
/* Declarations for getopt.
|
|
||||||
* Copyright (C) 1989,90,91,92,93,94,96,97 Free Software Foundation, Inc.
|
|
||||||
*
|
|
||||||
* NOTE: The canonical source of this file is maintained with the GNU C Library.
|
|
||||||
* Bugs can be reported to bug-glibc@gnu.org.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _GETOPT_H
|
|
||||||
#define _GETOPT_H 1
|
|
||||||
|
|
||||||
/*
|
|
||||||
* The operating system may or may not provide getopt_long(), and if
|
|
||||||
* so it may or may not be a version we are willing to use. Our
|
|
||||||
* strategy is to declare getopt here, and then provide code unless
|
|
||||||
* the supplied version is adequate. The difficult case is when a
|
|
||||||
* declaration for getopt is provided, as our declaration must match.
|
|
||||||
*
|
|
||||||
* XXX Arguably this version should be named differently, and the
|
|
||||||
* local names defined to refer to the system version when we choose
|
|
||||||
* to use the system version.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#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;
|
|
||||||
|
|
||||||
/* 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 {
|
|
||||||
#if defined(__STDC__) && __STDC__
|
|
||||||
const char *name;
|
|
||||||
#else
|
|
||||||
char *name;
|
|
||||||
#endif
|
|
||||||
/* 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 defined(__STDC__) && __STDC__
|
|
||||||
|
|
||||||
#ifdef REALLY_NEED_PLAIN_GETOPT
|
|
||||||
|
|
||||||
/*
|
|
||||||
* getopt is defined in POSIX.2. Assume that if the system defines
|
|
||||||
* getopt that it complies with POSIX.2. If not, an autoconf test
|
|
||||||
* should be written to define NONPOSIX_GETOPT_DEFINITION.
|
|
||||||
*/
|
|
||||||
#ifndef NONPOSIX_GETOPT_DEFINITION
|
|
||||||
extern int getopt(int argc, char *const *argv, const char *shortopts);
|
|
||||||
#else /* NONPOSIX_GETOPT_DEFINITION */
|
|
||||||
extern int getopt(void);
|
|
||||||
#endif /* NONPOSIX_GETOPT_DEFINITION */
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
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__ */
|
|
||||||
|
|
||||||
#ifdef REALLY_NEED_PLAIN_GETOPT
|
|
||||||
extern int getopt();
|
|
||||||
#endif /* REALLY_NEED_PLAIN_GETOPT */
|
|
||||||
|
|
||||||
extern int getopt_long();
|
|
||||||
extern int getopt_long_only();
|
|
||||||
|
|
||||||
extern int _getopt_internal();
|
|
||||||
|
|
||||||
#endif /* __STDC__ */
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* getopt.h */
|
|
||||||
163
lib/getopt1.c
163
lib/getopt1.c
@ -1,163 +0,0 @@
|
|||||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
||||||
/* 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.
|
|
||||||
*
|
|
||||||
* NOTE: The canonical source of this file is maintained with the GNU C Library.
|
|
||||||
* Bugs can be reported to bug-glibc@gnu.org.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <zebra.h>
|
|
||||||
#include "getopt.h"
|
|
||||||
|
|
||||||
#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__
|
|
||||||
#include <stdlib.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef NULL
|
|
||||||
#define NULL 0
|
|
||||||
#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.
|
|
||||||
If an option that starts with '-' (not '--') doesn't match a long option,
|
|
||||||
but does match a short option, it is parsed as a short option
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#endif /* Not ELIDE_CODE. */
|
|
||||||
|
|
||||||
#ifdef TEST
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
int main(argc, argv) int argc;
|
|
||||||
char **argv;
|
|
||||||
{
|
|
||||||
int c;
|
|
||||||
int digit_optind = 0;
|
|
||||||
|
|
||||||
while (1) {
|
|
||||||
int this_option_optind = optind ? optind : 1;
|
|
||||||
int option_index = 0;
|
|
||||||
static struct option long_options[] = {
|
|
||||||
{"add", 1, 0, 0}, {"append", 0, 0, 0},
|
|
||||||
{"delete", 1, 0, 0}, {"verbose", 0, 0, 0},
|
|
||||||
{"create", 0, 0, 0}, {"file", 1, 0, 0},
|
|
||||||
{0, 0, 0, 0}};
|
|
||||||
|
|
||||||
c = getopt_long(argc, argv, "abc:d:0123456789", long_options,
|
|
||||||
&option_index);
|
|
||||||
if (c == -1)
|
|
||||||
break;
|
|
||||||
|
|
||||||
switch (c) {
|
|
||||||
case 0:
|
|
||||||
printf("option %s", long_options[option_index].name);
|
|
||||||
if (optarg)
|
|
||||||
printf(" with arg %s", optarg);
|
|
||||||
printf("\n");
|
|
||||||
break;
|
|
||||||
|
|
||||||
case '0':
|
|
||||||
case '1':
|
|
||||||
case '2':
|
|
||||||
case '3':
|
|
||||||
case '4':
|
|
||||||
case '5':
|
|
||||||
case '6':
|
|
||||||
case '7':
|
|
||||||
case '8':
|
|
||||||
case '9':
|
|
||||||
if (digit_optind != 0
|
|
||||||
&& digit_optind != this_option_optind)
|
|
||||||
printf("digits occur in two different argv-elements.\n");
|
|
||||||
digit_optind = this_option_optind;
|
|
||||||
printf("option %c\n", c);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'a':
|
|
||||||
printf("option a\n");
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'b':
|
|
||||||
printf("option b\n");
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'c':
|
|
||||||
printf("option c with value `%s'\n", optarg);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 'd':
|
|
||||||
printf("option d with value `%s'\n", optarg);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case '?':
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
printf("?? getopt returned character code 0%o ??\n", c);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (optind < argc) {
|
|
||||||
printf("non-option ARGV-elements: ");
|
|
||||||
while (optind < argc)
|
|
||||||
printf("%s ", argv[optind++]);
|
|
||||||
printf("\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
exit(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* TEST */
|
|
||||||
@ -38,8 +38,6 @@ lib_libfrr_la_SOURCES = \
|
|||||||
lib/frrscript.c \
|
lib/frrscript.c \
|
||||||
lib/frr_pthread.c \
|
lib/frr_pthread.c \
|
||||||
lib/frrstr.c \
|
lib/frrstr.c \
|
||||||
lib/getopt.c \
|
|
||||||
lib/getopt1.c \
|
|
||||||
lib/grammar_sandbox.c \
|
lib/grammar_sandbox.c \
|
||||||
lib/graph.c \
|
lib/graph.c \
|
||||||
lib/hash.c \
|
lib/hash.c \
|
||||||
@ -217,7 +215,6 @@ pkginclude_HEADERS += \
|
|||||||
lib/frratomic.h \
|
lib/frratomic.h \
|
||||||
lib/frrcu.h \
|
lib/frrcu.h \
|
||||||
lib/frrstr.h \
|
lib/frrstr.h \
|
||||||
lib/getopt.h \
|
|
||||||
lib/graph.h \
|
lib/graph.h \
|
||||||
lib/hash.h \
|
lib/hash.h \
|
||||||
lib/hook.h \
|
lib/hook.h \
|
||||||
|
|||||||
@ -25,7 +25,6 @@
|
|||||||
#include "lib/frr_pthread.h"
|
#include "lib/frr_pthread.h"
|
||||||
#include "lib/frratomic.h"
|
#include "lib/frratomic.h"
|
||||||
#include "lib/frrstr.h"
|
#include "lib/frrstr.h"
|
||||||
#include "lib/getopt.h"
|
|
||||||
#include "lib/graph.h"
|
#include "lib/graph.h"
|
||||||
#include "lib/hash.h"
|
#include "lib/hash.h"
|
||||||
#include "lib/hook.h"
|
#include "lib/hook.h"
|
||||||
|
|||||||
@ -6,11 +6,12 @@
|
|||||||
*/
|
*/
|
||||||
#include <zebra.h>
|
#include <zebra.h>
|
||||||
|
|
||||||
|
#include <getopt.h>
|
||||||
|
|
||||||
#include <lib/version.h>
|
#include <lib/version.h>
|
||||||
|
|
||||||
#include "lib/command.h"
|
#include "lib/command.h"
|
||||||
#include "lib/filter.h"
|
#include "lib/filter.h"
|
||||||
#include "lib/getopt.h"
|
|
||||||
#include "lib/if.h"
|
#include "lib/if.h"
|
||||||
#include "lib/libfrr.h"
|
#include "lib/libfrr.h"
|
||||||
#include "lib/log.h"
|
#include "lib/log.h"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user