X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/5cb374364b3564878673704f835408b413681b59..9f27cd8ca6ccbf1ab4cd8b0b66445535e2573d59:/util.c

diff --git a/util.c b/util.c
index 03b6d7ed..5129c35b 100644
--- a/util.c
+++ b/util.c
@@ -28,6 +28,7 @@
 #include "rsync.h"
 
 extern int verbose;
+extern struct exclude_list_struct server_exclude_list;
 
 int sanitize_paths = 0;
 
@@ -111,14 +112,14 @@ void print_child_argv(char **cmd)
 
 void out_of_memory(char *str)
 {
-  rprintf(FERROR,"ERROR: out of memory in %s\n",str);
-  exit_cleanup(RERR_MALLOC);
+	rprintf(FERROR, "ERROR: out of memory in %s\n", str);
+	exit_cleanup(RERR_MALLOC);
 }
 
 void overflow(char *str)
 {
-  rprintf(FERROR,"ERROR: buffer overflow in %s\n",str);
-  exit_cleanup(RERR_MALLOC);
+	rprintf(FERROR, "ERROR: buffer overflow in %s\n", str);
+	exit_cleanup(RERR_MALLOC);
 }
 
 
@@ -167,11 +168,13 @@ int create_directory_path(char *fname, int base_umask)
 {
 	char *p;
 
-	while (*fname == '/') fname++;
-	while (strncmp(fname,"./",2)==0) fname += 2;
+	while (*fname == '/')
+		fname++;
+	while (strncmp(fname, "./", 2) == 0)
+		fname += 2;
 
 	p = fname;
-	while ((p=strchr(p,'/'))) {
+	while ((p = strchr(p,'/')) != NULL) {
 		*p = 0;
 		do_mkdir(fname, 0777 & ~base_umask);
 		*p = '/';
@@ -250,20 +253,20 @@ 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));
+			full_fname(source), strerror(errno));
 		return -1;
 	}
 
 	if (robust_unlink(dest) && errno != ENOENT) {
 		rprintf(FERROR,"unlink %s: %s\n",
-			dest,strerror(errno));
+			full_fname(dest), strerror(errno));
 		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));
+			full_fname(dest), strerror(errno));
 		close(ifd);
 		return -1;
 	}
@@ -271,19 +274,27 @@ int copy_file(char *source, char *dest, mode_t mode)
 	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));
+				full_fname(dest), strerror(errno));
 			close(ifd);
 			close(ofd);
 			return -1;
 		}
 	}
 
-	close(ifd);
-	close(ofd);
+	if (close(ifd) < 0) {
+		rprintf(FINFO, "close failed on %s: %s\n",
+			full_fname(source), strerror(errno));
+	}
+
+	if (close(ofd) < 0) {
+		rprintf(FERROR, "close failed on %s: %s\n",
+			full_fname(dest), strerror(errno));
+		return -1;
+	}
 
 	if (len < 0) {
 		rprintf(FERROR,"read %s: %s\n",
-			source,strerror(errno));
+			full_fname(source), strerror(errno));
 		return -1;
 	}
 
@@ -314,15 +325,14 @@ int robust_unlink(char *fname)
 	char path[MAXPATHLEN];
 
 	rc = do_unlink(fname);
-	if ((rc == 0) || (errno != ETXTBSY))
+	if (rc == 0 || errno != ETXTBSY)
 		return rc;
 
-	strlcpy(path, fname, MAXPATHLEN);
+	if ((pos = strlcpy(path, fname, MAXPATHLEN)) >= MAXPATHLEN)
+		pos = MAXPATHLEN - 1;
 
-	pos = strlen(path);
-	while((path[--pos] != '/') && (pos >= 0))
-		;
-	++pos;
+	while (pos > 0 && path[pos-1] != '/')
+		pos--;
 	pos += strlcpy(path+pos, ".rsync", MAXPATHLEN-pos);
 
 	if (pos > (MAXPATHLEN-MAX_RENAMES_DIGITS-1)) {
@@ -336,7 +346,7 @@ int robust_unlink(char *fname)
 		sprintf(&path[pos], "%03d", counter);
 		if (++counter >= MAX_RENAMES)
 			counter = 1;
-	} while (((rc = access(path, 0)) == 0) && (counter != start));
+	} while ((rc = access(path, 0)) == 0 && counter != start);
 
 	if (verbose > 0) {
 		rprintf(FINFO,"renaming %s to %s because of text busy\n",
@@ -352,18 +362,33 @@ int robust_unlink(char *fname)
 #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;
 }
 
 
@@ -455,12 +480,11 @@ int lock_range(int fd, int offset, int len)
 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;
 			}
@@ -497,13 +521,15 @@ static void glob_expand_one(char *s, char **argv, int *argc, int maxargs)
 		globfree(&globbuf);
 		return;
 	}
-	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");
+	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");
 	}
 	globfree(&globbuf);
-	(*argc) += i;
+	*argc += i;
 #endif
 }
 
@@ -527,14 +553,15 @@ void glob_expand(char *base1, char **argv, int *argc, int maxargs)
 	base_len++;
 
 	q = s;
-	while ((p = strstr(q,base)) && ((*argc) < maxargs)) {
+	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;
 	}
 
-	if (*q && (*argc < maxargs)) glob_expand_one(q, argv, argc, maxargs);
+	if (*q && *argc < maxargs)
+		glob_expand_one(q, argv, argc, maxargs);
 
 	free(s);
 	free(base);
