Page MenuHomeFreeBSD
Files F148510328

D10670.id28355.diff
No OneTemporary
Actions

D10670.id28355.diff
View Options

Index: lib/libc/stdlib/realpath.c
===================================================================
--- lib/libc/stdlib/realpath.c
+++ lib/libc/stdlib/realpath.c
@@ -47,31 +47,16 @@
* components. Returns (resolved) on success, or (NULL) on failure,
* in which case the path which caused trouble is left in (resolved).
*/
-char *
-realpath(const char * __restrict path, char * __restrict resolved)
+static char *
+realpath1(const char *path, char *resolved)
{
struct stat sb;
char *p, *q, *s;
size_t left_len, resolved_len;
unsigned symlinks;
- int m, slen;
+ int slen;
char left[PATH_MAX], next_token[PATH_MAX], symlink[PATH_MAX];
- if (path == NULL) {
- errno = EINVAL;
- return (NULL);
- }
- if (path[0] == '\0') {
- errno = ENOENT;
- return (NULL);
- }
- if (resolved == NULL) {
- resolved = malloc(PATH_MAX);
- if (resolved == NULL)
- return (NULL);
- m = 1;
- } else
- m = 0;
symlinks = 0;
if (path[0] == '/') {
resolved[0] = '/';
@@ -82,20 +67,14 @@
left_len = strlcpy(left, path + 1, sizeof(left));
} else {
if (getcwd(resolved, PATH_MAX) == NULL) {
- if (m)
- free(resolved);
- else {
- resolved[0] = '.';
- resolved[1] = '\0';
- }
+ resolved[0] = '.';
+ resolved[1] = '\0';
return (NULL);
}
resolved_len = strlen(resolved);
left_len = strlcpy(left, path, sizeof(left));
}
if (left_len >= sizeof(left) || resolved_len >= PATH_MAX) {
- if (m)
- free(resolved);
errno = ENAMETOOLONG;
return (NULL);
}
@@ -111,8 +90,6 @@
p = strchr(left, '/');
s = p ? p : left + left_len;
if (s - left >= sizeof(next_token)) {
- if (m)
- free(resolved);
errno = ENAMETOOLONG;
return (NULL);
}
@@ -123,8 +100,6 @@
memmove(left, s + 1, left_len + 1);
if (resolved[resolved_len - 1] != '/') {
if (resolved_len + 1 >= PATH_MAX) {
- if (m)
- free(resolved);
errno = ENAMETOOLONG;
return (NULL);
}
@@ -156,29 +131,19 @@
*/
resolved_len = strlcat(resolved, next_token, PATH_MAX);
if (resolved_len >= PATH_MAX) {
- if (m)
- free(resolved);
errno = ENAMETOOLONG;
return (NULL);
}
- if (lstat(resolved, &sb) != 0) {
- if (m)
- free(resolved);
+ if (lstat(resolved, &sb) != 0)
return (NULL);
- }
if (S_ISLNK(sb.st_mode)) {
if (symlinks++ > MAXSYMLINKS) {
- if (m)
- free(resolved);
errno = ELOOP;
return (NULL);
}
slen = readlink(resolved, symlink, sizeof(symlink) - 1);
- if (slen < 0) {
- if (m)
- free(resolved);
+ if (slen < 0)
return (NULL);
- }
symlink[slen] = '\0';
if (symlink[0] == '/') {
resolved[1] = 0;
@@ -199,8 +164,6 @@
if (p != NULL) {
if (symlink[slen - 1] != '/') {
if (slen + 1 >= sizeof(symlink)) {
- if (m)
- free(resolved);
errno = ENAMETOOLONG;
return (NULL);
}
@@ -210,16 +173,12 @@
left_len = strlcat(symlink, left,
sizeof(symlink));
if (left_len >= sizeof(left)) {
- if (m)
- free(resolved);
errno = ENAMETOOLONG;
return (NULL);
}
}
left_len = strlcpy(left, symlink, sizeof(left));
} else if (!S_ISDIR(sb.st_mode) && p != NULL) {
- if (m)
- free(resolved);
errno = ENOTDIR;
return (NULL);
}
@@ -233,3 +192,29 @@
resolved[resolved_len - 1] = '\0';
return (resolved);
}
+
+char *
+realpath(const char * __restrict path, char * __restrict resolved)
+{
+ char *m, *res;
+
+ if (path == NULL) {
+ errno = EINVAL;
+ return (NULL);
+ }
+ if (path[0] == '\0') {
+ errno = ENOENT;
+ return (NULL);
+ }
+ if (resolved != NULL) {
+ m = NULL;
+ } else {
+ m = resolved = malloc(PATH_MAX);
+ if (resolved == NULL)
+ return (NULL);
+ }
+ res = realpath1(path, resolved);
+ if (res == NULL)
+ free(m);
+ return (res);
+}

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 19, 8:48 AM (3 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29957117
Default Alt Text
D10670.id28355.diff (3 KB)

Event Timeline