fd85bff53e
It turns out that the path normalization that our brand new copy of dirname(3) does is actually not allowed by the draft version of the upcoming version of POSIX. It has to behave identically to the dirname(1) utility. This change replaces our new dirname(3) implementation by yet another version that doesn't implement the path normalization logic; it merely looks for the end of the directory name and overwrites that with a null byte. More details: See note #3370 at http://austingroupbugs.net/view.php?id=1073 PR: 212193 Reviewed by: emaste, jilles Differential Revision: https://reviews.freebsd.org/D7790
74 lines
2.3 KiB
C
74 lines
2.3 KiB
C
/*-
|
|
* Copyright (c) 2015-2016 Nuxi, https://nuxi.nl/
|
|
*
|
|
* 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.
|
|
*
|
|
* 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 <libgen.h>
|
|
#include <string.h>
|
|
|
|
char *
|
|
(dirname)(char *path)
|
|
{
|
|
char *end;
|
|
|
|
/*
|
|
* If path is a null pointer or points to an empty string,
|
|
* dirname() shall return a pointer to the string ".".
|
|
*/
|
|
if (path == NULL || *path == '\0')
|
|
return (__DECONST(char *, "."));
|
|
|
|
/* Find end of last pathname component. */
|
|
end = path + strlen(path);
|
|
while (end > path + 1 && *(end - 1) == '/')
|
|
--end;
|
|
|
|
/* Strip off the last pathname component. */
|
|
while (end > path && *(end - 1) != '/')
|
|
--end;
|
|
|
|
/*
|
|
* If path does not contain a '/', then dirname() shall return a
|
|
* pointer to the string ".".
|
|
*/
|
|
if (end == path) {
|
|
path[0] = '.';
|
|
path[1] = '\0';
|
|
return (path);
|
|
}
|
|
|
|
/*
|
|
* Remove trailing slashes from the resulting directory name. Ensure
|
|
* that at least one character remains.
|
|
*/
|
|
while (end > path + 1 && *(end - 1) == '/')
|
|
--end;
|
|
|
|
/* Null terminate directory name and return it. */
|
|
*end = '\0';
|
|
return (path);
|
|
}
|