diff options
| author | Ron <ron@debian.org> | 2009-06-27 04:44:26 +0930 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-07-05 20:27:17 -0400 |
| commit | 4a758b0f333fc886b2b4ce715cab22027adb03a6 (patch) | |
| tree | 2d9fcf3f90460e1255457e66e229e117533dfbe3 /utils | |
| parent | 13c6036f71c2cd67161659bff558bf48305d186d (diff) | |
Don't shadow the chroot global
Signed-off-by: Ron Lee <ron@debian.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/chroot_realpath.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/utils/chroot_realpath.c b/utils/chroot_realpath.c index d912a06c5..0be57bf1f 100644 --- a/utils/chroot_realpath.c +++ b/utils/chroot_realpath.c @@ -24,10 +24,10 @@ #define MAX_READLINKS 32 -char *chroot_realpath(const char *chroot, const char *path, +char *chroot_realpath(const char *root, const char *path, char resolved_path[]); -char *chroot_realpath(const char *chroot, const char *path, +char *chroot_realpath(const char *root, const char *path, char resolved_path[]) { char copy_path[PATH_MAX]; @@ -41,13 +41,13 @@ char *chroot_realpath(const char *chroot, const char *path, int chroot_len; /* Trivial case. */ - if (chroot == NULL || *chroot == '\0' || - (*chroot == '/' && chroot[1] == '\0')) { + if (root == NULL || *root == '\0' || + (*root == '/' && root[1] == '\0')) { strcpy(resolved_path, path); return resolved_path; } - chroot_len = strlen(chroot); + chroot_len = strlen(root); if (chroot_len + strlen(path) >= PATH_MAX - 3) { errno = ENAMETOOLONG; @@ -60,7 +60,7 @@ char *chroot_realpath(const char *chroot, const char *path, max_path = copy_path + PATH_MAX - chroot_len - 3; /* Start with the chroot path. */ - strcpy(new_path, chroot); + strcpy(new_path, root); new_path += chroot_len; while (*new_path == '/' && new_path > got_path) new_path--; |