[rsync/rsync-patches.git] / partial-dir.diff

You must run "make proto" after applying this patch.

--- orig/cleanup.c	2004-07-20 21:36:07
+++ cleanup.c	2004-07-27 23:32:17
@@ -111,7 +111,8 @@ void _exit_cleanup(int code, const char 
 		}
 	}
 
-	if (cleanup_got_literal && cleanup_fname && keep_partial) {
+	if (cleanup_got_literal && cleanup_fname && keep_partial
+	    && handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) {
 		char *fname = cleanup_fname;
 		cleanup_fname = NULL;
 		if (cleanup_fd_r != -1)
--- orig/generator.c	2004-07-28 10:05:29
+++ generator.c	2004-07-28 09:58:28
@@ -42,6 +42,7 @@ extern int size_only;
 extern int io_timeout;
 extern int protocol_version;
 extern int always_checksum;
+extern char *partial_dir;
 extern char *compare_dest;
 extern int link_dest;
 extern int whole_file;
@@ -496,6 +497,16 @@ static void recv_generator(char *fname, 
 		return;
 	}
 
+	if (partial_dir) {
+		STRUCT_STAT st2;
+		char *partialptr = partial_dir_fname(fname);
+		if (partialptr && link_stat(partialptr, &st2, 0) == 0
+		    && S_ISREG(st2.st_mode)) {
+			st = st2;
+			fnamecmp = partialptr;
+		}
+	}
+
 	/* open the file */
 	fd = do_open(fnamecmp, O_RDONLY, 0);
 
--- orig/options.c	2004-07-23 17:16:13
+++ options.c	2004-07-26 16:43:48
@@ -118,6 +118,7 @@ unsigned int backup_dir_remainder;
 
 char *backup_suffix = NULL;
 char *tmpdir = NULL;
+char *partial_dir = NULL;
 char *compare_dest = NULL;
 char *config_file = NULL;
 char *shell_cmd = NULL;
@@ -268,6 +269,7 @@ void usage(enum logcode F)
   rprintf(F,"     --ignore-errors         delete even if there are I/O errors\n");
   rprintf(F,"     --max-delete=NUM        don't delete more than NUM files\n");
   rprintf(F,"     --partial               keep partially transferred files\n");
+  rprintf(F,"     --partial-dir=DIR       put a partially transferred file into DIR\n");
   rprintf(F,"     --force                 force deletion of directories even if not empty\n");
   rprintf(F,"     --numeric-ids           don't map uid/gid values by user/group name\n");
   rprintf(F,"     --timeout=TIME          set I/O timeout in seconds\n");
@@ -383,6 +385,7 @@ static struct poptOption long_options[] 
   {"stats",            0,  POPT_ARG_NONE,   &do_stats, 0, 0, 0 },
   {"progress",         0,  POPT_ARG_NONE,   &do_progress, 0, 0, 0 },
   {"partial",          0,  POPT_ARG_NONE,   &keep_partial, 0, 0, 0 },
+  {"partial-dir",      0,  POPT_ARG_STRING, &partial_dir, 0, 0, 0 },
   {"ignore-errors",    0,  POPT_ARG_NONE,   &ignore_errors, 0, 0, 0 },
   {"blocking-io",      0,  POPT_ARG_VAL,    &blocking_io, 1, 0, 0 },
   {"no-blocking-io",   0,  POPT_ARG_VAL,    &blocking_io, 0, 0, 0 },
@@ -718,6 +721,8 @@ int parse_arguments(int *argc, const cha
 			(*argv)[i] = alloc_sanitize_path((*argv)[i], NULL);
 		if (tmpdir)
 			tmpdir = alloc_sanitize_path(tmpdir, curr_dir);
+		if (partial_dir)
+			partial_dir = alloc_sanitize_path(partial_dir, curr_dir);
 		if (compare_dest)
 			compare_dest = alloc_sanitize_path(compare_dest, curr_dir);
 		if (backup_dir)
@@ -770,6 +775,11 @@ int parse_arguments(int *argc, const cha
 
 	if (inplace) {
 #if HAVE_FTRUNCATE
+		if (partial_dir) {
+			snprintf(err_buf, sizeof err_buf,
+				 "--inplace cannot be used with --partial-dir\n");
+			return 0;
+		}
 		keep_partial = 0;
 #else
 		snprintf(err_buf, sizeof err_buf,
@@ -777,7 +787,8 @@ int parse_arguments(int *argc, const cha
 			 am_server ? "server" : "client");
 		return 0;
 #endif
-	}
+	} else if (partial_dir)
+		keep_partial = 1;
 
 	if (files_from) {
 		char *colon;
@@ -969,7 +980,10 @@ void server_options(char **args,int *arg
 		args[ac++] = arg;
 	}
 
-	if (keep_partial)
+	if (partial_dir && am_sender) {
+		args[ac++] = "--partial-dir";
+		args[ac++] = partial_dir;
+	} else if (keep_partial)
 		args[ac++] = "--partial";
 
 	if (force_delete)
--- orig/receiver.c	2004-07-26 16:20:00
+++ receiver.c	2004-07-27 23:26:20
@@ -38,6 +38,7 @@ extern int preserve_perms;
 extern int cvs_exclude;
 extern int io_error;
 extern char *tmpdir;
+extern char *partial_dir;
 extern char *compare_dest;
 extern int make_backups;
 extern int do_progress;
@@ -342,7 +343,7 @@ int recv_files(int f_in, struct file_lis
 	char *fname, fbuf[MAXPATHLEN];
 	char template[MAXPATHLEN];
 	char fnametmp[MAXPATHLEN];
-	char *fnamecmp;
+	char *fnamecmp, *partialptr;
 	char fnamecmpbuf[MAXPATHLEN];
 	struct file_struct *file;
 	struct stats initial_stats;
@@ -410,8 +411,6 @@ int recv_files(int f_in, struct file_lis
 		if (verbose > 2)
 			rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname));
 
-		fnamecmp = fname;
-
 		if (read_batch) {
 			while (i > next_gen_i) {
 				next_gen_i = read_int(batch_gen_fd);
@@ -438,9 +437,22 @@ int recv_files(int f_in, struct file_lis
 			continue;
 		}
 
+		if (partial_dir) {
+			if ((partialptr = partial_dir_fname(fname)) != NULL)
+				fnamecmp = partialptr;
+			else
+				fnamecmp = fname;
+		} else
+			fnamecmp = partialptr = fname;
+
 		/* open the file */
 		fd1 = do_open(fnamecmp, O_RDONLY, 0);
 
+		if (fd1 == -1 && fnamecmp != fname) {
+			fnamecmp = fname;
+			fd1 = do_open(fnamecmp, O_RDONLY, 0);
+		}
+
 		if (fd1 == -1 && compare_dest != NULL) {
 			/* try the file at compare_dest instead */
 			pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
@@ -528,7 +540,8 @@ int recv_files(int f_in, struct file_lis
 				continue;
 			}
 
-			cleanup_set(fnametmp, fname, file, fd1, fd2);
+			if (partialptr)
+				cleanup_set(fnametmp, partialptr, file, fd1, fd2);
 		}
 
 		if (!am_server && verbose) /* log the transfer */
@@ -548,10 +561,20 @@ int recv_files(int f_in, struct file_lis
 			exit_cleanup(RERR_FILEIO);
 		}
 
-		if (recv_ok || keep_partial || inplace)
+		if (recv_ok || inplace)
 			finish_transfer(fname, fnametmp, file, recv_ok);
-		else
+		else if (keep_partial && partialptr
+		    && handle_partial_dir(partialptr, PDIR_CREATE))
+			finish_transfer(partialptr, fnametmp, file, 0);
+		else {
+			partialptr = NULL;
 			do_unlink(fnametmp);
+		}
+
+		if (partialptr != fname && fnamecmp == partialptr && recv_ok) {
+			do_unlink(partialptr);
+			handle_partial_dir(partialptr, PDIR_DELETE);
+		}
 
 		cleanup_disable();
 
@@ -559,9 +582,13 @@ int recv_files(int f_in, struct file_lis
 			int msgtype = csum_length == SUM_LENGTH || read_batch ?
 				FERROR : FINFO;
 			if (msgtype == FERROR || verbose) {
-				char *errstr, *redostr;
-				char *keptstr = keep_partial || inplace ?
-					"retain" : "discard";
+				char *errstr, *redostr, *keptstr;
+				if (!(keep_partial && partialptr) && !inplace)
+					keptstr = "discarded";
+				else if (partial_dir)
+					keptstr = "put into partial-dir";
+				else
+					keptstr = "retained";
 				if (msgtype == FERROR) {
 					errstr = "ERROR";
 					redostr = "";
@@ -570,7 +597,7 @@ int recv_files(int f_in, struct file_lis
 					redostr = " (will try again)";
 				}
 				rprintf(msgtype,
-					"%s: %s failed verification -- update %sed%s.\n",
+					"%s: %s failed verification -- update %s%s.\n",
 					errstr, safe_fname(fname),
 					keptstr, redostr);
 			}
--- orig/rsync.h	2004-07-23 17:16:13
+++ rsync.h	2004-07-27 23:23:54
@@ -115,6 +115,9 @@
 #define FULL_FLUSH	1
 #define NORMAL_FLUSH	0
 
+#define PDIR_CREATE	1
+#define PDIR_DELETE	0
+
 
 /* Log-message categories.  FLOG is only used on the daemon side to
  * output messages to the log file. */
--- orig/rsync.yo	2004-07-24 16:52:10
+++ rsync.yo	2004-07-28 02:26:19
@@ -317,6 +317,7 @@ verb(
      --ignore-errors         delete even if there are I/O errors
      --max-delete=NUM        don't delete more than NUM files
      --partial               keep partially transferred files
+     --partial-dir=DIR       put a partially transferred file into DIR
      --force                 force deletion of dirs even if not empty
      --numeric-ids           don't map uid/gid values by user/group name
      --timeout=TIME          set I/O timeout in seconds
@@ -865,6 +866,29 @@ it is more desirable to keep partially t
 --partial option tells rsync to keep the partial file which should
 make a subsequent transfer of the rest of the file much faster.
 
+dit(bf(--partial-dir=DIR)) Turns on --partial mode, but tells rsync to
+put a partially transferred file into DIR instead of writing out the
+file to the destination dir.  Rsync will also use a file found in this
+dir as data to speed up the transfer (i.e. when you redo the send after
+rsync creates a partial file) and delete such a file after it has served
+its purpose.
+
+Rsync will create the dir if it is missing (just the last dir -- not the
+whole path).  This makes it easy to use a relative path (such as
+"--partial-dir=.rsync-partial") to have rsync create the partial-directory
+in the destination file's directory (rsync will also try to remove the DIR
+if a partial file was found to exist at the start of the transfer and the
+DIR was specified as a relative path).
+
+If you are deleting files on the destination and your partial-dir is
+inside the destination hierarchy, make sure you specify an exclude to
+prevent the partial file from being deleted (it could get deleted at the
+end of the transfer when using --delete-after, or at the beginning of the
+transfer when using --delete).  E.g. "--exclude=.rsync-partial/".
+
+IMPORTANT: the --partial-dir should not be writable by other users to
+avoid a security risk.  E.g. AVOID "/tmp".
+
 dit(bf(--progress)) This option tells rsync to print information
 showing the progress of the transfer. This gives a bored user
 something to watch.
--- orig/t_stub.c	2004-05-15 20:10:13
+++ t_stub.c	2004-07-24 17:00:35
@@ -28,6 +28,7 @@
 
 int modify_window = 0;
 int module_id = -1;
+char *partial_dir;
 struct exclude_list_struct server_exclude_list;
 
  void rprintf(UNUSED(enum logcode code), const char *format, ...)
--- orig/util.c	2004-07-26 16:33:24
+++ util.c	2004-07-27 23:25:20
@@ -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;
@@ -970,6 +971,66 @@ char *full_fname(const char *fn)
 	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;
+
+	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)
Commit	Line	Data
482eaa96 WD	1	You must run "make proto" after applying this patch.
482eaa96 WD	2
df8c196d	3	--- orig/cleanup.c 2004-07-20 21:36:07
f8c97b53 WD	4	+++ cleanup.c 2004-07-27 23:32:17
f8c97b53 WD	5	@@ -111,7 +111,8 @@ void _exit_cleanup(int code, const char
1be76832 WD	6	}
1be76832 WD	7	}
df8c196d	8
1be76832 WD	9	- if (cleanup_got_literal && cleanup_fname && keep_partial) {
1be76832 WD	10	+ if (cleanup_got_literal && cleanup_fname && keep_partial
f8c97b53	11	+ && handle_partial_dir(cleanup_new_fname, PDIR_CREATE)) {
df8c196d	12	char *fname = cleanup_fname;
df8c196d WD	13	cleanup_fname = NULL;
df8c196d WD	14	if (cleanup_fd_r != -1)
3008e4d6 WD	15	--- orig/generator.c 2004-07-28 10:05:29
3008e4d6 WD	16	+++ generator.c 2004-07-28 09:58:28
df8c196d WD	17	@@ -42,6 +42,7 @@ extern int size_only;
	18	extern int io_timeout;
	19	extern int protocol_version;
	20	extern int always_checksum;
	21	+extern char *partial_dir;
	22	extern char *compare_dest;
	23	extern int link_dest;
	24	extern int whole_file;
3008e4d6	25	@@ -496,6 +497,16 @@ static void recv_generator(char *fname,
482eaa96 WD	26	return;
482eaa96 WD	27	}
df8c196d WD	28
	29	+ if (partial_dir) {
	30	+ STRUCT_STAT st2;
3008e4d6 WD	31	+ char *partialptr = partial_dir_fname(fname);
3008e4d6 WD	32	+ if (partialptr && link_stat(partialptr, &st2, 0) == 0
482eaa96	33	+ && S_ISREG(st2.st_mode)) {
df8c196d	34	+ st = st2;
3008e4d6 WD	35	+ fnamecmp = partialptr;
	36	+ }
	37	+ }
	38	+
	39	/* open the file */
	40	fd = do_open(fnamecmp, O_RDONLY, 0);
482eaa96	41
df8c196d	42	--- orig/options.c 2004-07-23 17:16:13
f8c97b53	43	+++ options.c 2004-07-26 16:43:48
df8c196d WD	44	@@ -118,6 +118,7 @@ unsigned int backup_dir_remainder;
	45
	46	char *backup_suffix = NULL;
	47	char *tmpdir = NULL;
	48	+char *partial_dir = NULL;
	49	char *compare_dest = NULL;
	50	char *config_file = NULL;
	51	char *shell_cmd = NULL;
	52	@@ -268,6 +269,7 @@ void usage(enum logcode F)
	53	rprintf(F," --ignore-errors delete even if there are I/O errors\n");
	54	rprintf(F," --max-delete=NUM don't delete more than NUM files\n");
	55	rprintf(F," --partial keep partially transferred files\n");
	56	+ rprintf(F," --partial-dir=DIR put a partially transferred file into DIR\n");
	57	rprintf(F," --force force deletion of directories even if not empty\n");
	58	rprintf(F," --numeric-ids don't map uid/gid values by user/group name\n");
	59	rprintf(F," --timeout=TIME set I/O timeout in seconds\n");
	60	@@ -383,6 +385,7 @@ static struct poptOption long_options[]
	61	{"stats", 0, POPT_ARG_NONE, &do_stats, 0, 0, 0 },
	62	{"progress", 0, POPT_ARG_NONE, &do_progress, 0, 0, 0 },
	63	{"partial", 0, POPT_ARG_NONE, &keep_partial, 0, 0, 0 },
	64	+ {"partial-dir", 0, POPT_ARG_STRING, &partial_dir, 0, 0, 0 },
	65	{"ignore-errors", 0, POPT_ARG_NONE, &ignore_errors, 0, 0, 0 },
	66	{"blocking-io", 0, POPT_ARG_VAL, &blocking_io, 1, 0, 0 },
	67	{"no-blocking-io", 0, POPT_ARG_VAL, &blocking_io, 0, 0, 0 },
482eaa96 WD	68	@@ -718,6 +721,8 @@ int parse_arguments(int *argc, const cha
	69	(argv)[i] = alloc_sanitize_path((argv)[i], NULL);
	70	if (tmpdir)
	71	tmpdir = alloc_sanitize_path(tmpdir, curr_dir);
	72	+ if (partial_dir)
	73	+ partial_dir = alloc_sanitize_path(partial_dir, curr_dir);
	74	if (compare_dest)
	75	compare_dest = alloc_sanitize_path(compare_dest, curr_dir);
	76	if (backup_dir)
	77	@@ -770,6 +775,11 @@ int parse_arguments(int *argc, const cha
df8c196d WD	78
	79	if (inplace) {
	80	#if HAVE_FTRUNCATE
	81	+ if (partial_dir) {
	82	+ snprintf(err_buf, sizeof err_buf,
	83	+ "--inplace cannot be used with --partial-dir\n");
	84	+ return 0;
	85	+ }
	86	keep_partial = 0;
	87	#else
	88	snprintf(err_buf, sizeof err_buf,
482eaa96	89	@@ -777,7 +787,8 @@ int parse_arguments(int *argc, const cha
df8c196d WD	90	am_server ? "server" : "client");
	91	return 0;
	92	#endif
	93	- }
	94	+ } else if (partial_dir)
	95	+ keep_partial = 1;
	96
	97	if (files_from) {
	98	char *colon;
482eaa96	99	@@ -969,7 +980,10 @@ void server_options(char *args,int arg
df8c196d WD	100	args[ac++] = arg;
	101	}
	102
	103	- if (keep_partial)
0fe8e93e	104	+ if (partial_dir && am_sender) {
df8c196d WD	105	+ args[ac++] = "--partial-dir";
	106	+ args[ac++] = partial_dir;
	107	+ } else if (keep_partial)
	108	args[ac++] = "--partial";
	109
	110	if (force_delete)
f8c97b53 WD	111	--- orig/receiver.c 2004-07-26 16:20:00
f8c97b53 WD	112	+++ receiver.c 2004-07-27 23:26:20
df8c196d WD	113	@@ -38,6 +38,7 @@ extern int preserve_perms;
	114	extern int cvs_exclude;
	115	extern int io_error;
	116	extern char *tmpdir;
	117	+extern char *partial_dir;
	118	extern char *compare_dest;
	119	extern int make_backups;
	120	extern int do_progress;
f8c97b53	121	@@ -342,7 +343,7 @@ int recv_files(int f_in, struct file_lis
482eaa96	122	char *fname, fbuf[MAXPATHLEN];
df8c196d WD	123	char template[MAXPATHLEN];
df8c196d WD	124	char fnametmp[MAXPATHLEN];
482eaa96 WD	125	- char *fnamecmp;
	126	+ char fnamecmp, partialptr;
	127	char fnamecmpbuf[MAXPATHLEN];
df8c196d WD	128	struct file_struct *file;
df8c196d WD	129	struct stats initial_stats;
f8c97b53	130	@@ -410,8 +411,6 @@ int recv_files(int f_in, struct file_lis
df8c196d	131	if (verbose > 2)
f8c97b53	132	rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname));
df8c196d WD	133
	134	- fnamecmp = fname;
	135	-
	136	if (read_batch) {
	137	while (i > next_gen_i) {
	138	next_gen_i = read_int(batch_gen_fd);
f8c97b53	139	@@ -438,9 +437,22 @@ int recv_files(int f_in, struct file_lis
df8c196d WD	140	continue;
	141	}
	142
	143	+ if (partial_dir) {
f8c97b53	144	+ if ((partialptr = partial_dir_fname(fname)) != NULL)
482eaa96	145	+ fnamecmp = partialptr;
df8c196d	146	+ else
482eaa96	147	+ fnamecmp = fname;
df8c196d	148	+ } else
482eaa96	149	+ fnamecmp = partialptr = fname;
df8c196d WD	150	+
	151	/* open the file */
	152	fd1 = do_open(fnamecmp, O_RDONLY, 0);
	153
482eaa96	154	+ if (fd1 == -1 && fnamecmp != fname) {
df8c196d WD	155	+ fnamecmp = fname;
	156	+ fd1 = do_open(fnamecmp, O_RDONLY, 0);
	157	+ }
	158	+
	159	if (fd1 == -1 && compare_dest != NULL) {
	160	/* try the file at compare_dest instead */
	161	pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
f8c97b53	162	@@ -528,7 +540,8 @@ int recv_files(int f_in, struct file_lis
df8c196d WD	163	continue;
	164	}
	165
	166	- cleanup_set(fnametmp, fname, file, fd1, fd2);
482eaa96 WD	167	+ if (partialptr)
482eaa96 WD	168	+ cleanup_set(fnametmp, partialptr, file, fd1, fd2);
df8c196d WD	169	}
df8c196d WD	170
f8c97b53 WD	171	if (!am_server && verbose) /* log the transfer */
f8c97b53 WD	172	@@ -548,10 +561,20 @@ int recv_files(int f_in, struct file_lis
482eaa96 WD	173	exit_cleanup(RERR_FILEIO);
	174	}
	175
	176	- if (recv_ok \|\| keep_partial \|\| inplace)
0fe8e93e	177	+ if (recv_ok \|\| inplace)
482eaa96	178	finish_transfer(fname, fnametmp, file, recv_ok);
0fe8e93e WD	179	- else
0fe8e93e WD	180	+ else if (keep_partial && partialptr
f8c97b53	181	+ && handle_partial_dir(partialptr, PDIR_CREATE))
0fe8e93e WD	182	+ finish_transfer(partialptr, fnametmp, file, 0);
	183	+ else {
	184	+ partialptr = NULL;
df8c196d	185	do_unlink(fnametmp);
0fe8e93e WD	186	+ }
	187	+
	188	+ if (partialptr != fname && fnamecmp == partialptr && recv_ok) {
482eaa96	189	+ do_unlink(partialptr);
f8c97b53	190	+ handle_partial_dir(partialptr, PDIR_DELETE);
df8c196d	191	+ }
0fe8e93e	192
df8c196d WD	193	cleanup_disable();
df8c196d WD	194
f8c97b53	195	@@ -559,9 +582,13 @@ int recv_files(int f_in, struct file_lis
0fe8e93e WD	196	int msgtype = csum_length == SUM_LENGTH \|\| read_batch ?
	197	FERROR : FINFO;
	198	if (msgtype == FERROR \|\| verbose) {
	199	- char errstr, redostr;
	200	- char *keptstr = keep_partial \|\| inplace ?
	201	- "retain" : "discard";
	202	+ char errstr, redostr, *keptstr;
	203	+ if (!(keep_partial && partialptr) && !inplace)
	204	+ keptstr = "discarded";
	205	+ else if (partial_dir)
	206	+ keptstr = "put into partial-dir";
	207	+ else
	208	+ keptstr = "retained";
	209	if (msgtype == FERROR) {
	210	errstr = "ERROR";
	211	redostr = "";
f8c97b53	212	@@ -570,7 +597,7 @@ int recv_files(int f_in, struct file_lis
0fe8e93e WD	213	redostr = " (will try again)";
	214	}
	215	rprintf(msgtype,
	216	- "%s: %s failed verification -- update %sed%s.\n",
	217	+ "%s: %s failed verification -- update %s%s.\n",
f8c97b53 WD	218	errstr, safe_fname(fname),
f8c97b53 WD	219	keptstr, redostr);
0fe8e93e	220	}
f8c97b53 WD	221	--- orig/rsync.h 2004-07-23 17:16:13
	222	+++ rsync.h 2004-07-27 23:23:54
	223	@@ -115,6 +115,9 @@
	224	#define FULL_FLUSH 1
	225	#define NORMAL_FLUSH 0
	226
	227	+#define PDIR_CREATE 1
	228	+#define PDIR_DELETE 0
	229	+
	230
	231	/* Log-message categories. FLOG is only used on the daemon side to
	232	* output messages to the log file. */
1be76832	233	--- orig/rsync.yo 2004-07-24 16:52:10
3008e4d6	234	+++ rsync.yo 2004-07-28 02:26:19
df8c196d WD	235	@@ -317,6 +317,7 @@ verb(
	236	--ignore-errors delete even if there are I/O errors
	237	--max-delete=NUM don't delete more than NUM files
	238	--partial keep partially transferred files
	239	+ --partial-dir=DIR put a partially transferred file into DIR
	240	--force force deletion of dirs even if not empty
	241	--numeric-ids don't map uid/gid values by user/group name
	242	--timeout=TIME set I/O timeout in seconds
3008e4d6	243	@@ -865,6 +866,29 @@ it is more desirable to keep partially t
df8c196d WD	244	--partial option tells rsync to keep the partial file which should
	245	make a subsequent transfer of the rest of the file much faster.
	246
	247	+dit(bf(--partial-dir=DIR)) Turns on --partial mode, but tells rsync to
	248	+put a partially transferred file into DIR instead of writing out the
	249	+file to the destination dir. Rsync will also use a file found in this
f8c97b53	250	+dir as data to speed up the transfer (i.e. when you redo the send after
3008e4d6 WD	251	+rsync creates a partial file) and delete such a file after it has served
3008e4d6 WD	252	+its purpose.
df8c196d	253	+
3008e4d6 WD	254	+Rsync will create the dir if it is missing (just the last dir -- not the
	255	+whole path). This makes it easy to use a relative path (such as
	256	+"--partial-dir=.rsync-partial") to have rsync create the partial-directory
	257	+in the destination file's directory (rsync will also try to remove the DIR
	258	+if a partial file was found to exist at the start of the transfer and the
	259	+DIR was specified as a relative path).
df8c196d	260	+
f8c97b53	261	+If you are deleting files on the destination and your partial-dir is
3008e4d6 WD	262	+inside the destination hierarchy, make sure you specify an exclude to
	263	+prevent the partial file from being deleted (it could get deleted at the
	264	+end of the transfer when using --delete-after, or at the beginning of the
	265	+transfer when using --delete). E.g. "--exclude=.rsync-partial/".
0fe8e93e	266	+
3008e4d6 WD	267	+IMPORTANT: the --partial-dir should not be writable by other users to
3008e4d6 WD	268	+avoid a security risk. E.g. AVOID "/tmp".
df8c196d WD	269	+
	270	dit(bf(--progress)) This option tells rsync to print information
	271	showing the progress of the transfer. This gives a bored user
	272	something to watch.
1be76832 WD	273	--- orig/t_stub.c 2004-05-15 20:10:13
	274	+++ t_stub.c 2004-07-24 17:00:35
	275	@@ -28,6 +28,7 @@
	276
	277	int modify_window = 0;
	278	int module_id = -1;
	279	+char *partial_dir;
	280	struct exclude_list_struct server_exclude_list;
	281
	282	void rprintf(UNUSED(enum logcode code), const char *format, ...)
f8c97b53 WD	283	--- orig/util.c 2004-07-26 16:33:24
f8c97b53 WD	284	+++ util.c 2004-07-27 23:25:20
482eaa96 WD	285	@@ -31,6 +31,7 @@ extern int verbose;
	286	extern int dry_run;
	287	extern int module_id;
	288	extern int modify_window;
	289	+extern char *partial_dir;
	290	extern struct exclude_list_struct server_exclude_list;
	291
	292	int sanitize_paths = 0;
f8c97b53	293	@@ -970,6 +971,66 @@ char full_fname(const char fn)
482eaa96 WD	294	return result;
	295	}
	296
1be76832	297	+static char partial_fname[MAXPATHLEN];
482eaa96	298	+
f8c97b53	299	+char partial_dir_fname(const char fname)
482eaa96	300	+{
1be76832 WD	301	+ char *t = partial_fname;
1be76832 WD	302	+ int sz = sizeof partial_fname;
482eaa96 WD	303	+ const char *fn;
	304	+
	305	+ if ((fn = strrchr(fname, '/')) != NULL) {
	306	+ fn++;
	307	+ if (*partial_dir != '/') {
	308	+ int len = fn - fname;
	309	+ strncpy(t, fname, len); /* safe */
	310	+ t += len;
	311	+ sz -= len;
	312	+ }
	313	+ } else
	314	+ fn = fname;
f8c97b53	315	+ if ((int)pathjoin(t, sz, partial_dir, fn) >= sz)
482eaa96	316	+ return NULL;
482eaa96	317	+
1be76832	318	+ return partial_fname;
482eaa96 WD	319	+}
482eaa96 WD	320	+
f8c97b53 WD	321	+/* If no --partial-dir option was specified, we don't need to do anything
f8c97b53 WD	322	+ * (the partial-dir is essentially '.'), so just return success. */
1be76832	323	+int handle_partial_dir(const char *fname, int create)
482eaa96	324	+{
f8c97b53	325	+ char fn, dir;
482eaa96	326	+
1be76832 WD	327	+ if (fname != partial_fname)
1be76832 WD	328	+ return 1;
482eaa96	329	+ if (!create && *partial_dir == '/')
1be76832 WD	330	+ return 1;
	331	+ if (!(fn = strrchr(partial_fname, '/')))
	332	+ return 1;
482eaa96 WD	333	+
482eaa96 WD	334	+ *fn = '\0';
f8c97b53	335	+ dir = partial_fname;
1be76832 WD	336	+ if (create) {
	337	+ STRUCT_STAT st;
	338	+#if SUPPORT_LINKS
	339	+ int statret = do_lstat(dir, &st);
	340	+#else
	341	+ int statret = do_stat(dir, &st);
	342	+#endif
	343	+ if (statret == 0 && !S_ISDIR(st.st_mode)) {
	344	+ if (do_unlink(dir) < 0)
	345	+ return 0;
	346	+ statret = -1;
	347	+ }
f8c97b53 WD	348	+ if (statret < 0 && do_mkdir(dir, 0700) < 0)
f8c97b53 WD	349	+ return 0;
1be76832 WD	350	+ } else
1be76832 WD	351	+ do_rmdir(dir);
482eaa96	352	+ *fn = '/';
1be76832 WD	353	+
1be76832 WD	354	+ return 1;
482eaa96 WD	355	+}
	356	+
	357	/** We need to supply our own strcmp function for file list comparisons
	358	to ensure that signed/unsigned usage is consistent between machines. */
	359	int u_strcmp(const char cs1, const char cs2)