Attachment #2259 for bug #1448

Lines 5-10 Link Here

(-)ChangeLog (+4 lines)
5	getopt.c. Preprocessed source is identical other than line numbers.	5	getopt.c. Preprocessed source is identical other than line numbers.
6	- (dtucker) [openbsd-compat/getopt_long.c] Import from OpenBSD. No	6	- (dtucker) [openbsd-compat/getopt_long.c] Import from OpenBSD. No
7	portability changes yet.	7	portability changes yet.
		8	- (dtucker) [openbsd-compat/Makefile.in openbsd-compat/getopt.c
		9	openbsd-compat/getopt_long.c regress/modpipe.c] Remove getopt.c, add
		10	portability code to getopt_long.c and switch over Makefile and the ugly
		11	hack in modpipe.c
8		12
9	20130423	13	20130423
10	- (djm) [auth.c configure.ac misc.c monitor.c monitor_wrap.c] Support	14	- (djm) [auth.c configure.ac misc.c monitor.c monitor_wrap.c] Support

Lines 16-22 RANLIB=@RANLIB@ Link Here

(-)openbsd-compat/Makefile.in (-1 / +1 lines)
16	INSTALL=@INSTALL@	16	INSTALL=@INSTALL@
17	LDFLAGS=-L. @LDFLAGS@	17	LDFLAGS=-L. @LDFLAGS@
18		18
19	OPENBSD=base64.o basename.o bindresvport.o daemon.o dirname.o fmt_scaled.o getcwd.o getgrouplist.o getopt.o getrrsetbyname.o glob.o inet_aton.o inet_ntoa.o inet_ntop.o mktemp.o pwcache.o readpassphrase.o realpath.o rresvport.o setenv.o setproctitle.o sha2.o sigact.o strlcat.o strlcpy.o strmode.o strnlen.o strptime.o strsep.o strtonum.o strtoll.o strtoul.o strtoull.o timingsafe_bcmp.o vis.o	19	OPENBSD=base64.o basename.o bindresvport.o daemon.o dirname.o fmt_scaled.o getcwd.o getgrouplist.o getopt_long.o getrrsetbyname.o glob.o inet_aton.o inet_ntoa.o inet_ntop.o mktemp.o pwcache.o readpassphrase.o realpath.o rresvport.o setenv.o setproctitle.o sha2.o sigact.o strlcat.o strlcpy.o strmode.o strnlen.o strptime.o strsep.o strtonum.o strtoll.o strtoul.o strtoull.o timingsafe_bcmp.o vis.o
20		20
21	COMPAT=bsd-arc4random.o bsd-asprintf.o bsd-closefrom.o bsd-cray.o bsd-cygwin_util.o bsd-getpeereid.o getrrsetbyname-ldns.o bsd-misc.o bsd-nextstep.o bsd-openpty.o bsd-poll.o bsd-setres_id.o bsd-snprintf.o bsd-statvfs.o bsd-waitpid.o fake-rfc2553.o openssl-compat.o xmmap.o xcrypt.o	21	COMPAT=bsd-arc4random.o bsd-asprintf.o bsd-closefrom.o bsd-cray.o bsd-cygwin_util.o bsd-getpeereid.o getrrsetbyname-ldns.o bsd-misc.o bsd-nextstep.o bsd-openpty.o bsd-poll.o bsd-setres_id.o bsd-snprintf.o bsd-statvfs.o bsd-waitpid.o fake-rfc2553.o openssl-compat.o xmmap.o xcrypt.o
22		22




/*
 * Copyright (c) 1987, 1993, 1994
 *	The Regents of the University of California.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 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
 *    without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 * 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
 * SUCH DAMAGE.
 */

/* OPENBSD ORIGINAL: lib/libc/stdlib/getopt.c */

#include "includes.h"
#if !defined(HAVE_GETOPT) || !defined(HAVE_GETOPT_OPTRESET)

/* some defines to make it easier to keep the code in sync with upstream */
/* #define getopt BSDgetopt is in defines.h */
#define opterr		BSDopterr
#define optind		BSDoptind
#define optopt		BSDoptopt
#define optreset	BSDoptreset
#define optarg		BSDoptarg

#if defined(LIBC_SCCS) && !defined(lint)
static char *rcsid = "$OpenBSD: getopt.c,v 1.5 2003/06/02 20:18:37 millert Exp $";
#endif /* LIBC_SCCS and not lint */

#include <stdio.h>
#include <stdlib.h>
#include <string.h>

int	opterr = 1,		/* if error message should be printed */
	optind = 1,		/* index into parent argv vector */
	optopt,			/* character checked for validity */
	optreset;		/* reset getopt */
char	*optarg;		/* argument associated with option */

#define	BADCH	(int)'?'
#define	BADARG	(int)':'
#define	EMSG	""

/*
 * getopt --
 *	Parse argc/argv argument vector.
 */
