diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | openbsd-compat/Makefile.in | 4 | ||||
-rw-r--r-- | openbsd-compat/basename.c | 73 | ||||
-rw-r--r-- | openbsd-compat/basename.h | 12 | ||||
-rw-r--r-- | openbsd-compat/openbsd-compat.h | 3 |
6 files changed, 93 insertions, 6 deletions
@@ -82,6 +82,7 @@ | |||
82 | - (djm) Bug #501: gai_strerror should return char*; | 82 | - (djm) Bug #501: gai_strerror should return char*; |
83 | fix from dtucker@zip.com.au | 83 | fix from dtucker@zip.com.au |
84 | - (djm) Most of Bug #499: Cygwin compile fixes for new progressmeter | 84 | - (djm) Most of Bug #499: Cygwin compile fixes for new progressmeter |
85 | - (djm) Rest of Bug #499: Import a basename() function from OpenBSD libc | ||
85 | 86 | ||
86 | 20030211 | 87 | 20030211 |
87 | - (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com | 88 | - (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com |
@@ -1182,4 +1183,4 @@ | |||
1182 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 1183 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
1183 | ok provos@ | 1184 | ok provos@ |
1184 | 1185 | ||
1185 | $Id: ChangeLog,v 1.2618 2003/02/24 01:47:15 djm Exp $ | 1186 | $Id: ChangeLog,v 1.2619 2003/02/24 01:55:55 djm Exp $ |
diff --git a/configure.ac b/configure.ac index 6965c05f2..20110761b 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.107 2003/02/24 01:47:16 djm Exp $ | 1 | # $Id: configure.ac,v 1.108 2003/02/24 01:55:55 djm Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -601,7 +601,7 @@ AC_ARG_WITH(tcp-wrappers, | |||
601 | ) | 601 | ) |
602 | 602 | ||
603 | dnl Checks for library functions. | 603 | dnl Checks for library functions. |
604 | AC_CHECK_FUNCS(arc4random b64_ntop bcopy bindresvport_sa \ | 604 | AC_CHECK_FUNCS(arc4random b64_ntop bcopy basename bindresvport_sa \ |
605 | clock fchmod fchown freeaddrinfo futimes gai_strerror \ | 605 | clock fchmod fchown freeaddrinfo futimes gai_strerror \ |
606 | getaddrinfo getcwd getgrouplist getnameinfo getopt getpeereid\ | 606 | getaddrinfo getcwd getgrouplist getnameinfo getopt getpeereid\ |
607 | getrlimit getrusage getttyent glob inet_aton inet_ntoa \ | 607 | getrlimit getrusage getttyent glob inet_aton inet_ntoa \ |
diff --git a/openbsd-compat/Makefile.in b/openbsd-compat/Makefile.in index 8b1e5b538..8615e3633 100644 --- a/openbsd-compat/Makefile.in +++ b/openbsd-compat/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.24 2003/01/07 06:04:18 djm Exp $ | 1 | # $Id: Makefile.in,v 1.25 2003/02/24 01:55:56 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 getopt.o glob.o inet_aton.o inet_ntoa.o inet_ntop.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 basename.o bindresvport.o daemon.o dirname.o getcwd.o getgrouplist.o getopt.o glob.o inet_aton.o inet_ntoa.o inet_ntop.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-cray.o bsd-cygwin_util.o bsd-getpeereid.o bsd-misc.o bsd-nextstep.o bsd-snprintf.o bsd-waitpid.o fake-getaddrinfo.o fake-getnameinfo.o xmmap.o | 21 | COMPAT=bsd-arc4random.o bsd-cray.o bsd-cygwin_util.o bsd-getpeereid.o bsd-misc.o bsd-nextstep.o bsd-snprintf.o bsd-waitpid.o fake-getaddrinfo.o fake-getnameinfo.o xmmap.o |
22 | 22 | ||
diff --git a/openbsd-compat/basename.c b/openbsd-compat/basename.c new file mode 100644 index 000000000..5a3823bc5 --- /dev/null +++ b/openbsd-compat/basename.c | |||
@@ -0,0 +1,73 @@ | |||
1 | /* $OpenBSD: basename.c,v 1.8 2002/06/09 05:03:59 deraadt Exp $ */ | ||
2 | |||
3 | /* | ||
4 | * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com> | ||
5 | * All rights reserved. | ||
6 | * | ||
7 | * Redistribution and use in source and binary forms, with or without | ||
8 | * modification, are permitted provided that the following conditions | ||
9 | * are met: | ||
10 | * 1. Redistributions of source code must retain the above copyright | ||
11 | * notice, this list of conditions and the following disclaimer. | ||
12 | * 2. Redistributions in binary form must reproduce the above copyright | ||
13 | * notice, this list of conditions and the following disclaimer in the | ||
14 | * documentation and/or other materials provided with the distribution. | ||
15 | * 3. The name of the author may not be used to endorse or promote products | ||
16 | * derived from this software without specific prior written permission. | ||
17 | * | ||
18 | * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, | ||
19 | * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY | ||
20 | * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL | ||
21 | * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | ||
22 | * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | ||
23 | * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | ||
24 | * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | ||
25 | * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | ||
26 | * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | ||
27 | * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
28 | */ | ||
29 | #include "includes.h" | ||
30 | |||
31 | #if !defined(HAVE_BASENAME) | ||
32 | |||
33 | #ifndef lint | ||
34 | static char rcsid[] = "$OpenBSD: basename.c,v 1.8 2002/06/09 05:03:59 deraadt Exp $"; | ||
35 | #endif /* not lint */ | ||
36 | |||
37 | char * | ||
38 | basename(const char *path) | ||
39 | { | ||
40 | static char bname[MAXPATHLEN]; | ||
41 | register const char *endp, *startp; | ||
42 | |||
43 | /* Empty or NULL string gets treated as "." */ | ||
44 | if (path == NULL || *path == '\0') { | ||
45 | (void)strlcpy(bname, ".", sizeof bname); | ||
46 | return(bname); | ||
47 | } | ||
48 | |||
49 | /* Strip trailing slashes */ | ||
50 | endp = path + strlen(path) - 1; | ||
51 | while (endp > path && *endp == '/') | ||
52 | endp--; | ||
53 | |||
54 | /* All slashes become "/" */ | ||
55 | if (endp == path && *endp == '/') { | ||
56 | (void)strlcpy(bname, "/", sizeof bname); | ||
57 | return(bname); | ||
58 | } | ||
59 | |||
60 | /* Find the start of the base */ | ||
61 | startp = endp; | ||
62 | while (startp > path && *(startp - 1) != '/') | ||
63 | startp--; | ||
64 | |||
65 | if (endp - startp + 2 > sizeof(bname)) { | ||
66 | errno = ENAMETOOLONG; | ||
67 | return(NULL); | ||
68 | } | ||
69 | strlcpy(bname, startp, endp - startp + 2); | ||
70 | return(bname); | ||
71 | } | ||
72 | |||
73 | #endif /* !defined(HAVE_BASENAME) */ | ||
diff --git a/openbsd-compat/basename.h b/openbsd-compat/basename.h new file mode 100644 index 000000000..0a14ff5c1 --- /dev/null +++ b/openbsd-compat/basename.h | |||
@@ -0,0 +1,12 @@ | |||
1 | /* $Id: basename.h,v 1.1 2003/02/24 01:55:56 djm Exp $ */ | ||
2 | |||
3 | #ifndef _BASENAME_H | ||
4 | #define _BASENAME_H | ||
5 | #include "config.h" | ||
6 | |||
7 | #if !defined(HAVE_BASENAME) | ||
8 | |||
9 | char *getcwd(char *pt, size_t size); | ||
10 | |||
11 | #endif /* !defined(HAVE_BASENAME) */ | ||
12 | #endif /* _BASENAME_H */ | ||
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h index dcb7ba15b..c3e19b9cb 100644 --- a/openbsd-compat/openbsd-compat.h +++ b/openbsd-compat/openbsd-compat.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: openbsd-compat.h,v 1.18 2003/01/07 06:04:18 djm Exp $ */ | 1 | /* $Id: openbsd-compat.h,v 1.19 2003/02/24 01:55:56 djm Exp $ */ |
2 | 2 | ||
3 | #ifndef _OPENBSD_H | 3 | #ifndef _OPENBSD_H |
4 | #define _OPENBSD_H | 4 | #define _OPENBSD_H |
@@ -6,6 +6,7 @@ | |||
6 | #include "config.h" | 6 | #include "config.h" |
7 | 7 | ||
8 | /* OpenBSD function replacements */ | 8 | /* OpenBSD function replacements */ |
9 | #include "basename.h" | ||
9 | #include "bindresvport.h" | 10 | #include "bindresvport.h" |
10 | #include "getcwd.h" | 11 | #include "getcwd.h" |
11 | #include "realpath.h" | 12 | #include "realpath.h" |