Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libroot: Accept NULL for the resolved_name argument of realpath()

Browse Source 
as specified in IEEE Std 1003.1, 2013 Edition, see
http://pubs.opengroup.org/onlinepubs/9699919799/functions/realpath.html

In this case, the returned buffer is allocated with realpath() and can be
deallocated by the caller with free().
The behavior was only "implementation defined" in previous revisions like
IEEE Std 1003.1, 2004 Edition, see
http://pubs.opengroup.org/onlinepubs/000095399/functions/realpath.html

Signed-off-by: Jérôme Duval <jerome.duval@gmail.com>
This commit is contained in:
Olivier Coursière 2013-08-17 17:40:46 +00:00 committed by Jérôme Duval
parent 1bb144a926
commit be6d2f97cd
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/system/libroot/posix/stdlib/realpath.cpp
View File

@ -1,4 +1,5 @@
/*
* Copyright 2013, Olivier Coursière, olivier.coursiere@laposte.net.
* Copyright 2009, Axel Dörfler, axeld@pinc-software.de.
* Distributed under the terms of the MIT License.
*/
@ -16,16 +17,31 @@
char*
realpath(const char* path, char* resolved)
{
status_t status = _kern_normalize_path(path, true, resolved);
char* resolvedPath = resolved;
if (resolvedPath == NULL) {
resolvedPath = (char*)malloc(PATH_MAX + 1);
if (resolvedPath == NULL) {
__set_errno(B_NO_MEMORY);
return NULL;
}
}
status_t status = _kern_normalize_path(path, true, resolvedPath);
if (status != B_OK) {
__set_errno(status);
if (resolved == NULL)
free(resolvedPath);
return NULL;
}
// The path must actually exist, not just its parent directories
struct stat stat;
if (lstat(resolved, &stat) != 0)
if (lstat(resolvedPath, &stat) != 0) {
if (resolved == NULL)
free(resolvedPath);
return NULL;
}
return resolved;
return resolvedPath;
}