int
getopt(nargc, nargv, ostr)
	int nargc;
	char * const *nargv;
	const char *ostr;
{
	extern char *__progname;
	static char *place = EMSG;		/* option letter processing */
	char *oli;				/* option letter list index */

	if (ostr == NULL)
		return (-1);

	if (optreset || !*place) {		/* update scanning pointer */
		optreset = 0;
		if (optind >= nargc || *(place = nargv[optind]) != '-') {
			place = EMSG;
			return (-1);
		}
		if (place[1] && *++place == '-') {	/* found "--" */
			++optind;
			place = EMSG;
			return (-1);
		}
	}					/* option letter okay? */
	if ((optopt = (int)*place++) == (int)':' ||
	    !(oli = strchr(ostr, optopt))) {
		/*
		 * if the user didn't specify '-' as an option,
		 * assume it means -1.
		 */
		if (optopt == (int)'-')
			return (-1);
		if (!*place)
			++optind;
		if (opterr && *ostr != ':')
			(void)fprintf(stderr,
			    "%s: illegal option -- %c\n", __progname, optopt);
		return (BADCH);
	}
	if (*++oli != ':') {			/* don't need argument */
		optarg = NULL;
		if (!*place)
			++optind;
	}
	else {					/* need an argument */
		if (*place)			/* no white space */
			optarg = place;
		else if (nargc <= ++optind) {	/* no arg */
			place = EMSG;
			if (*ostr == ':')
				return (BADARG);
			if (opterr)
				(void)fprintf(stderr,
				    "%s: option requires an argument -- %c\n",
				    __progname, optopt);
			return (BADCH);
		}
	 	else				/* white space */
			optarg = nargv[optind];
		place = EMSG;
		++optind;
	}
	return (optopt);			/* dump back option letter */
}

#endif /* !defined(HAVE_GETOPT) || !defined(HAVE_OPTRESET) */




 * POSSIBILITY OF SUCH DAMAGE.
 */

/* OPENBSD ORIGINAL: lib/libc/stdlib/getopt_long.c */
#include "includes.h"

#if !defined(HAVE_GETOPT) || !defined(HAVE_GETOPT_OPTRESET)
#include "log.h"

/*
 * Some defines to make it easier to keep the code in sync with upstream.
 * getopt opterr optind optopt optreset optarg are all in defines.h which is
 * pulled in by includes.h.
 */
#define warnx		logit

#if 0
#include <err.h>
#endif
#include <errno.h>
#include <getopt.h>
#include <stdlib.h>

	return (getopt_internal(nargc, nargv, options, NULL, NULL, 0));
}

#if 0
/*
 * getopt_long --
 *	Parse argc/argv argument vector.

	return (getopt_internal(nargc, nargv, options, long_options, idx,
	    FLAG_PERMUTE|FLAG_LONGONLY));
}
#endif

#endif /* !defined(HAVE_GETOPT) || !defined(HAVE_OPTRESET) */

Lines 25-31 Link Here

(-)regress/modpipe.c (-1 / +1 lines)
25	#include <stdarg.h>	25	#include <stdarg.h>
26	#include <stdlib.h>	26	#include <stdlib.h>
27	#include <errno.h>	27	#include <errno.h>
28	#include "openbsd-compat/getopt.c"	28	#include "openbsd-compat/getopt_long.c"
29		29
30	static void err(int, const char *, ...) __attribute__((format(printf, 2, 3)));	30	static void err(int, const char *, ...) __attribute__((format(printf, 2, 3)));
31	static void errx(int, const char *, ...) __attribute__((format(printf, 2, 3)));	31	static void errx(int, const char *, ...) __attribute__((format(printf, 2, 3)));

Return to bug 1448

Lines 49-55 Link Here

(-)openbsd-compat/getopt_long.c (+19 lines)
49	* POSSIBILITY OF SUCH DAMAGE.	49	* POSSIBILITY OF SUCH DAMAGE.
50	*/	50	*/
51		51
		52	/* OPENBSD ORIGINAL: lib/libc/stdlib/getopt_long.c */
		53	#include "includes.h"
		54
		55	#if !defined(HAVE_GETOPT) \|\| !defined(HAVE_GETOPT_OPTRESET)
		56	#include "log.h"
		57
		58	/*
		59	* Some defines to make it easier to keep the code in sync with upstream.
		60	* getopt opterr optind optopt optreset optarg are all in defines.h which is
		61	* pulled in by includes.h.
		62	*/
		63	#define warnx logit
		64
		65	#if 0
52	#include <err.h>	66	#include <err.h>
		67	#endif
53	#include <errno.h>	68	#include <errno.h>
54	#include <getopt.h>	69	#include <getopt.h>
55	#include <stdlib.h>	70	#include <stdlib.h>
Lines 484-489 getopt(int nargc, char * const *nargv, c Link Here
484	return (getopt_internal(nargc, nargv, options, NULL, NULL, 0));	499	return (getopt_internal(nargc, nargv, options, NULL, NULL, 0));
485	}	500	}
486		501
		502	#if 0
