#include "rsync.h"
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;
int set_modtime(char *fname, time_t modtime)
{
- extern int dry_run;
if (dry_run)
return 0;
if (verbose > 2) {
rprintf(FINFO, "set modtime of %s to (%ld) %s",
- fname, (long) modtime,
+ fname, (long)modtime,
asctime(localtime(&modtime)));
}
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;
}
#endif
}
-int robust_rename(char *from, char *to)
+/* Returns 0 on success, -1 on most errors, and -2 if we got an error
+ * trying to copy the file across file systems. */
+int robust_rename(char *from, 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 0;
+ default:
+ return -1;
+ }
+ }
+ return -1;
}
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;
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;
static int exclude_server_path(char *arg)
{
char *s;
- extern struct exclude_struct **server_exclude_list;
- if (server_exclude_list) {
+ if (server_exclude_list.head) {
for (s = arg; (s = strchr(s, '/')) != NULL; ) {
*s = '\0';
- if (check_exclude(server_exclude_list, arg, 1)) {
+ if (check_exclude(&server_exclude_list, arg, 1) < 0) {
/* We must leave arg truncated! */
return 1;
}
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 (!*s) s = ".";
- s = argv[*argc] = strdup(s);
+ 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);
exclude_server_path(s);
- (*argc)++;
#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, NULL);
+ 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);
}
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);
}
/* 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;
return ret;
}
-void clean_fname(char *name)
+unsigned int clean_fname(char *name)
{
- char *p;
- int l;
- int modified = 1;
+ char *limit = name - 1, *t = name, *f = name;
+ int anchored;
- if (!name) return;
-
- 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. If dest is
+ * the same buffer as p (the path) OR if reldir is NULL, a leading slash
+ * is dropped instead of being expanded to be the module's top dir.
*
- * @li 2. remove leading ".." components (except those allowed by @p reldir)
- *
- * @li 3. delete any other "<dir>/.." (recursively)
- *
- * Can only shrink paths, so sanitizes in place.
+ * If reldir is non-NULL (and non-empty), it is a sanitized directory that
+ * the path will be relative to, so allow as many '..'s at the beginning of
+ * the path as there are components in reldir. This is used for symbolic
+ * link targets. If reldir is non-null and the path began with "/", to be
+ * completely like a chroot we should add in depth levels of ".." at the
+ * beginning of the path, but that would blow the assumption that the path
+ * doesn't grow and it is not likely to end up being a valid symlink
+ * anyway, so just do the normal removal of the leading "/" instead.
*
* While we're at it, remove double slashes and "." components like
- * clean_fname() does, but DON'T remove a trailing slash because that
- * is sometimes significant on command line arguments.
- *
- * If @p reldir is non-null, it is a sanitized directory that the path will be
- * relative to, so allow as many ".." at the beginning of the path as
- * there are components in reldir. This is used for symbolic link targets.
- * If reldir is non-null and the path began with "/", to be completely like
- * a chroot we should add in depth levels of ".." at the beginning of the
- * path, but that would blow the assumption that the path doesn't grow and
- * it is not likely to end up being a valid symlink anyway, so just do
- * the normal removal of the leading "/" instead.
+ * clean_fname() does, but DON'T remove a trailing slash because that is
+ * sometimes significant on command line arguments.
*
- * Contributed by Dave Dykstra <dwd@bell-labs.com>
+ * If the resulting path would be empty, change it into ".".
*/
-void sanitize_path(char *p, char *reldir)
+char *sanitize_path(char *dest, const char *p, const char *reldir)
{
char *start, *sanp;
int depth = 0;
int allowdotdot = 0;
+ int rlen = 0;
+
+ if (dest != p) {
+ int plen = strlen(p);
+ if (*p == '/' && reldir) {
+ rlen = strlen(lp_path(module_id));
+ reldir = NULL;
+ p++;
+ }
+ if (dest) {
+ if (rlen + plen + 1 >= MAXPATHLEN)
+ return NULL;
+ } else if (!(dest = new_array(char, rlen + plen + 1)))
+ out_of_memory("sanitize_path");
+ if (rlen) {
+ memcpy(dest, lp_path(module_id), rlen);
+ if (rlen > 1)
+ dest[rlen++] = '/';
+ }
+ }
if (reldir) {
- depth++;
+ int new_component = 1;
while (*reldir) {
- if (*reldir++ == '/') {
+ if (*reldir++ == '/')
+ new_component = 1;
+ else if (new_component) {
+ new_component = 0;
depth++;
}
}
}
- start = p;
- sanp = p;
+
+ start = sanp = dest + rlen;
while (*p == '/') {
/* remove leading slashes */
p++;
start = sanp;
}
}
- if (sanp == start && !allowdotdot) {
+ if (sanp == dest) {
/* ended up with nothing, so put in "." component */
- /*
- * note that the !allowdotdot doesn't prevent this from
- * happening in all allowed ".." situations, but I didn't
- * think it was worth putting in an extra variable to ensure
- * it since an extra "." won't hurt in those situations.
- */
*sanp++ = '.';
}
*sanp = '\0';
-}
+ return dest;
+}
char curr_dir[MAXPATHLEN];
unsigned int curr_dir_len;
curr_dir_len += len;
}
- clean_fname(curr_dir);
+ curr_dir_len = clean_fname(curr_dir);
return 1;
}
return 1;
}
+/**
+ * Return the filename, turning any newlines into '?'s. This ensures that
+ * outputting it on a line of its own cannot generate an empty line. This
+ * function can handle only 2 names at a time!
+ **/
+const char *safe_fname(const char *fname)
+{
+ static char fbuf1[MAXPATHLEN], fbuf2[MAXPATHLEN];
+ static char *fbuf = fbuf2;
+ char *nl = strchr(fname, '\n');
+
+ if (!nl)
+ return fname;
+
+ fbuf = fbuf == fbuf1 ? fbuf2 : fbuf1;
+ strlcpy(fbuf, fname, MAXPATHLEN);
+ nl = fbuf + (nl - (char *)fname);
+ do {
+ *nl = '?';
+ } while ((nl = strchr(nl+1, '\n')) != NULL);
+
+ return fbuf;
+}
+
/**
* Return a quoted string with the full pathname of the indicated filename.
* The string " (in MODNAME)" may also be appended. The returned pointer
* remains valid until the next time full_fname() is called.
**/
-char *full_fname(char *fn)
+char *full_fname(const char *fn)
{
- extern int module_id;
static char *result = NULL;
char *m1, *m2, *m3;
char *p1, *p2;
if (result)
free(result);
+ fn = safe_fname(fn);
if (*fn == '/')
p1 = p2 = "";
else {
return result;
}
+static char partial_fname[MAXPATHLEN];
+
+char *partial_dir_fname(const char *fname)
+{
+ char *t = partial_fname;
+ int sz = sizeof partial_fname;
+ const char *fn;
+
+ if ((fn = strrchr(fname, '/')) != NULL) {
+ fn++;
+ if (*partial_dir != '/') {
+ int len = fn - fname;
+ strncpy(t, fname, len); /* safe */
+ t += len;
+ sz -= len;
+ }
+ } else
+ fn = fname;
+ if ((int)pathjoin(t, sz, partial_dir, fn) >= sz)
+ return NULL;
+ if (server_exclude_list.head
+ && check_exclude(&server_exclude_list, partial_fname, 0) < 0)
+ return NULL;
+
+ return partial_fname;
+}
+
+/* If no --partial-dir option was specified, we don't need to do anything
+ * (the partial-dir is essentially '.'), so just return success. */
+int handle_partial_dir(const char *fname, int create)
+{
+ char *fn, *dir;
+
+ if (fname != partial_fname)
+ return 1;
+ if (!create && *partial_dir == '/')
+ return 1;
+ if (!(fn = strrchr(partial_fname, '/')))
+ return 1;
+
+ *fn = '\0';
+ dir = partial_fname;
+ if (create) {
+ STRUCT_STAT st;
+#if SUPPORT_LINKS
+ int statret = do_lstat(dir, &st);
+#else
+ int statret = do_stat(dir, &st);
+#endif
+ if (statret == 0 && !S_ISDIR(st.st_mode)) {
+ if (do_unlink(dir) < 0)
+ return 0;
+ statret = -1;
+ }
+ if (statret < 0 && do_mkdir(dir, 0700) < 0)
+ return 0;
+ } else
+ do_rmdir(dir);
+ *fn = '/';
+
+ return 1;
+}
+
/** We need to supply our own strcmp function for file list comparisons
to ensure that signed/unsigned usage is consistent between machines. */
int u_strcmp(const char *cs1, const char *cs2)
int depth = 0;
/* all absolute and null symlinks are unsafe */
- if (!dest || !*dest || *dest == '/') return 1;
+ if (!dest || !*dest || *dest == '/')
+ return 1;
/* find out what our safety margin is */
for (name = src; (slash = strchr(name, '/')) != 0; name = slash+1) {
struct timeval tval, t1, t2;
gettimeofday(&t1, NULL);
- gettimeofday(&t2, NULL);
while (tdiff < t) {
tval.tv_sec = (t-tdiff)/1000;
**/
int cmp_modtime(time_t file1, time_t file2)
{
- extern int modify_window;
-
if (file2 > file1) {
- if (file2 - file1 <= modify_window) return 0;
+ if (file2 - file1 <= modify_window)
+ return 0;
return -1;
}
- if (file1 - file2 <= modify_window) return 0;
+ if (file1 - file2 <= modify_window)
+ return 0;
return 1;
}