Commit c4e9570d authored by Guilherme Janczak's avatar Guilherme Janczak Committed by derf
Browse files

remove local getopt_long() implementation 

getopt_long() is widely supported these days, removing it from the
source tree should be okay.

Here's documentation or the implementation of getopt_long on many
systems:

All the BSDs:
https://man.netbsd.org/NetBSD-9.2-STABLE/getopt_long.3
https://man.openbsd.org/OpenBSD-7.0/getopt_long
https://www.freebsd.org/cgi/man.cgi?query=getopt_long
https://leaf.dragonflybsd.org/cgi/web-man?command=getopt_long

Illumos (OpenSolaris fork):
https://illumos.org/man/3c/getopt_long

The musl, newlib, and uclibc-ng libcs:
https://gogs.waldemar-brodkorb.de/oss/uclibc-ng/src/master/libc/unistd/getopt_long-simple.c#L49-L52
https://git.musl-libc.org/cgit/musl/tree/src/misc/getopt_long.c#n140
https://sourceware.org/git/?p=newlib-cygwin.git;a=blob;f=newlib/libc/stdlib/getopt.c;h=d4f225a7a735dc741d2874eb6c131b6fce2967c5;hb=HEAD#l475

Mingw-w64:
https://github.com/mirror/mingw-w64/blob/master/mingw-w64-crt/misc/getopt.c#L542-L549

Mac OS X:
https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man3/getopt_long.3.html
parent 4bfea24d

src/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ TARGETS = \ 
	events.c \

	feh_png.c \

	filelist.c \

	getopt.c \

	getopt1.c \

	gib_hash.c \

	gib_imlib.c \

	gib_list.c \

src/feh.h

+1 −1
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
#include <signal.h>

#include <sys/wait.h>

#include <math.h>

#include <getopt.h>



#include <Imlib2.h>

#include "gib_hash.h"
@@ -74,7 +75,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
#include "menu.h"



#include "utils.h"

#include "getopt.h"



#include "debug.h"

src/getopt.c

deleted100644 → 0
+0 −950

File deleted.

Preview size limit exceeded, changes collapsed.

src/getopt.h

deleted100644 → 0
+0 −130
Original line number Diff line number Diff line 
/* Declarations for getopt.

   Copyright (C) 1989,90,91,92,93,94,96,97 Free Software Foundation, Inc.

   This file is part of the GNU C Library.



   The GNU C Library is free software; you can redistribute it and/or

   modify it under the terms of the GNU Library General Public License as

   published by the Free Software Foundation; either version 2 of the

   License, or (at your option) any later version.



   The GNU C Library 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

   Library General Public License for more details.



   You should have received a copy of the GNU Library General Public

   License along with the GNU C Library; see the file COPYING.LIB.  If not,

   write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,

   Boston, MA 02110-1301, USA.  */



#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 -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 __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__ */

#ifndef __cplusplus

/* C++ is more pedantic, and demands a full prototype, not this.

   Hope that stdlib.h has a prototype for `getopt'.  */

	extern int getopt();

#endif				/* __cplusplus */

#endif				/* __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				/* __STDC__ */



#ifdef	__cplusplus

}

#endif

#endif				/* getopt.h */

src/getopt1.c

deleted100644 → 0
+0 −173
Original line number Diff line number Diff line 
/* getopt_long and getopt_long_only entry points for GNU getopt.

   Copyright (C) 1987,88,89,90,91,92,93,94,96,97 Free Software Foundation, Inc.

   This file is part of the GNU C Library.



   The GNU C Library is free software; you can redistribute it and/or

   modify it under the terms of the GNU Library General Public License as

   published by the Free Software Foundation; either version 2 of the

   License, or (at your option) any later version.



   The GNU C Library 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

   Library General Public License for more details.



   You should have received a copy of the GNU Library General Public

   License along with the GNU C Library; see the file COPYING.LIB.  If not,

   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,

   Boston, MA 02111-1307, USA.  */



#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 */