X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/c284f34a498a4b7c85666df867024be63a511d55..c3ef136d41a9981433c1234c55f1ea76cd35d2f1:/util.c diff --git a/util.c b/util.c index d0d1c2b1..3d88b15c 100644 --- a/util.c +++ b/util.c @@ -28,6 +28,13 @@ #include "rsync.h" extern int verbose; +extern int dry_run; +extern int module_id; +extern int modify_window; +extern int relative_paths; +extern int human_readable; +extern char *partial_dir; +extern struct filter_list_struct server_filter_list; int sanitize_paths = 0; @@ -74,7 +81,7 @@ int fd_pair(int fd[2]) { int ret; -#if HAVE_SOCKETPAIR +#ifdef HAVE_SOCKETPAIR ret = socketpair(AF_UNIX, SOCK_STREAM, 0, fd); #else ret = pipe(fd); @@ -115,7 +122,7 @@ void out_of_memory(char *str) exit_cleanup(RERR_MALLOC); } -void overflow(char *str) +void overflow_exit(char *str) { rprintf(FERROR, "ERROR: buffer overflow in %s\n", str); exit_cleanup(RERR_MALLOC); @@ -123,36 +130,46 @@ void overflow(char *str) -int set_modtime(char *fname, time_t modtime) +int set_modtime(char *fname, time_t modtime, mode_t mode) { - extern int dry_run; - if (dry_run) - return 0; +#if !defined HAVE_LUTIMES || !defined HAVE_UTIMES + if (S_ISLNK(mode)) + return 1; +#endif if (verbose > 2) { rprintf(FINFO, "set modtime of %s to (%ld) %s", - fname, (long) modtime, + fname, (long)modtime, asctime(localtime(&modtime))); } + if (dry_run) + return 0; + { -#ifdef HAVE_UTIMBUF +#ifdef HAVE_UTIMES + struct timeval t[2]; + t[0].tv_sec = time(NULL); + t[0].tv_usec = 0; + t[1].tv_sec = modtime; + t[1].tv_usec = 0; +# ifdef HAVE_LUTIMES + if (S_ISLNK(mode)) + return lutimes(fname, t); +# endif + return utimes(fname, t); +#elif defined HAVE_UTIMBUF struct utimbuf tbuf; tbuf.actime = time(NULL); tbuf.modtime = modtime; return utime(fname,&tbuf); -#elif defined(HAVE_UTIME) +#elif defined HAVE_UTIME time_t t[2]; t[0] = time(NULL); t[1] = modtime; return utime(fname,t); #else - struct timeval t[2]; - t[0].tv_sec = time(NULL); - t[0].tv_usec = 0; - t[1].tv_sec = modtime; - t[1].tv_usec = 0; - return utimes(fname,t); +#error No file-time-modification routine found! #endif } } @@ -193,7 +210,7 @@ int create_directory_path(char *fname, int base_umask) * * Derived from GNU C's cccp.c. */ -static int full_write(int desc, char *ptr, size_t len) +int full_write(int desc, char *ptr, size_t len) { int total_written; @@ -241,8 +258,9 @@ static int safe_read(int desc, char *ptr, size_t len) /** Copy a file. * - * This is used in conjunction with the --temp-dir option */ -int copy_file(char *source, char *dest, mode_t mode) + * This is used in conjunction with the --temp-dir, --backup, and + * --copy-dest options. */ +int copy_file(const char *source, const char *dest, mode_t mode) { int ifd; int ofd; @@ -251,41 +269,46 @@ int copy_file(char *source, char *dest, mode_t mode) ifd = do_open(source, O_RDONLY, 0); if (ifd == -1) { - rprintf(FERROR,"open %s: %s\n", - source,strerror(errno)); + rsyserr(FERROR, errno, "open %s", full_fname(source)); return -1; } if (robust_unlink(dest) && errno != ENOENT) { - rprintf(FERROR,"unlink %s: %s\n", - dest,strerror(errno)); + rsyserr(FERROR, errno, "unlink %s", full_fname(dest)); return -1; } ofd = do_open(dest, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, mode); if (ofd == -1) { - rprintf(FERROR,"open %s: %s\n", - dest,strerror(errno)); + rsyserr(FERROR, errno, "open %s", full_fname(dest)); close(ifd); return -1; } while ((len = safe_read(ifd, buf, sizeof buf)) > 0) { if (full_write(ofd, buf, len) < 0) { - rprintf(FERROR,"write %s: %s\n", - dest,strerror(errno)); + rsyserr(FERROR, errno, "write %s", full_fname(dest)); close(ifd); close(ofd); return -1; } } - close(ifd); - close(ofd); - if (len < 0) { - rprintf(FERROR,"read %s: %s\n", - source,strerror(errno)); + rsyserr(FERROR, errno, "read %s", full_fname(source)); + close(ifd); + close(ofd); + return -1; + } + + if (close(ifd) < 0) { + rsyserr(FINFO, errno, "close failed on %s", + full_fname(source)); + } + + if (close(ofd) < 0) { + rsyserr(FERROR, errno, "close failed on %s", + full_fname(dest)); return -1; } @@ -306,7 +329,7 @@ int copy_file(char *source, char *dest, mode_t mode) * --delete trying to remove old .rsyncNNN files, hence it renames it * each time. **/ -int robust_unlink(char *fname) +int robust_unlink(const char *fname) { #ifndef ETXTBSY return do_unlink(fname); @@ -353,18 +376,33 @@ int robust_unlink(char *fname) #endif } -int robust_rename(char *from, char *to) +/* 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(const char *from, const char *to, int mode) { -#ifndef ETXTBSY - return do_rename(from, to); -#else - int rc = do_rename(from, to); - if (rc == 0 || errno != ETXTBSY) - return rc; - if (robust_unlink(to) != 0) - return -1; - return do_rename(from, to); + int tries = 4; + + while (tries--) { + if (do_rename(from, to) == 0) + return 0; + + switch (errno) { +#ifdef ETXTBSY + case ETXTBSY: + if (robust_unlink(to) != 0) + return -1; + break; #endif + case EXDEV: + if (copy_file(from, to, mode) != 0) + return -2; + do_unlink(from); + return 1; + default: + return -1; + } + } + return -1; } @@ -416,7 +454,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; @@ -429,7 +468,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; @@ -453,15 +493,14 @@ int lock_range(int fd, int offset, int len) return fcntl(fd,F_SETLK,&lock) == 0; } -static int exclude_server_path(char *arg) +static int filter_server_path(char *arg) { char *s; - extern struct exclude_struct **server_exclude_list; - if (server_exclude_list) { + if (server_filter_list.head) { for (s = arg; (s = strchr(s, '/')) != NULL; ) { *s = '\0'; - if (check_exclude(server_exclude_list, arg, 1)) { + if (check_filter(&server_filter_list, arg, 1) < 0) { /* We must leave arg truncated! */ return 1; } @@ -471,75 +510,91 @@ 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) { -#if !(defined(HAVE_GLOB) && defined(HAVE_GLOB_H)) - if (!*s) s = "."; - s = argv[*argc] = strdup(s); - exclude_server_path(s); - (*argc)++; + char **argv = *argv_ptr; + int argc = *argc_ptr; + int maxargs = *maxargs_ptr; +#if !defined HAVE_GLOB || !defined HAVE_GLOB_H + 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); + filter_server_path(s); #else - extern int sanitize_paths; glob_t globbuf; - int i; - if (!*s) s = "."; + if (maxargs <= argc) + return; + if (!*s) + s = "."; - s = argv[*argc] = strdup(s); - if (sanitize_paths) { - sanitize_path(s, NULL); - } + if (sanitize_paths) + s = sanitize_path(NULL, s, "", 0); + else + s = strdup(s); memset(&globbuf, 0, sizeof globbuf); - if (!exclude_server_path(s)) + if (!filter_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 i; + free(s); + for (i = 0; i < (int)globbuf.gl_pathc; 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); } @@ -550,16 +605,16 @@ 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++; } } /* Join strings p1 & p2 into "dest" with a guaranteed '/' between them. (If * p1 ends with a '/', no extra '/' is inserted.) Returns the length of both - * strings + 1 (if '/' was inserted), regardless of whether the whole thing - * fits into destsize (including the terminating '\0'). */ + * strings + 1 (if '/' was inserted), regardless of whether the null-terminated + * string fits into destsize. */ size_t pathjoin(char *dest, size_t destsize, const char *p1, const char *p2) { size_t len = strlcpy(dest, p1, destsize); @@ -579,9 +634,9 @@ size_t pathjoin(char *dest, size_t destsize, const char *p1, const char *p2) } /* Join any number of strings together, putting them in "dest". The return - * value is the length of all the strings, regardless of whether they fit in - * destsize (including the terminating '\0'). Your list of string pointers - * should end with a NULL to indicate the end of the list. */ + * value is the length of all the strings, regardless of whether the null- + * terminated whole fits in destsize. Your list of string pointers must end + * with a NULL to indicate the end of the list. */ size_t stringjoin(char *dest, size_t destsize, ...) { va_list ap; @@ -608,118 +663,147 @@ 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 (but not a trailing dot dir), removes a trailing slash, and + * optionally collapses ".." elements (except for those at the start of the + * string). If the resulting name would be empty, change it into a ".". */ +unsigned int clean_fname(char *name, BOOL collapse_dot_dot) +{ + 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 (collapse_dot_dot + && 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; + } + limit = t + 2; } } + 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: - * - * @li 1. remove leading "/" (or replace with "." if at end) +/* 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 2. remove leading ".." components (except those allowed by @p reldir) + * 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 3. delete any other "