generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 252c1ac9: Merge "Update our FreeBSD realpath(3) to upstream head."

Browse Source 
* commit '252c1ac9738ff6187354f243ef118eac962b65dc':
  Update our FreeBSD realpath(3) to upstream head.
This commit is contained in:
Elliott Hughes 2014-10-01 00:05:58 +00:00 committed by Android Git Automerger
commit d0fb0873f5
2 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libc/upstream-freebsd/lib/libc/stdlib/realpath.c
View File

@ -132,26 +132,7 @@ realpath(const char * __restrict path, char * __restrict resolved)
resolved[resolved_len] = '\0';
}
if (next_token[0] == '\0') {
/*
* Handle consequential slashes. The path
* before slash shall point to a directory.
*
* Only the trailing slashes are not covered
* by other checks in the loop, but we verify
* the prefix for any (rare) "//" or "/\0"
* occurence to not implement lookahead.
*/
if (lstat(resolved, &sb) != 0) {
if (m)
free(resolved);
return (NULL);
}
if (!S_ISDIR(sb.st_mode)) {
if (m)
free(resolved);
errno = ENOTDIR;
return (NULL);
}
/* Handle consequential slashes. */
continue;
}
else if (strcmp(next_token, ".") == 0)
@ -236,6 +217,11 @@ realpath(const char * __restrict path, char * __restrict resolved)
}
}
left_len = strlcpy(left, symlink, sizeof(left));
} else if (!S_ISDIR(sb.st_mode) && p != NULL) {
if (m)
free(resolved);
errno = ENOTDIR;
return (NULL);
}
}

12
tests/stdlib_test.cpp
View File

@ -99,6 +99,18 @@ TEST(stdlib, realpath__ENOENT) {
ASSERT_EQ(ENOENT, errno);
}
TEST(stdlib, realpath__component_after_non_directory) {
errno = 0;
char* p = realpath("/dev/null/.", NULL);
ASSERT_TRUE(p == NULL);
ASSERT_EQ(ENOTDIR, errno);
errno = 0;
p = realpath("/dev/null/..", NULL);
ASSERT_TRUE(p == NULL);
ASSERT_EQ(ENOTDIR, errno);
}
TEST(stdlib, realpath) {
// Get the name of this executable.
char executable_path[PATH_MAX];