Patch from Mark Curtis to implement the --inplace option.
---- match.c 13 May 2004 06:46:20 -0000 1.61
-+++ match.c 15 May 2004 20:23:18 -0000
-@@ -22,6 +22,7 @@
- extern int verbose;
+--- match.c 21 May 2004 08:27:04 -0000 1.62
++++ match.c 18 Jun 2004 17:27:29 -0000
+@@ -23,6 +23,7 @@ extern int verbose;
extern int am_server;
extern int do_progress;
+ extern int checksum_seed;
+extern int inplace;
typedef unsigned short tag;
-@@ -197,6 +198,10 @@ static void hash_search(int f,struct sum
- /* also make sure the two blocks are the same length */
- l = MIN((OFF_T)s->blength, len-offset);
+@@ -200,6 +201,10 @@ static void hash_search(int f,struct sum
if (l != s->sums[i].len)
-+ continue;
-+
-+ /* if inplace, make sure the offset is greater than where we are */
-+ if (inplace && offset > s->sums[i].offset)
continue;
++ /* if inplace, make sure the offset is greater than where we are */
++ if (inplace && offset > s->sums[i].offset)
++ continue;
++
if (verbose > 3)
---- options.c 6 May 2004 21:08:01 -0000 1.148
-+++ options.c 15 May 2004 20:23:19 -0000
-@@ -91,6 +91,7 @@ int ignore_errors = 0;
+ rprintf(FINFO,"potential match at %.0f target=%.0f %.0f sum=%08x\n",
+ (double)offset,(double)j,(double)i,sum);
+--- options.c 7 Jun 2004 22:05:22 -0000 1.156
++++ options.c 18 Jun 2004 17:27:29 -0000
+@@ -94,6 +94,7 @@ int ignore_errors = 0;
int modify_window = 0;
int blocking_io = -1;
int checksum_seed = 0;
unsigned int block_size = 0;
-@@ -231,6 +232,7 @@ void usage(enum logcode F)
+@@ -234,6 +235,7 @@ void usage(enum logcode F)
rprintf(F," --backup-dir make backups into this directory\n");
rprintf(F," --suffix=SUFFIX backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
rprintf(F," -u, --update update only (don't overwrite newer files)\n");
+ rprintf(F," --inplace update the destination file inplace *SEE MAN PAGE*\n");
+ rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n");
rprintf(F," -l, --links copy symlinks as symlinks\n");
rprintf(F," -L, --copy-links copy the referent of all symlinks\n");
- rprintf(F," --copy-unsafe-links copy the referent of \"unsafe\" symlinks\n");
-@@ -321,6 +323,7 @@ static struct poptOption long_options[]
- {"delete", 0, POPT_ARG_NONE, &delete_mode, 0, 0, 0 },
- {"existing", 0, POPT_ARG_NONE, &only_existing, 0, 0, 0 },
- {"ignore-existing", 0, POPT_ARG_NONE, &opt_ignore_existing, 0, 0, 0 },
+@@ -341,6 +343,7 @@ static struct poptOption long_options[]
+ {"sparse", 'S', POPT_ARG_NONE, &sparse_files, 0, 0, 0 },
+ {"cvs-exclude", 'C', POPT_ARG_NONE, &cvs_exclude, 0, 0, 0 },
+ {"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 },
+ {"inplace", 0, POPT_ARG_NONE, &inplace, 0, 0, 0 },
- {"delete-after", 0, POPT_ARG_NONE, 0, OPT_DELETE_AFTER, 0, 0 },
- {"delete-excluded", 0, POPT_ARG_NONE, 0, OPT_DELETE_EXCLUDED, 0, 0 },
- {"force", 0, POPT_ARG_NONE, &force_delete, 0, 0, 0 },
-@@ -723,6 +726,9 @@ int parse_arguments(int *argc, const cha
- if (do_progress && !verbose)
- verbose = 1;
+ {"keep-dirlinks", 'K', POPT_ARG_NONE, &keep_dirlinks, 0, 0, 0 },
+ {"links", 'l', POPT_ARG_NONE, &preserve_links, 0, 0, 0 },
+ {"copy-links", 'L', POPT_ARG_NONE, ©_links, 0, 0, 0 },
+@@ -739,6 +742,9 @@ int parse_arguments(int *argc, const cha
+ bwlimit_writemax = 512;
+ }
+ if (inplace && keep_partial)
+ keep_partial = 0;
if (files_from) {
char *colon;
if (*argc != 2 && !(am_server && am_sender && *argc == 1)) {
-@@ -938,6 +944,9 @@ void server_options(char **args,int *arg
-
+@@ -963,6 +969,9 @@ void server_options(char **args,int *arg
if (opt_ignore_existing && am_sender)
args[ac++] = "--ignore-existing";
-+
+
+ if (inplace)
+ args[ac++] = "--inplace";
-
++
if (tmpdir) {
args[ac++] = "--temp-dir";
---- receiver.c 15 May 2004 19:31:10 -0000 1.78
-+++ receiver.c 15 May 2004 20:23:19 -0000
-@@ -46,6 +46,7 @@ extern int module_id;
- extern int ignore_errors;
+ args[ac++] = tmpdir;
+--- receiver.c 14 Jun 2004 15:09:36 -0000 1.82
++++ receiver.c 18 Jun 2004 17:27:30 -0000
+@@ -48,6 +48,7 @@ extern int ignore_errors;
extern int orig_umask;
extern int keep_partial;
+ extern int checksum_seed;
+extern int inplace;
static void delete_one(char *fn, int is_dir)
{
-@@ -251,16 +252,28 @@ static int receive_data(int f_in,struct
+@@ -257,16 +258,28 @@ static int receive_data(int f_in,struct
sum_update(map,len);
}
if (do_progress)
end_progress(total_size);
-@@ -412,37 +425,50 @@ int recv_files(int f_in,struct file_list
+@@ -418,37 +431,50 @@ int recv_files(int f_in,struct file_list
} else
mapbuf = NULL;
}
cleanup_set(fnametmp, fname, file, mapbuf, fd1, fd2);
---- rsync.c 15 May 2004 19:31:10 -0000 1.139
-+++ rsync.c 15 May 2004 20:23:19 -0000
-@@ -31,6 +31,7 @@ extern int am_generator;
- extern int preserve_uid;
- extern int preserve_gid;
+--- rsync.c 11 Jun 2004 07:40:45 -0000 1.141
++++ rsync.c 18 Jun 2004 17:27:30 -0000
+@@ -34,6 +34,7 @@ extern int force_delete;
+ extern int recurse;
extern int make_backups;
+ extern char *backup_dir;
+extern int inplace;
/*
-@@ -235,6 +236,11 @@ void finish_transfer(char *fname, char *
-
+@@ -239,6 +240,11 @@ void finish_transfer(char *fname, char *
if (make_backups && !make_backup(fname))
return;
-+
+
+ if (inplace) {
+ set_perms(fname,file,NULL,0);
+ return;
+ }
-
++
/* move tmp file over real file */
ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
---- rsync.yo 7 May 2004 00:18:37 -0000 1.169
-+++ rsync.yo 15 May 2004 20:23:20 -0000
+ if (ret < 0) {
+--- rsync.yo 5 Jun 2004 16:16:30 -0000 1.171
++++ rsync.yo 18 Jun 2004 17:27:30 -0000
@@ -289,6 +289,7 @@ verb(
--backup-dir make backups into this directory
--suffix=SUFFIX backup suffix (default ~ w/o --backup-dir)
-u, --update update only (don't overwrite newer files)
+ --inplace update the destination file inplace
+ -K, --keep-dirlinks treat symlinked dir on receiver as dir
-l, --links copy symlinks as symlinks
-L, --copy-links copy the referent of all symlinks
- --copy-unsafe-links copy the referent of "unsafe" symlinks
-@@ -477,6 +478,17 @@ is on the objects. In other words, if t
- symlink where the destination has a file, the transfer would occur
- regardless of the timestamps. This might change in the future (feel
- free to comment on this on the mailing list if you have an opinion).
-+
+@@ -484,6 +485,17 @@ dit(bf(-K, --keep-dirlinks)) On the rece
+ pointing to a directory, it will be treated as matching a directory
+ from the sender.
+
+dit(bf(--inplace)) This causes rsync not to create a new copy of the file
+and then move it into place. Instead rsync will overwrite the existing
+file, meaning that the rsync algorithm can't extract the full ammount of
+
+WARNING: If the transfer is interrupted, you will have an inconsistent file
+and the transfer should be run again.
-
++
dit(bf(-l, --links)) When symlinks are encountered, recreate the
symlink on the destination.
+
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff