X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/07a874fd9b990c4ea1e370d350fc77f9ecc171b5..a70d070cc52c177bd974e6787788f946be9cb285:/util.c diff --git a/util.c b/util.c index bdde8b45..44ff2df1 100644 --- a/util.c +++ b/util.c @@ -532,8 +532,8 @@ void glob_expand(char *base1, char **argv, int *argc, int maxargs) void strlower(char *s) { while (*s) { - if (isupper((int) *s)) - *s = tolower((int) *s); + if (isupper(* (unsigned char *) s)) + *s = tolower(* (unsigned char *) s); s++; } } @@ -793,15 +793,15 @@ int u_strcmp(const char *cs1, const char *cs2) * * @sa t_unsafe.c **/ -int unsafe_symlink(char *dest, char *src) +int unsafe_symlink(const char *dest_path, const char *src_path) { - char *tok; + char *tok, *src, *dest; int depth = 0; /* all absolute and null symlinks are unsafe */ - if (!dest || !(*dest) || (*dest == '/')) return 1; + if (!dest_path || !*dest_path || *dest_path == '/') return 1; - src = strdup(src); + src = strdup(src_path); if (!src) out_of_memory("unsafe_symlink"); /* find out what our safety margin is */ @@ -819,7 +819,7 @@ int unsafe_symlink(char *dest, char *src) /* drop by one to account for the filename portion */ depth--; - dest = strdup(dest); + dest = strdup(dest_path); if (!dest) out_of_memory("unsafe_symlink"); for (tok=strtok(dest,"/"); tok; tok=strtok(NULL,"/")) {