e2f6816100
Now that we've updated the prototypes of the basename(3) and dirname(3) functions to conform to POSIX, let's go ahead and reimplement dirname(3) in such a way that it's thread-safe, but also guaranteed to succeed. C libraries like glibc, musl and the one that's part of Solaris already follow such an approach. Move the existing implementation to another source file, freebsd11_dirname.c to keep existing users of the API that pass in a constant string happy, using symbol versioning. Put a new version of the function in dirname.c, obtained from CloudABI's C library. This version scans through the pathname string from left to right, normalizing it, while discarding the last pathname component. Reviewed by: emaste, jilles Differential Revision: https://reviews.freebsd.org/D7355
80 lines
2.0 KiB
C
80 lines
2.0 KiB
C
/* $OpenBSD: dirname.c,v 1.13 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 *
|
|
__freebsd11_dirname(char *path)
|
|
{
|
|
static char *dname = NULL;
|
|
size_t len;
|
|
const char *endp;
|
|
|
|
if (dname == NULL) {
|
|
dname = (char *)malloc(MAXPATHLEN);
|
|
if (dname == NULL)
|
|
return(NULL);
|
|
}
|
|
|
|
/* Empty or NULL string gets treated as "." */
|
|
if (path == NULL || *path == '\0') {
|
|
dname[0] = '.';
|
|
dname[1] = '\0';
|
|
return (dname);
|
|
}
|
|
|
|
/* Strip any trailing slashes */
|
|
endp = path + strlen(path) - 1;
|
|
while (endp > path && *endp == '/')
|
|
endp--;
|
|
|
|
/* Find the start of the dir */
|
|
while (endp > path && *endp != '/')
|
|
endp--;
|
|
|
|
/* Either the dir is "/" or there are no slashes */
|
|
if (endp == path) {
|
|
dname[0] = *endp == '/' ? '/' : '.';
|
|
dname[1] = '\0';
|
|
return (dname);
|
|
} else {
|
|
/* Move forward past the separating slashes */
|
|
do {
|
|
endp--;
|
|
} while (endp > path && *endp == '/');
|
|
}
|
|
|
|
len = endp - path + 1;
|
|
if (len >= MAXPATHLEN) {
|
|
errno = ENAMETOOLONG;
|
|
return (NULL);
|
|
}
|
|
memcpy(dname, path, len);
|
|
dname[len] = '\0';
|
|
return (dname);
|
|
}
|
|
|
|
__sym_compat(dirname, __freebsd11_dirname, FBSD_1.0);
|