X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9a5ade185cc2ac20f16c95b6d28fea85b0d358de..1d6b8f9ad296f06505b06a941df5cbe38c540e72:/util.c diff --git a/util.c b/util.c index 69433359..829bad6c 100644 --- a/util.c +++ b/util.c @@ -31,6 +31,7 @@ extern int verbose; extern int dry_run; extern int module_id; extern int modify_window; +extern char *partial_dir; extern struct exclude_list_struct server_exclude_list; int sanitize_paths = 0; @@ -134,7 +135,7 @@ int set_modtime(char *fname, time_t modtime) if (verbose > 2) { rprintf(FINFO, "set modtime of %s to (%ld) %s", - fname, (long) modtime, + fname, (long)modtime, asctime(localtime(&modtime))); } @@ -361,8 +362,8 @@ int robust_unlink(char *fname) #endif } -/* Returns 0 on success, -1 on most errors, and -2 if we got an error - * trying to copy the file across file systems. */ +/* Returns 0 on successful rename, 1 if we successfully copied the file + * across filesystems, -2 if copy_file() failed, and -1 on other errors. */ int robust_rename(char *from, char *to, int mode) { int tries = 4; @@ -382,7 +383,7 @@ int robust_rename(char *from, char *to, int mode) if (copy_file(from, to, mode) != 0) return -2; do_unlink(from); - return 0; + return 1; default: return -1; } @@ -439,7 +440,8 @@ void kill_all(int sig) int name_to_uid(char *name, uid_t *uid) { struct passwd *pass; - if (!name || !*name) return 0; + if (!name || !*name) + return 0; pass = getpwnam(name); if (pass) { *uid = pass->pw_uid; @@ -452,7 +454,8 @@ int name_to_uid(char *name, uid_t *uid) int name_to_gid(char *name, gid_t *gid) { struct group *grp; - if (!name || !*name) return 0; + if (!name || !*name) + return 0; grp = getgrnam(name); if (grp) { *gid = grp->gr_gid; @@ -493,77 +496,92 @@ static int exclude_server_path(char *arg) return 0; } -static void glob_expand_one(char *s, char **argv, int *argc, int maxargs) +static void glob_expand_one(char *s, char ***argv_ptr, int *argc_ptr, + int *maxargs_ptr) { + char **argv = *argv_ptr; + int argc = *argc_ptr; + int maxargs = *maxargs_ptr; #if !(defined(HAVE_GLOB) && defined(HAVE_GLOB_H)) - if (maxargs <= *argc) - return; + if (argc == maxargs) { + maxargs += MAX_ARGS; + if (!(argv = realloc_array(argv, char *, maxargs))) + out_of_memory("glob_expand_one"); + *argv_ptr = argv; + *maxargs_ptr = maxargs; + } if (!*s) s = "."; - s = argv[*argc] = strdup(s); + s = argv[argc++] = strdup(s); exclude_server_path(s); - (*argc)++; #else glob_t globbuf; int i; + if (maxargs <= argc) + return; if (!*s) s = "."; - s = argv[*argc] = strdup(s); if (sanitize_paths) - sanitize_path(s, NULL); + s = sanitize_path(NULL, s, "", 0); + else + s = strdup(s); memset(&globbuf, 0, sizeof globbuf); if (!exclude_server_path(s)) glob(s, 0, NULL, &globbuf); - if (globbuf.gl_pathc == 0) { - (*argc)++; - globfree(&globbuf); - return; + if (MAX((int)globbuf.gl_pathc, 1) > maxargs - argc) { + maxargs += globbuf.gl_pathc + MAX_ARGS; + if (!(argv = realloc_array(argv, char *, maxargs))) + out_of_memory("glob_expand_one"); + *argv_ptr = argv; + *maxargs_ptr = maxargs; } - for (i = 0; i < maxargs - *argc && i < (int)globbuf.gl_pathc; i++) { - if (i == 0) - free(s); - argv[*argc + i] = strdup(globbuf.gl_pathv[i]); - if (!argv[*argc + i]) - out_of_memory("glob_expand"); + if (globbuf.gl_pathc == 0) + argv[argc++] = s; + else { + int j = globbuf.gl_pathc; + free(s); + for (i = 0; i < j; i++) { + if (!(argv[argc++] = strdup(globbuf.gl_pathv[i]))) + out_of_memory("glob_expand_one"); + } } globfree(&globbuf); - *argc += i; #endif + *argc_ptr = argc; } /* This routine is only used in daemon mode. */ -void glob_expand(char *base1, char **argv, int *argc, int maxargs) +void glob_expand(char *base1, char ***argv_ptr, int *argc_ptr, int *maxargs_ptr) { - char *s = argv[*argc]; + char *s = (*argv_ptr)[*argc_ptr]; char *p, *q; char *base = base1; int base_len = strlen(base); - if (!s || !*s) return; + if (!s || !*s) + return; if (strncmp(s, base, base_len) == 0) s += base_len; - s = strdup(s); - if (!s) out_of_memory("glob_expand"); + if (!(s = strdup(s))) + out_of_memory("glob_expand"); - if (asprintf(&base," %s/", base1) <= 0) out_of_memory("glob_expand"); + if (asprintf(&base," %s/", base1) <= 0) + out_of_memory("glob_expand"); base_len++; - q = s; - while ((p = strstr(q,base)) != NULL && *argc < maxargs) { - /* split it at this point */ - *p = 0; - glob_expand_one(q, argv, argc, maxargs); - q = p + base_len; + for (q = s; *q; q = p + base_len) { + if ((p = strstr(q, base)) != NULL) + *p = '\0'; /* split it at this point */ + glob_expand_one(q, argv_ptr, argc_ptr, maxargs_ptr); + if (!p) + break; } - if (*q && *argc < maxargs) - glob_expand_one(q, argv, argc, maxargs); - free(s); free(base); } @@ -574,8 +592,8 @@ void glob_expand(char *base1, char **argv, int *argc, int maxargs) void strlower(char *s) { while (*s) { - if (isupper(* (unsigned char *) s)) - *s = tolower(* (unsigned char *) s); + if (isupper(*(unsigned char *)s)) + *s = tolower(*(unsigned char *)s); s++; } } @@ -632,93 +650,121 @@ size_t stringjoin(char *dest, size_t destsize, ...) return ret; } -void clean_fname(char *name) +int count_dir_elements(const char *p) { - char *p; - int l; - int modified = 1; + int cnt = 0, new_component = 1; + while (*p) { + if (*p++ == '/') + new_component = 1; + else if (new_component) { + new_component = 0; + cnt++; + } + } + return cnt; +} - if (!name) return; +/* Turns multiple adjacent slashes into a single slash, gets rid of "./" + * elements, collapses ".." elements except for those at the start of + * the string. If the resulting path would be empty, change it into a + * ".". */ +unsigned int clean_fname(char *name) +{ + char *limit = name - 1, *t = name, *f = name; + int anchored; - while (modified) { - modified = 0; + if (!name) + return 0; - if ((p = strstr(name,"/./")) != NULL) { - modified = 1; - while (*p) { - p[0] = p[2]; - p++; - } + if ((anchored = *f == '/') != 0) + *t++ = *f++; + while (*f) { + /* discard extra slashes */ + if (*f == '/') { + f++; + continue; } - - if ((p = strstr(name,"//")) != NULL) { - modified = 1; - while (*p) { - p[0] = p[1]; - p++; + if (*f == '.') { + /* discard "." dirs (but NOT a trailing '.'!) */ + if (f[1] == '/') { + f += 2; + continue; + } + /* collapse ".." dirs */ + if (f[1] == '.' && (f[2] == '/' || !f[2])) { + char *s = t - 1; + if (s == name && anchored) { + f += 2; + continue; + } + while (s > limit && *--s != '/') {} + if (s != t - 1 && (s < name || *s == '/')) { + t = s + 1; + f += 2; + continue; + } + *t++ = *f++; + *t++ = *f++; + limit = t; } } + while (*f && (*t++ = *f++) != '/') {} + } - if (strncmp(p = name, "./", 2) == 0) { - modified = 1; - do { - p[0] = p[2]; - } while (*p++); - } + if (t > name+anchored && t[-1] == '/') + t--; + if (t == name) + *t++ = '.'; + *t = '\0'; - l = strlen(p = name); - if (l > 1 && p[l-1] == '/') { - modified = 1; - p[l-1] = 0; - } - } + return t - name; } -/** - * Make path appear as if a chroot had occurred: +/* Make path appear as if a chroot had occurred. This handles a leading + * "/" (either removing it or expanding it) and any leading or embedded + * ".." components that attempt to escape past the module's top dir. * - * @li 1. remove leading "/" (or replace with "." if at end) + * If dest is NULL, a buffer is allocated to hold the result. It is legal + * to call with the dest and the path (p) pointing to the same buffer, but + * rootdir will be ignored to avoid expansion of the string. * - * @li 2. remove leading ".." components (except those allowed by @p reldir) + * The rootdir string contains a value to use in place of a leading slash. + * Specify NULL to get the default of lp_path(module_id). * - * @li 3. delete any other "