reactos/ccache
1
0
Fork 0
mirror of https://github.com/reactos/ccache.git synced 2024-11-26 21:20:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make getopt_long prettier and more standalone

Browse Source
This commit is contained in:
Joel Rosdahl 2010-02-17 19:44:48 +01:00
parent 00a9c50bb5
commit 4ad5570d23
2 changed files with 39 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
getopt_long.c
View File

@ -11,18 +11,18 @@
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
* are met: * are met:
* 1. Redistributions of source code must retain the above copyright * 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* 3. Neither the name of the University nor the names of its contributors * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software * may be used to endorse or promote products derived from this software
* without specific prior written permission. * without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
@ -30,37 +30,28 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
*
* $PostgreSQL: pgsql/src/port/getopt_long.c,v 1.8 2009/06/11 14:49:15 momjian Exp $
*/ */
#include "c.h"
#include "getopt_long.h" #include "getopt_long.h"
#ifndef HAVE_INT_OPTRESET #include <stdio.h>
int optreset; #include <string.h>
#include <unistd.h>
/* else the "extern" was provided by getopt_long.h */
#endif
#define BADCH '?'
#define BADARG ':'
#define EMSG ""
#define BADCH '?'
#define BADARG ':'
#define EMSG ""
int int
getopt_long(int argc, char *const argv[], getopt_long(int argc, char *const argv[],
const char *optstring, const char *optstring,
const struct option * longopts, int *longindex) const struct option * longopts, int *longindex)
{ {
static char *place = EMSG; /* option letter processing */ static char *place = EMSG; /* option letter processing */
char *oli; /* option letter list index */ char *oli; /* option letter list index */
if (optreset || !*place)
{ /* update scanning pointer */
optreset = 0;
if (!*place)
{ /* update scanning pointer */
if (optind >= argc) if (optind >= argc)
{ {
place = EMSG; place = EMSG;
@ -78,7 +69,7 @@ getopt_long(int argc, char *const argv[],
place++; place++;
if (place[0] && place[0] == '-' && place[1] == '\0') if (place[0] && place[0] == '-' && place[1] == '\0')
{ /* found "--" */ { /* found "--" */
++optind; ++optind;
place = EMSG; place = EMSG;
return -1; return -1;
@ -87,8 +78,8 @@ getopt_long(int argc, char *const argv[],
if (place[0] && place[0] == '-' && place[1]) if (place[0] && place[0] == '-' && place[1])
{ {
/* long option */ /* long option */
size_t namelen; size_t namelen;
int i; int i;
place++; place++;
@ -113,8 +104,8 @@ getopt_long(int argc, char *const argv[],
return BADARG; return BADARG;
if (opterr) if (opterr)
fprintf(stderr, fprintf(stderr,
"%s: option requires an argument -- %s\n", "%s: option requires an argument -- %s\n",
argv[0], place); argv[0], place);
place = EMSG; place = EMSG;
optind++; optind++;
return BADCH; return BADCH;
@ -148,7 +139,7 @@ getopt_long(int argc, char *const argv[],
if (opterr && optstring[0] != ':') if (opterr && optstring[0] != ':')
fprintf(stderr, fprintf(stderr,
"%s: illegal option -- %s\n", argv[0], place); "%s: illegal option -- %s\n", argv[0], place);
place = EMSG; place = EMSG;
optind++; optind++;
return BADCH; return BADCH;
@ -165,29 +156,29 @@ getopt_long(int argc, char *const argv[],
++optind; ++optind;
if (opterr && *optstring != ':') if (opterr && *optstring != ':')
fprintf(stderr, fprintf(stderr,
"%s: illegal option -- %c\n", argv[0], optopt); "%s: illegal option -- %c\n", argv[0], optopt);
return BADCH; return BADCH;
} }
if (oli[1] != ':') if (oli[1] != ':')
{ /* don't need argument */ { /* don't need argument */
optarg = NULL; optarg = NULL;
if (!*place) if (!*place)
++optind; ++optind;
} }
else else
{ /* need an argument */ { /* need an argument */
if (*place) /* no white space */ if (*place) /* no white space */
optarg = place; optarg = place;
else if (argc <= ++optind) else if (argc <= ++optind)
{ /* no arg */ { /* no arg */
place = EMSG; place = EMSG;
if (*optstring == ':') if (*optstring == ':')
return BADARG; return BADARG;
if (opterr) if (opterr)
fprintf(stderr, fprintf(stderr,
"%s: option requires an argument -- %c\n", "%s: option requires an argument -- %c\n",
argv[0], optopt); argv[0], optopt);
return BADCH; return BADCH;
} }
else else

30
getopt_long.h
View File

@ -3,42 +3,28 @@
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.
* *
* Portions Copyright (c) 2003-2010, PostgreSQL Global Development Group * Portions Copyright (c) 2003-2010, PostgreSQL Global Development Group
*
* $PostgreSQL: pgsql/src/include/getopt_long.h,v 1.12 2010/01/02 16:58:00 momjian Exp $
*/ */
#ifndef GETOPT_LONG_H #ifndef GETOPT_LONG_H
#define GETOPT_LONG_H #define GETOPT_LONG_H
#ifdef HAVE_GETOPT_H extern int opterr;
#include <getopt.h> extern int optind;
#endif extern int optopt;
/* These are picked up from the system's getopt() facility. */
extern int opterr;
extern int optind;
extern int optopt;
extern char *optarg; extern char *optarg;
extern int optreset;
#ifndef HAVE_STRUCT_OPTION
struct option struct option
{ {
const char *name; const char *name;
int has_arg; int has_arg;
int *flag; int *flag;
int val; int val;
}; };
#define no_argument 0 #define no_argument 0
#define required_argument 1 #define required_argument 1
#endif
#ifndef HAVE_GETOPT_LONG
extern int getopt_long(int argc, char *const argv[], extern int getopt_long(int argc, char *const argv[],
const char *optstring, const char *optstring,
const struct option * longopts, int *longindex); const struct option * longopts, int *longindex);
#endif
#endif /* GETOPT_LONG_H */ #endif /* GETOPT_LONG_H */