diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-02 01:52:28 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-02 01:52:28 +0000 |
| commit | 450f92eb7165131ff3fdb2f80ec2fc65254f5ccb (patch) | |
| tree | 4a0260d6717520379b98af80419feda2ca7cea29 /libc/stdlib/realpath.c | |
| parent | 6fd3ac79613c9e1832513b0f614860be2735993f (diff) | |
| download | uClibc-alpine-450f92eb7165131ff3fdb2f80ec2fc65254f5ccb.tar.bz2 uClibc-alpine-450f92eb7165131ff3fdb2f80ec2fc65254f5ccb.tar.xz | |
Merge from trunk.
Diffstat (limited to 'libc/stdlib/realpath.c')
| -rw-r--r-- | libc/stdlib/realpath.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libc/stdlib/realpath.c b/libc/stdlib/realpath.c index c3628b745..7266ba4c6 100644 --- a/libc/stdlib/realpath.c +++ b/libc/stdlib/realpath.c @@ -59,11 +59,11 @@ char resolved_path[]; int n; /* Make a copy of the source path since we may need to modify it. */ - if (strlen(path) >= PATH_MAX - 2) { + if (__strlen(path) >= PATH_MAX - 2) { __set_errno(ENAMETOOLONG); return NULL; } - strcpy(copy_path, path); + __strcpy(copy_path, path); path = copy_path; max_path = copy_path + PATH_MAX - 2; /* If it's a relative pathname use getwd for starters. */ @@ -75,7 +75,7 @@ char resolved_path[]; #else getwd(new_path); #endif - new_path += strlen(new_path); + new_path += __strlen(new_path); if (new_path[-1] != '/') *new_path++ = '/'; } else { @@ -129,7 +129,7 @@ char resolved_path[]; if (errno != EINVAL) { /* Make sure it's null terminated. */ *new_path = '\0'; - strcpy(resolved_path, got_path); + __strcpy(resolved_path, got_path); return NULL; } } else { @@ -142,13 +142,13 @@ char resolved_path[]; /* Otherwise back up over this component. */ while (*(--new_path) != '/'); /* Safe sex check. */ - if (strlen(path) + n >= PATH_MAX - 2) { + if (__strlen(path) + n >= PATH_MAX - 2) { __set_errno(ENAMETOOLONG); return NULL; } /* Insert symlink contents into path. */ - strcat(link_path, path); - strcpy(copy_path, link_path); + __strcat(link_path, path); + __strcpy(copy_path, link_path); path = copy_path; } #endif /* S_IFLNK */ @@ -159,6 +159,6 @@ char resolved_path[]; new_path--; /* Make sure it's null terminated. */ *new_path = '\0'; - strcpy(resolved_path, got_path); + __strcpy(resolved_path, got_path); return resolved_path; } |