Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 12:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Provide fallback version of getopt_long instead of checking for it's presense every time it is used

Browse source 
darcs-hash:20060828114305-ac50b-f4aad19e936fa42bbe84e51e72aa32445a469527.gz
This commit is contained in:
axel 2006-08-28 21:43:05 +10:00
parent 202d29de88
commit 548e379d6a
6 changed files with 48 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
fallback.c
View file

@ -1076,3 +1076,18 @@ int killpg( int pgr, int sig )
return kill( -pgr, sig );
}
#endif
#ifndef HAVE_WORKING_GETOPT_LONG
int getopt_long(int argc,
char * const argv[],
const char *optstring,
const struct option *longopts,
int *longindex)
{
return getopt( argc, argv, optstring );
}
#endif

32
fallback.h
View file

@ -385,5 +385,37 @@ extern int _nl_msg_cat_cntr;
int killpg( int pgr, int sig );
#endif
#ifndef HAVE_WORKING_GETOPT_LONG
struct option
{
const char *name;
int has_arg;
int *flag;
int val;
}
;
#ifndef no_argument
#define no_argument 0
#endif
#ifndef required_argument
#define required_argument 1
#endif
#ifndef optional_argument
#define optional_argument 2
#endif
int getopt_long(int argc,
char * const argv[],
const char *optstring,
const struct option *longopts,
int *longindex);
#endif
#endif

6
fishd.c
View file

@ -494,7 +494,6 @@ int main( int argc, char ** argv )
*/
while( 1 )
{
#ifdef HAVE_WORKING_GETOPT_LONG
static struct option
long_options[] =
{
@ -520,11 +519,6 @@ int main( int argc, char ** argv )
long_options,
&opt_index );
#else
int opt = getopt( argc,
argv,
GETOPT_STRING );
#endif
if( opt == -1 )
break;

6
main.c
View file

@ -123,7 +123,6 @@ int main( int argc, char **argv )
while( 1 )
{
#ifdef HAVE_WORKING_GETOPT_LONG
static struct option
long_options[] =
{
@ -173,11 +172,6 @@ int main( int argc, char **argv )
long_options,
&opt_index );
#else
int opt = getopt( argc,
argv,
GETOPT_STRING );
#endif
if( opt == -1 )
break;

6
mimedb.c
View file

@ -1168,7 +1168,6 @@ int main (int argc, char *argv[])
*/
while( 1 )
{
#ifdef HAVE_WORKING_GETOPT_LONG
static struct option
long_options[] =
{
@ -1222,11 +1221,6 @@ int main (int argc, char *argv[])
long_options,
&opt_index );
#else
int opt = getopt( argc,
argv,
GETOPT_STRING );
#endif
if( opt == -1 )
break;

7
set_color.c
View file

@ -153,7 +153,6 @@ int main( int argc, char **argv )
while( 1 )
{
#ifdef HAVE_WORKING_GETOPT_LONG
static struct option
long_options[] =
{
@ -194,11 +193,7 @@ int main( int argc, char **argv )
GETOPT_STRING,
long_options,
&opt_index );
#else
int opt = getopt( argc,
argv,
GETOPT_STRING );
#endif
if( opt == -1 )
break;