diff options
author | Damien Miller <djm@mindrot.org> | 2001-07-14 13:22:53 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2001-07-14 13:22:53 +1000 |
commit | 4f8e66929b592825856df3625f5de7922f826020 (patch) | |
tree | a2aa5cbf687af528463900a8852b02386e12729e | |
parent | 8f6bc30a4b23fb07ca3aca01a745f070a2129760 (diff) |
- (djm) Pull in getopt(3) from OpenBSD libc for the optreset extension.
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | acconfig.h | 5 | ||||
-rw-r--r-- | configure.in | 18 | ||||
-rw-r--r-- | openbsd-compat/Makefile.in | 4 | ||||
-rw-r--r-- | openbsd-compat/getopt.c | 122 | ||||
-rw-r--r-- | openbsd-compat/getopt.h | 14 | ||||
-rw-r--r-- | openbsd-compat/openbsd-compat.h | 3 | ||||
-rw-r--r-- | ssh.c | 4 |
8 files changed, 166 insertions, 7 deletions
@@ -49,6 +49,7 @@ | |||
49 | note that dirname(3) modifies its argument on some systems. | 49 | note that dirname(3) modifies its argument on some systems. |
50 | - (djm) Reorder Makefile.in so clean targets work a little better when | 50 | - (djm) Reorder Makefile.in so clean targets work a little better when |
51 | run directly from Makefile.in | 51 | run directly from Makefile.in |
52 | - (djm) Pull in getopt(3) from OpenBSD libc for the optreset extension. | ||
52 | 53 | ||
53 | 20010711 | 54 | 20010711 |
54 | - (djm) dirname(3) may modify its argument on glibc and other systems. | 55 | - (djm) dirname(3) may modify its argument on glibc and other systems. |
@@ -6024,4 +6025,4 @@ | |||
6024 | - Wrote replacements for strlcpy and mkdtemp | 6025 | - Wrote replacements for strlcpy and mkdtemp |
6025 | - Released 1.0pre1 | 6026 | - Released 1.0pre1 |
6026 | 6027 | ||
6027 | $Id: ChangeLog,v 1.1398 2001/07/14 03:07:44 djm Exp $ | 6028 | $Id: ChangeLog,v 1.1399 2001/07/14 03:22:53 djm Exp $ |
diff --git a/acconfig.h b/acconfig.h index 8faae40e2..78c48f1c2 100644 --- a/acconfig.h +++ b/acconfig.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: acconfig.h,v 1.112 2001/06/22 21:14:19 stevesk Exp $ */ | 1 | /* $Id: acconfig.h,v 1.113 2001/07/14 03:22:53 djm Exp $ */ |
2 | 2 | ||
3 | #ifndef _CONFIG_H | 3 | #ifndef _CONFIG_H |
4 | #define _CONFIG_H | 4 | #define _CONFIG_H |
@@ -320,6 +320,9 @@ | |||
320 | /* Define in your struct dirent expects you to allocate extra space for d_name */ | 320 | /* Define in your struct dirent expects you to allocate extra space for d_name */ |
321 | #undef BROKEN_ONE_BYTE_DIRENT_D_NAME | 321 | #undef BROKEN_ONE_BYTE_DIRENT_D_NAME |
322 | 322 | ||
323 | /* Define if your getopt(3) defines and uses optreset */ | ||
324 | #undef HAVE_GETOPT_OPTRESET | ||
325 | |||
323 | @BOTTOM@ | 326 | @BOTTOM@ |
324 | 327 | ||
325 | /* ******************* Shouldn't need to edit below this line ************** */ | 328 | /* ******************* Shouldn't need to edit below this line ************** */ |
diff --git a/configure.in b/configure.in index ed3fba84e..d3f38b92f 100644 --- a/configure.in +++ b/configure.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.in,v 1.298 2001/06/29 12:32:31 mouring Exp $ | 1 | # $Id: configure.in,v 1.299 2001/07/14 03:22:53 djm Exp $ |
2 | 2 | ||
3 | AC_INIT(ssh.c) | 3 | AC_INIT(ssh.c) |
4 | 4 | ||
@@ -459,7 +459,7 @@ AC_ARG_WITH(tcp-wrappers, | |||
459 | ) | 459 | ) |
460 | 460 | ||
461 | dnl Checks for library functions. | 461 | dnl Checks for library functions. |
462 | AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa clock dirname fchown fchmod freeaddrinfo futimes gai_strerror getcwd getaddrinfo getgrouplist getnameinfo getrlimit getrusage getttyent glob inet_ntoa innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty readpassphrase realpath rresvport_af setdtablesize setenv setegid seteuid setlogin setproctitle setresgid setreuid setrlimit setsid setvbuf sigaction sigvec snprintf strerror strlcat strlcpy strmode strsep sysconf tcgetpgrp utimes vsnprintf vhangup vis waitpid _getpty __b64_ntop) | 462 | AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa clock dirname fchown fchmod freeaddrinfo futimes gai_strerror getcwd getaddrinfo getgrouplist getopt getnameinfo getrlimit getrusage getttyent glob inet_ntoa innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty readpassphrase realpath rresvport_af setdtablesize setenv setegid seteuid setlogin setproctitle setresgid setreuid setrlimit setsid setvbuf sigaction sigvec snprintf strerror strlcat strlcpy strmode strsep sysconf tcgetpgrp utimes vsnprintf vhangup vis waitpid _getpty __b64_ntop) |
463 | dnl Checks for time functions | 463 | dnl Checks for time functions |
464 | AC_CHECK_FUNCS(gettimeofday time) | 464 | AC_CHECK_FUNCS(gettimeofday time) |
465 | dnl Checks for libutil functions | 465 | dnl Checks for libutil functions |
@@ -1184,6 +1184,20 @@ if test "x$ac_cv_libc_defines___progname" = "xyes" ; then | |||
1184 | AC_DEFINE(HAVE___PROGNAME) | 1184 | AC_DEFINE(HAVE___PROGNAME) |
1185 | fi | 1185 | fi |
1186 | 1186 | ||
1187 | AC_CACHE_CHECK([whether getopt has optreset support], | ||
1188 | ac_cv_have_getopt_optreset, [ | ||
1189 | AC_TRY_LINK( | ||
1190 | [ | ||
1191 | #include <getopt.h> | ||
1192 | ], | ||
1193 | [ extern int optreset; optreset = 0; ], | ||
1194 | [ ac_cv_have_getopt_optreset="yes" ], | ||
1195 | [ ac_cv_have_getopt_optreset="no" ] | ||
1196 | ) | ||
1197 | ]) | ||
1198 | if test "x$ac_cv_have_getopt_optreset" = "xyes" ; then | ||
1199 | AC_DEFINE(HAVE_GETOPT_OPTRESET) | ||
1200 | fi | ||
1187 | 1201 | ||
1188 | AC_CACHE_CHECK([if libc defines sys_errlist], ac_cv_libc_defines_sys_errlist, [ | 1202 | AC_CACHE_CHECK([if libc defines sys_errlist], ac_cv_libc_defines_sys_errlist, [ |
1189 | AC_TRY_LINK([], | 1203 | AC_TRY_LINK([], |
diff --git a/openbsd-compat/Makefile.in b/openbsd-compat/Makefile.in index 33def5121..3fd241454 100644 --- a/openbsd-compat/Makefile.in +++ b/openbsd-compat/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.14 2001/06/29 12:32:32 mouring Exp $ | 1 | # $Id: Makefile.in,v 1.15 2001/07/14 03:22:54 djm Exp $ |
2 | 2 | ||
3 | sysconfdir=@sysconfdir@ | 3 | sysconfdir=@sysconfdir@ |
4 | piddir=@piddir@ | 4 | piddir=@piddir@ |
@@ -16,7 +16,7 @@ RANLIB=@RANLIB@ | |||
16 | INSTALL=@INSTALL@ | 16 | INSTALL=@INSTALL@ |
17 | LDFLAGS=-L. @LDFLAGS@ | 17 | LDFLAGS=-L. @LDFLAGS@ |
18 | 18 | ||
19 | OPENBSD=base64.o bindresvport.o daemon.o dirname.o getcwd.o getgrouplist.o glob.o inet_ntoa.o mktemp.o readpassphrase.o realpath.o rresvport.o setenv.o setproctitle.o sigact.o strlcat.o strlcpy.o strmode.o strsep.o vis.o | 19 | OPENBSD=base64.o bindresvport.o daemon.o dirname.o getcwd.o getgrouplist.o getopt.o glob.o inet_ntoa.o mktemp.o readpassphrase.o realpath.o rresvport.o setenv.o setproctitle.o sigact.o strlcat.o strlcpy.o strmode.o strsep.o vis.o |
20 | 20 | ||
21 | COMPAT=bsd-arc4random.o bsd-cygwin_util.o bsd-misc.o bsd-nextstep.o bsd-snprintf.o bsd-waitpid.o fake-getaddrinfo.o fake-getnameinfo.o | 21 | COMPAT=bsd-arc4random.o bsd-cygwin_util.o bsd-misc.o bsd-nextstep.o bsd-snprintf.o bsd-waitpid.o fake-getaddrinfo.o fake-getnameinfo.o |
22 | 22 | ||
diff --git a/openbsd-compat/getopt.c b/openbsd-compat/getopt.c new file mode 100644 index 000000000..071e27885 --- /dev/null +++ b/openbsd-compat/getopt.c | |||
@@ -0,0 +1,122 @@ | |||
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. All advertising materials mentioning features or use of this software | ||
14 | * must display the following acknowledgement: | ||
15 | * This product includes software developed by the University of | ||
16 | * California, Berkeley and its contributors. | ||
17 | * 4. Neither the name of the University nor the names of its contributors | ||
18 | * may be used to endorse or promote products derived from this software | ||
19 | * without specific prior written permission. | ||
20 | * | ||
21 | * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND | ||
22 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
23 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
24 | * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE | ||
25 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
26 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
27 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
28 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
29 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
30 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
31 | * SUCH DAMAGE. | ||
32 | */ | ||
33 | |||
34 | #include "config.h" | ||
35 | #if !defined(HAVE_GETOPT) || !defined(HAVE_GETOPT_OPTRESET) | ||
36 | |||
37 | #if defined(LIBC_SCCS) && !defined(lint) | ||
38 | static char *rcsid = "$OpenBSD: getopt.c,v 1.2 1996/08/19 08:33:32 tholo Exp $"; | ||
39 | #endif /* LIBC_SCCS and not lint */ | ||
40 | |||
41 | #include <stdio.h> | ||
42 | #include <stdlib.h> | ||
43 | #include <string.h> | ||
44 | |||
45 | int opterr = 1, /* if error message should be printed */ | ||
46 | optind = 1, /* index into parent argv vector */ | ||
47 | optopt, /* character checked for validity */ | ||
48 | optreset; /* reset getopt */ | ||
49 | char *optarg; /* argument associated with option */ | ||
50 | |||
51 | #define BADCH (int)'?' | ||
52 | #define BADARG (int)':' | ||
53 | #define EMSG "" | ||
54 | |||
55 | /* | ||
56 | * getopt -- | ||
57 | * Parse argc/argv argument vector. | ||
58 | */ | ||
59 | int | ||
60 | getopt(nargc, nargv, ostr) | ||
61 | int nargc; | ||
62 | char * const *nargv; | ||
63 | const char *ostr; | ||
64 | { | ||
65 | extern char *__progname; | ||
66 | static char *place = EMSG; /* option letter processing */ | ||
67 | char *oli; /* option letter list index */ | ||
68 | |||
69 | if (optreset || !*place) { /* update scanning pointer */ | ||
70 | optreset = 0; | ||
71 | if (optind >= nargc || *(place = nargv[optind]) != '-') { | ||
72 | place = EMSG; | ||
73 | return (-1); | ||
74 | } | ||
75 | if (place[1] && *++place == '-') { /* found "--" */ | ||
76 | ++optind; | ||
77 | place = EMSG; | ||
78 | return (-1); | ||
79 | } | ||
80 | } /* option letter okay? */ | ||
81 | if ((optopt = (int)*place++) == (int)':' || | ||
82 | !(oli = strchr(ostr, optopt))) { | ||
83 | /* | ||
84 | * if the user didn't specify '-' as an option, | ||
85 | * assume it means -1. | ||
86 | */ | ||
87 | if (optopt == (int)'-') | ||
88 | return (-1); | ||
89 | if (!*place) | ||
90 | ++optind; | ||
91 | if (opterr && *ostr != ':') | ||
92 | (void)fprintf(stderr, | ||
93 | "%s: illegal option -- %c\n", __progname, optopt); | ||
94 | return (BADCH); | ||
95 | } | ||
96 | if (*++oli != ':') { /* don't need argument */ | ||
97 | optarg = NULL; | ||
98 | if (!*place) | ||
99 | ++optind; | ||
100 | } | ||
101 | else { /* need an argument */ | ||
102 | if (*place) /* no white space */ | ||
103 | optarg = place; | ||
104 | else if (nargc <= ++optind) { /* no arg */ | ||
105 | place = EMSG; | ||
106 | if (*ostr == ':') | ||
107 | return (BADARG); | ||
108 | if (opterr) | ||
109 | (void)fprintf(stderr, | ||
110 | "%s: option requires an argument -- %c\n", | ||
111 | __progname, optopt); | ||
112 | return (BADCH); | ||
113 | } | ||
114 | else /* white space */ | ||
115 | optarg = nargv[optind]; | ||
116 | place = EMSG; | ||
117 | ++optind; | ||
118 | } | ||
119 | return (optopt); /* dump back option letter */ | ||
120 | } | ||
121 | |||
122 | #endif /* !defined(HAVE_GETOPT) || !defined(HAVE_OPTRESET) */ | ||
diff --git a/openbsd-compat/getopt.h b/openbsd-compat/getopt.h new file mode 100644 index 000000000..51810b17c --- /dev/null +++ b/openbsd-compat/getopt.h | |||
@@ -0,0 +1,14 @@ | |||
1 | /* $Id: getopt.h,v 1.1 2001/07/14 03:22:54 djm Exp $ */ | ||
2 | |||
3 | #ifndef _GETOPT_H | ||
4 | #define _GETOPT_H | ||
5 | |||
6 | #include "config.h" | ||
7 | |||
8 | #ifndef HAVE_GETOPT_H | ||
9 | |||
10 | int getopt(int argc, char **argv, char *opts); | ||
11 | |||
12 | #endif | ||
13 | |||
14 | #endif /* _GETOPT_H */ | ||
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h index 723da7b79..ca7871c0d 100644 --- a/openbsd-compat/openbsd-compat.h +++ b/openbsd-compat/openbsd-compat.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: openbsd-compat.h,v 1.10 2001/06/29 12:32:33 mouring Exp $ */ | 1 | /* $Id: openbsd-compat.h,v 1.11 2001/07/14 03:22:54 djm Exp $ */ |
2 | 2 | ||
3 | #ifndef _OPENBSD_H | 3 | #ifndef _OPENBSD_H |
4 | #define _OPENBSD_H | 4 | #define _OPENBSD_H |
@@ -25,6 +25,7 @@ | |||
25 | #include "getgrouplist.h" | 25 | #include "getgrouplist.h" |
26 | #include "glob.h" | 26 | #include "glob.h" |
27 | #include "readpassphrase.h" | 27 | #include "readpassphrase.h" |
28 | #include "getopt.h" | ||
28 | 29 | ||
29 | /* Home grown routines */ | 30 | /* Home grown routines */ |
30 | #include "bsd-arc4random.h" | 31 | #include "bsd-arc4random.h" |
@@ -259,6 +259,10 @@ main(int ac, char **av) | |||
259 | struct passwd *pw; | 259 | struct passwd *pw; |
260 | int dummy; | 260 | int dummy; |
261 | uid_t original_effective_uid; | 261 | uid_t original_effective_uid; |
262 | extern int optopt; | ||
263 | extern int optind; | ||
264 | extern int optreset; | ||
265 | extern char *optarg; | ||
262 | 266 | ||
263 | __progname = get_progname(av[0]); | 267 | __progname = get_progname(av[0]); |
264 | init_rng(); | 268 | init_rng(); |