@@ -554,8 +581,8 @@ void strlower(char *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);
@@ -575,9 +602,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;
@@ -615,7 +642,7 @@ void clean_fname(char *name)
 	while (modified) {
 		modified = 0;
 
-		if ((p=strstr(name,"/./"))) {
+		if ((p = strstr(name,"/./")) != NULL) {
 			modified = 1;
 			while (*p) {
 				p[0] = p[2];
@@ -623,7 +650,7 @@ void clean_fname(char *name)
 			}
 		}
 
-		if ((p=strstr(name,"//"))) {
+		if ((p = strstr(name,"//")) != NULL) {
 			modified = 1;
 			while (*p) {
 				p[0] = p[1];
@@ -631,14 +658,14 @@ void clean_fname(char *name)
 			}
 		}
 
-		if (strncmp(p=name,"./",2) == 0) {
+		if (strncmp(p = name, "./", 2) == 0) {
 			modified = 1;
 			do {
 				p[0] = p[2];
 			} while (*p++);
 		}
 
-		l = strlen(p=name);
+		l = strlen(p = name);
 		if (l > 1 && p[l-1] == '/') {
 			modified = 1;
 			p[l-1] = 0;
@@ -697,7 +724,7 @@ void sanitize_path(char *p, char *reldir)
 		 * both p (and sanp if the original had a slash) should
 		 * always be left pointing after a slash
 		 */
-		if ((*p == '.') && ((*(p+1) == '/') || (*(p+1) == '\0'))) {
+		if (*p == '.' && (p[1] == '/' || p[1] == '\0')) {
 			/* skip "." component */
 			while (*++p == '/') {
 				/* skip following slashes */
@@ -706,10 +733,9 @@ void sanitize_path(char *p, char *reldir)
 			continue;
 		}
 		allowdotdot = 0;
-		if ((*p == '.') && (*(p+1) == '.') &&
-		    ((*(p+2) == '/') || (*(p+2) == '\0'))) {
+		if (*p == '.' && p[1] == '.' && (p[2] == '/' || p[2] == '\0')) {
 			/* ".." component followed by slash or end */
-			if ((depth > 0) && (sanp == start)) {
+			if (depth > 0 && sanp == start) {
 				/* allow depth levels of .. at the beginning */
 				--depth;
 				allowdotdot = 1;
@@ -720,7 +746,7 @@ void sanitize_path(char *p, char *reldir)
 				if (sanp != start) {
 					/* back up sanp one level */
 					--sanp; /* now pointing at slash */
-					while ((sanp > start) && (*(sanp - 1) != '/')) {
+					while (sanp > start && sanp[-1] != '/') {
 						/* skip back up to slash */
 						sanp--;
 					}
@@ -731,7 +757,7 @@ void sanitize_path(char *p, char *reldir)
 		while (1) {
 			/* copy one component through next slash */
 			*sanp++ = *p++;
-			if ((*p == '\0') || (*(p-1) == '/')) {
+			if (*p == '\0' || p[-1] == '/') {
 				while (*p == '/') {
 					/* skip multiple slashes */
 					p++;
@@ -744,7 +770,7 @@ void sanitize_path(char *p, char *reldir)
 			start = sanp;
 		}
 	}
-	if ((sanp == start) && !allowdotdot) {
+	if (sanp == start && !allowdotdot) {
 		/* ended up with nothing, so put in "." component */
 		/*
 		 * note that the !allowdotdot doesn't prevent this from
@@ -757,6 +783,39 @@ void sanitize_path(char *p, char *reldir)
 	*sanp = '\0';
 }
 
+/* Works much like sanitize_path(), with these differences:  (1) a new buffer
+ * is allocated for the sanitized path rather than modifying it in-place; (2)
+ * a leading slash gets transformed into the rootdir value (which can be empty
+ * or NULL if you just want the slash to get dropped); (3) no "reldir" can be
+ * specified. */
+char *alloc_sanitize_path(const char *path, const char *rootdir)
+{
+	char *buf;
+	int rlen, plen = strlen(path);
+
+	if (*path == '/' && rootdir) {
+		rlen = strlen(rootdir);
+		if (rlen == 1)
+			path++;
+	} else
+		rlen = 0;
+	if (!(buf = new_array(char, rlen + plen + 1)))
+		out_of_memory("alloc_sanitize_path");
+	if (rlen)
+		memcpy(buf, rootdir, rlen);
+	memcpy(buf + rlen, path, plen + 1);
+
+	if (rlen > 1)
+		rlen++;
+	sanitize_path(buf + rlen, NULL);
+	if (rlen && buf[rlen] == '.' && buf[rlen+1] == '\0') {
+		if (rlen > 1)
+			rlen--;
+		buf[rlen] = '\0';
+	}
+
+	return buf;
+}
 
 char curr_dir[MAXPATHLEN];
 unsigned int curr_dir_len;
@@ -917,7 +976,7 @@ int unsafe_symlink(const char *dest, const char *src)
 	/* find out what our safety margin is */
 	for (name = src; (slash = strchr(name, '/')) != 0; name = slash+1) {
 		if (strncmp(name, "../", 3) == 0) {
-			depth=0;
+			depth = 0;
 		} else if (strncmp(name, "./", 2) == 0) {
 			/* nothing */
 		} else {
@@ -976,8 +1035,8 @@ char *timestring(time_t t)
  **/
 int msleep(int t)
 {
-	int tdiff=0;
-	struct timeval tval,t1,t2;
+	int tdiff = 0;
+	struct timeval tval, t1, t2;
 
 	gettimeofday(&t1, NULL);
 	gettimeofday(&t2, NULL);