487	/*	503	/*
488	* getopt_long --	504	* getopt_long --
489	* Parse argc/argv argument vector.	505	* Parse argc/argv argument vector.
Lines 509-511 getopt_long_only(int nargc, char * const Link Here
509	return (getopt_internal(nargc, nargv, options, long_options, idx,	525	return (getopt_internal(nargc, nargv, options, long_options, idx,
510	FLAG_PERMUTE\|FLAG_LONGONLY));	526	FLAG_PERMUTE\|FLAG_LONGONLY));
511	}	527	}
		528	#endif
		529
		530	#endif /* !defined(HAVE_GETOPT) \|\| !defined(HAVE_OPTRESET) */

Removed Link Here

(-)openbsd-compat/getopt.c (-131 lines)
1	/*
2	* Copyright (c) 1987, 1993, 1994
3	* The Regents of the University of California. All rights reserved.
4	*
5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions
7	* are met:
8	* 1. Redistributions of source code must retain the above copyright
9	* notice, this list of conditions and the following disclaimer.
10	* 2. Redistributions in binary form must reproduce the above copyright
11	* notice, this list of conditions and the following disclaimer in the
12	* documentation and/or other materials provided with the distribution.
13	* 3. Neither the name of the University nor the names of its contributors
14	* may be used to endorse or promote products derived from this software
15	* without specific prior written permission.
16	*
17	* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
18	* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
19	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
20	* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
21	* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22	* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23	* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24	* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25	* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26	* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27	* SUCH DAMAGE.
28	*/
29
30	/* OPENBSD ORIGINAL: lib/libc/stdlib/getopt.c */
31
32	#include "includes.h"
33	#if !defined(HAVE_GETOPT) \|\| !defined(HAVE_GETOPT_OPTRESET)
34
35	/* some defines to make it easier to keep the code in sync with upstream */
36	/* #define getopt BSDgetopt is in defines.h */
37	#define opterr BSDopterr
38	#define optind BSDoptind
39	#define optopt BSDoptopt
40	#define optreset BSDoptreset
41	#define optarg BSDoptarg
42
43	#if defined(LIBC_SCCS) && !defined(lint)
44	static char *rcsid = "$OpenBSD: getopt.c,v 1.5 2003/06/02 20:18:37 millert Exp $";
45	#endif /* LIBC_SCCS and not lint */
46
47	#include <stdio.h>
48	#include <stdlib.h>
49	#include <string.h>
50
51	int opterr = 1, /* if error message should be printed */
52	optind = 1, /* index into parent argv vector */
53	optopt, /* character checked for validity */
54	optreset; /* reset getopt */
55	char optarg; / argument associated with option */
56
57	#define BADCH (int)'?'
58	#define BADARG (int)':'
59	#define EMSG ""
60
61	/*
62	* getopt --
63	* Parse argc/argv argument vector.
64	*/
65	int
66	getopt(nargc, nargv, ostr)
67	int nargc;
68	char * const *nargv;
69	const char *ostr;
70	{
71	extern char *__progname;
72	static char place = EMSG; / option letter processing */
73	char oli; / option letter list index */
74
75	if (ostr == NULL)
76	return (-1);
77
78	if (optreset \|\| !place) { / update scanning pointer */
79	optreset = 0;
80	if (optind >= nargc \|\| *(place = nargv[optind]) != '-') {
81	place = EMSG;
82	return (-1);
83	}
84	if (place[1] && ++place == '-') { / found "--" */
85	++optind;
86	place = EMSG;
87	return (-1);
88	}
89	} /* option letter okay? */
90	if ((optopt = (int)*place++) == (int)':' \|\|
91	!(oli = strchr(ostr, optopt))) {
92	/*
93	* if the user didn't specify '-' as an option,
94	* assume it means -1.
95	*/
96	if (optopt == (int)'-')
97	return (-1);
98	if (!*place)
99	++optind;
100	if (opterr && *ostr != ':')
101	(void)fprintf(stderr,
102	"%s: illegal option -- %c\n", __progname, optopt);
103	return (BADCH);
104	}
105	if (++oli != ':') { / don't need argument */
106	optarg = NULL;
107	if (!*place)
108	++optind;
109	}
110	else { /* need an argument */
111	if (place) / no white space */
112	optarg = place;
113	else if (nargc <= ++optind) { /* no arg */
114	place = EMSG;
115	if (*ostr == ':')
116	return (BADARG);
117	if (opterr)
118	(void)fprintf(stderr,
119	"%s: option requires an argument -- %c\n",
120	__progname, optopt);
121	return (BADCH);
122	}
123	else /* white space */
124	optarg = nargv[optind];
125	place = EMSG;
126	++optind;
127	}
128	return (optopt); /* dump back option letter */
129	}
130
131	#endif /* !defined(HAVE_GETOPT) \|\| !defined(HAVE_OPTRESET) */