RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-02-27 19:31:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [openbsd-compat/basename.c] Update from OpenBSD 1.11 -> 1.14.

Browse Source 
Removal of rcsid, will no longer strlcpy parts of the string.
This commit is contained in:
Darren Tucker 2005-11-10 16:42:51 +11:00
parent 09471d8a1f
commit ad1dada0b4
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -21,6 +21,8 @@
- (dtucker) [openbsd-compat/sigact.h] Add "OPENBSD ORIGINAL" marker. - (dtucker) [openbsd-compat/sigact.h] Add "OPENBSD ORIGINAL" marker.
- (dtucker) [openbsd-compat/strmode.c] Update from OpenBSD 1.5 -> 1.7. - (dtucker) [openbsd-compat/strmode.c] Update from OpenBSD 1.5 -> 1.7.
Removal of rcsid, "whiteout" inode type. Removal of rcsid, "whiteout" inode type.
- (dtucker) [openbsd-compat/basename.c] Update from OpenBSD 1.11 -> 1.14.
Removal of rcsid, will no longer strlcpy parts of the string.
20051105 20051105
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync
@ -3263,4 +3265,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3965 2005/11/10 05:38:54 dtucker Exp $ $Id: ChangeLog,v 1.3966 2005/11/10 05:42:51 dtucker Exp $

35
openbsd-compat/basename.c
View File

@ -1,7 +1,7 @@
/* $OpenBSD: basename.c,v 1.11 2003/06/17 21:56:23 millert Exp $ */ /* $OpenBSD: basename.c,v 1.14 2005/08/08 08:05:33 espie Exp $ */
/* /*
* Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com> * Copyright (c) 1997, 2004 Todd C. Miller <Todd.Miller@courtesan.com>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -21,31 +21,30 @@
#include "includes.h" #include "includes.h"
#ifndef HAVE_BASENAME #ifndef HAVE_BASENAME
#ifndef lint
static char rcsid[] = "$OpenBSD: basename.c,v 1.11 2003/06/17 21:56:23 millert Exp $";
#endif /* not lint */
char * char *
basename(const char *path) basename(const char *path)
{ {
static char bname[MAXPATHLEN]; static char bname[MAXPATHLEN];
register const char *endp, *startp; size_t len;
const char *endp, *startp;
/* Empty or NULL string gets treated as "." */ /* Empty or NULL string gets treated as "." */
if (path == NULL || *path == '\0') { if (path == NULL || *path == '\0') {
(void)strlcpy(bname, ".", sizeof bname); bname[0] = '.';
return(bname); bname[1] = '\0';
return (bname);
} }
/* Strip trailing slashes */ /* Strip any trailing slashes */
endp = path + strlen(path) - 1; endp = path + strlen(path) - 1;
while (endp > path && *endp == '/') while (endp > path && *endp == '/')
endp--; endp--;
/* All slashes become "/" */ /* All slashes becomes "/" */
if (endp == path && *endp == '/') { if (endp == path && *endp == '/') {
(void)strlcpy(bname, "/", sizeof bname); bname[0] = '/';
return(bname); bname[1] = '\0';
return (bname);
} }
/* Find the start of the base */ /* Find the start of the base */
@ -53,12 +52,14 @@ basename(const char *path)
while (startp > path && *(startp - 1) != '/') while (startp > path && *(startp - 1) != '/')
startp--; startp--;
if (endp - startp + 2 > sizeof(bname)) { len = endp - startp + 1;
if (len >= sizeof(bname)) {
errno = ENAMETOOLONG; errno = ENAMETOOLONG;
return(NULL); return (NULL);
} }
strlcpy(bname, startp, endp - startp + 2); memcpy(bname, startp, len);
return(bname); bname[len] = '\0';
return (bname);
} }
#endif /* !defined(HAVE_BASENAME) */ #endif /* !defined(HAVE_BASENAME) */