mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-19 10:53:58 +00:00
Code Issues Releases Activity

Style.

Browse Source 
Sponsored by:	The FreeBSD Foundation
MFC after:	2 weeks
This commit is contained in:
Konstantin Belousov 2017-05-15 17:54:36 +00:00
parent b5fc583c27
commit cf5cedd785
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=318303
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/libc/stdlib/realpath.c
View File

@ -89,7 +89,7 @@ realpath1(const char *path, char *resolved)
*/
p = strchr(left, '/');
next_token_len = p ? p - left : left_len;
next_token_len = p != NULL ? p - left : left_len;
memcpy(next_token, left, next_token_len);
next_token[next_token_len] = '\0';
@ -112,10 +112,9 @@ realpath1(const char *path, char *resolved)
if (next_token[0] == '\0') {
/* Handle consequential slashes. */
continue;
}
else if (strcmp(next_token, ".") == 0)
} else if (strcmp(next_token, ".") == 0) {
continue;
else if (strcmp(next_token, "..") == 0) {
} else if (strcmp(next_token, "..") == 0) {
/*
* Strip the last path component except when we have
* single "/"
@ -146,13 +145,12 @@ realpath1(const char *path, char *resolved)
}
slen = readlink(resolved, symlink, sizeof(symlink));
if (slen <= 0 || slen >= sizeof(symlink)) {
if (slen < 0) {
/* keep errno from readlink(2) call */
} else if (slen == 0) {
if (slen < 0)
; /* keep errno from readlink(2) call */
else if (slen == 0)
errno = ENOENT;
} else {
else
errno = ENAMETOOLONG;
}
return (NULL);
}
symlink[slen] = '\0';