mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-06 15:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add support for optional_argument to our own getopt_long() implementation.

Browse Source 
07c8651dd9 currently causes compilation errors on mscv (and
probably some other) compilers because our getopt_long()
implementation doesn't have support for optional_argument.

Thus implement optional_argument in our fallback implemenation. It's
quite possibly also useful in other cases.

Arguably this needs a configure check for optional_argument, but it
has existed pretty much since getopt_long() was introduced and thus
doesn't seem worth the configure runtime.

Normally I'd would not push a patch this fast, but this allows msvc to
build again and has low risk as only optional_argument behaviour has
changed.

Author: Michael Paquier and Andres Freund

Discussion: CAB7nPqS5VeedSCxrK=QouokbawgGKLpyc1Q++RRFCa_sjcSVrg@mail.gmail.com
This commit is contained in:
Andres Freund 2014-09-10 17:21:50 +02:00
parent b4c28d1b92
commit 311da16439
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/getopt_long.h
View File

@ -23,6 +23,7 @@ struct option
#define no_argument 0
#define required_argument 1
#define optional_argument 2
#endif
#ifndef HAVE_GETOPT_LONG

16
src/port/getopt_long.c
View File

@ -100,11 +100,14 @@ getopt_long(int argc, char *const argv[],
if (strlen(longopts[i].name) == namelen
&& strncmp(place, longopts[i].name, namelen) == 0)
{
if (longopts[i].has_arg)
int has_arg = longopts[i].has_arg;
if (has_arg != no_argument)
{
if (place[namelen] == '=')
optarg = place + namelen + 1;
else if (optind < argc - 1)
else if (optind < argc - 1 &&
has_arg == required_argument)
{
optind++;
optarg = argv[optind];
@ -113,13 +116,18 @@ getopt_long(int argc, char *const argv[],
{
if (optstring[0] == ':')
return BADARG;
if (opterr)
if (opterr && has_arg == required_argument)
fprintf(stderr,
"%s: option requires an argument -- %s\n",
argv[0], place);
place = EMSG;
optind++;
return BADCH;
if (has_arg == required_argument)
return BADCH;
optarg = NULL;
}
}
else