-
Notifications
You must be signed in to change notification settings - Fork 2.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Replace basename(3) by a thread-safe implementation.
Now that the changes to the dirname(3) function had some time to settle, let's go ahead and use the same approach for replacing basename(3) by a simple implementation that modifies the input string, thereby making it thread-safe and guaranteed to succeed. Unlike dirname(3), this function already had a thread-safe variant basename_r(3). This function had its own set of problems, like having an upper bound on the pathname length. Keep this function around for compatibility, but remove most references from the man page. Make the man page more similar to that of dirname(3). As the basename_r(3) function is only provided by FreeBSD (and Bionic), depending on its use is even more implementation defined than assuming that basename(3) is thread-safe. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D8382
- Loading branch information
Ed Schouten
authored and
Ed Schouten
committed
Nov 3, 2016
1 parent
1bec4c5
commit 34168b2
Showing
6 changed files
with
157 additions
and
130 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,79 +1,54 @@ | ||
| /* $OpenBSD: basename.c,v 1.14 2005/08/08 08:05:33 espie Exp $ */ | ||
|
|
||
| /* | ||
| * Copyright (c) 1997, 2004 Todd C. Miller <Todd.Miller@courtesan.com> | ||
| /*- | ||
| * Copyright (c) 2015-2016 Nuxi, https://nuxi.nl/ | ||
| * | ||
| * Permission to use, copy, modify, and distribute this software for any | ||
| * purpose with or without fee is hereby granted, provided that the above | ||
| * copyright notice and this permission notice appear in all copies. | ||
| * 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. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
| * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
| * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
| * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
| * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
| * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
| * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
| * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. | ||
| */ | ||
|
|
||
| #include <sys/cdefs.h> | ||
| __FBSDID("$FreeBSD$"); | ||
|
|
||
| #include <errno.h> | ||
| #include <libgen.h> | ||
| #include <stdlib.h> | ||
| #include <string.h> | ||
| #include <sys/param.h> | ||
|
|
||
| char * | ||
| basename_r(const char *path, char *bname) | ||
| (basename)(char *path) | ||
| { | ||
| const char *endp, *startp; | ||
| size_t len; | ||
|
|
||
| /* Empty or NULL string gets treated as "." */ | ||
| if (path == NULL || *path == '\0') { | ||
| bname[0] = '.'; | ||
| bname[1] = '\0'; | ||
| return (bname); | ||
| } | ||
|
|
||
| /* Strip any trailing slashes */ | ||
| endp = path + strlen(path) - 1; | ||
| while (endp > path && *endp == '/') | ||
| endp--; | ||
|
|
||
| /* All slashes becomes "/" */ | ||
| if (endp == path && *endp == '/') { | ||
| bname[0] = '/'; | ||
| bname[1] = '\0'; | ||
| return (bname); | ||
| } | ||
|
|
||
| /* Find the start of the base */ | ||
| startp = endp; | ||
| while (startp > path && *(startp - 1) != '/') | ||
| startp--; | ||
|
|
||
| len = endp - startp + 1; | ||
| if (len >= MAXPATHLEN) { | ||
| errno = ENAMETOOLONG; | ||
| return (NULL); | ||
| } | ||
| memcpy(bname, startp, len); | ||
| bname[len] = '\0'; | ||
| return (bname); | ||
| } | ||
|
|
||
| char * | ||
| basename(char *path) | ||
| { | ||
| static char *bname = NULL; | ||
|
|
||
| if (bname == NULL) { | ||
| bname = (char *)malloc(MAXPATHLEN); | ||
| if (bname == NULL) | ||
| return (NULL); | ||
| } | ||
| return (basename_r(path, bname)); | ||
| char *ptr; | ||
|
|
||
| /* | ||
| * If path is a null pointer or points to an empty string, | ||
| * basename() shall return a pointer to the string ".". | ||
| */ | ||
| if (path == NULL || *path == '\0') | ||
| return (__DECONST(char *, ".")); | ||
|
|
||
| /* Find end of last pathname component and null terminate it. */ | ||
| ptr = path + strlen(path); | ||
| while (ptr > path + 1 && *(ptr - 1) == '/') | ||
| --ptr; | ||
| *ptr-- = '\0'; | ||
|
|
||
| /* Find beginning of last pathname component. */ | ||
| while (ptr > path && *(ptr - 1) != '/') | ||
| --ptr; | ||
| return (ptr); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /* $OpenBSD: basename.c,v 1.14 2005/08/08 08:05:33 espie Exp $ */ | ||
|
|
||
| /* | ||
| * Copyright (c) 1997, 2004 Todd C. Miller <Todd.Miller@courtesan.com> | ||
| * | ||
| * Permission to use, copy, modify, and distribute this software for any | ||
| * purpose with or without fee is hereby granted, provided that the above | ||
| * copyright notice and this permission notice appear in all copies. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
| * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
| * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
| * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
| * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
| * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
| * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
| */ | ||
|
|
||
| #include <sys/cdefs.h> | ||
| __FBSDID("$FreeBSD$"); | ||
|
|
||
| #include <errno.h> | ||
| #include <libgen.h> | ||
| #include <stdlib.h> | ||
| #include <string.h> | ||
| #include <sys/param.h> | ||
|
|
||
| char * | ||
| basename_r(const char *path, char *bname) | ||
| { | ||
| const char *endp, *startp; | ||
| size_t len; | ||
|
|
||
| /* Empty or NULL string gets treated as "." */ | ||
| if (path == NULL || *path == '\0') { | ||
| bname[0] = '.'; | ||
| bname[1] = '\0'; | ||
| return (bname); | ||
| } | ||
|
|
||
| /* Strip any trailing slashes */ | ||
| endp = path + strlen(path) - 1; | ||
| while (endp > path && *endp == '/') | ||
| endp--; | ||
|
|
||
| /* All slashes becomes "/" */ | ||
| if (endp == path && *endp == '/') { | ||
| bname[0] = '/'; | ||
| bname[1] = '\0'; | ||
| return (bname); | ||
| } | ||
|
|
||
| /* Find the start of the base */ | ||
| startp = endp; | ||
| while (startp > path && *(startp - 1) != '/') | ||
| startp--; | ||
|
|
||
| len = endp - startp + 1; | ||
| if (len >= MAXPATHLEN) { | ||
| errno = ENAMETOOLONG; | ||
| return (NULL); | ||
| } | ||
| memcpy(bname, startp, len); | ||
| bname[len] = '\0'; | ||
| return (bname); | ||
| } | ||
|
|
||
| char * | ||
| __freebsd11_basename(char *path) | ||
| { | ||
| static char *bname = NULL; | ||
|
|
||
| if (bname == NULL) { | ||
| bname = (char *)malloc(MAXPATHLEN); | ||
| if (bname == NULL) | ||
| return (NULL); | ||
| } | ||
| return (basename_r(path, bname)); | ||
| } | ||
|
|
||
| __sym_compat(basename, __freebsd11_basename, FBSD_1.0); |