Be sure to run "make proto" before "make".
---- orig/generator.c 2004-07-30 07:18:03
-+++ generator.c 2004-07-30 18:11:15
-@@ -41,6 +41,7 @@ extern int ignore_times;
+--- orig/generator.c 2004-09-20 19:57:58
++++ generator.c 2004-09-23 15:33:08
+@@ -43,6 +43,7 @@ extern int ignore_times;
extern int size_only;
extern int io_timeout;
extern int protocol_version;
extern int always_checksum;
extern char *partial_dir;
extern char *compare_dest;
-@@ -239,6 +240,93 @@ static void generate_and_send_sums(int f
+@@ -244,6 +245,92 @@ static void generate_and_send_sums(int f
}
+ }
+
+ /* Get final extension, eg. .gz; never full basename though. */
-+ ext = strrchr(basename + 1, '.');
-+ if (!ext)
++ if (!(ext = strrchr(basename + 1, '.')))
+ ext = basename + strlen(basename); /* ext = "" */
+
+ while ((di = readdir(d)) != NULL) {
/*
* Acts on file number @p i from @p flist, whose name is @p fname.
-@@ -453,6 +541,15 @@ static void recv_generator(char *fname,
- stat_errno = ENOENT;
- }
+@@ -256,11 +343,11 @@ static void generate_and_send_sums(int f
+ static void recv_generator(char *fname, struct file_struct *file, int i,
+ int f_out, int f_out_name)
+ {
+- int fd = -1, f_copy;
++ int fd = -1, f_copy = -1;
+ STRUCT_STAT st, partial_st;
+- struct file_struct *back_file;
++ struct file_struct *back_file = NULL;
+ int statret, stat_errno;
+- char *fnamecmp, *partialptr, *backupptr;
++ char *fnamecmp, *partialptr, *backupptr = NULL;
+ char fnamecmpbuf[MAXPATHLEN];
+ uchar fnamecmp_type;
+
+@@ -468,6 +555,15 @@ static void recv_generator(char *fname,
+ } else
+ partialptr = NULL;
+ if (statret == -1 && fuzzy_basis) {
+ if (find_fuzzy(fname, fnamecmpbuf, &st) == 0
if (statret == -1) {
if (preserve_hard_links && hard_link_check(file, HL_SKIP))
return;
-@@ -479,7 +576,7 @@ static void recv_generator(char *fname,
+@@ -494,7 +590,7 @@ static void recv_generator(char *fname,
return;
}
if (fnamecmp_type == G2R_FNAME)
set_perms(fname, file, &st, PERMS_REPORT);
return;
-@@ -527,6 +624,21 @@ static void recv_generator(char *fname,
+@@ -553,10 +649,6 @@ prepare_to_open:
+ return;
+ }
+ fnamecmp_type = G2R_BACKUP;
+- } else {
+- backupptr = NULL;
+- back_file = NULL;
+- f_copy = -1;
+ }
+
+ if (verbose > 3) {
+@@ -570,6 +662,21 @@ prepare_to_open:
notify_others:
if (f_out_name >= 0) {
write_byte(f_out_name, fnamecmp_type);
/* The receiving side mustn't obey this, or an existing symlink that
* points to an identical file won't be replaced by the referent. */
---- orig/options.c 2004-08-12 18:34:38
-+++ options.c 2004-07-16 20:14:12
+--- orig/options.c 2004-09-22 08:47:31
++++ options.c 2004-09-23 14:59:46
@@ -85,6 +85,7 @@ int safe_symlinks = 0;
int copy_unsafe_links = 0;
int size_only = 0;
/* TODO: Should this take an optional int giving the compression level? */
{"compress", 'z', POPT_ARG_NONE, &do_compression, 0, 0, 0 },
{"daemon", 0, POPT_ARG_NONE, &daemon_opt, 0, 0, 0 },
-@@ -1090,6 +1093,9 @@ void server_options(char **args,int *arg
+@@ -833,6 +836,11 @@ int parse_arguments(int *argc, const cha
+ link_dest ? "--link-dest" : "--compare-dest");
+ return 0;
+ }
++ if (compare_dest) {
++ snprintf(err_buf, sizeof err_buf,
++ "--inplace does not yet work with --fuzzy\n");
++ return 0;
++ }
+ } else {
+ if (keep_partial && !partial_dir)
+ partial_dir = getenv("RSYNC_PARTIAL_DIR");
+@@ -1099,6 +1107,9 @@ void server_options(char **args,int *arg
}
}
*argc = ac;
return;
---- orig/receiver.c 2004-07-30 07:17:48
+--- orig/receiver.c 2004-09-07 21:57:20
+++ receiver.c 2004-07-30 18:21:38
-@@ -323,6 +323,27 @@ static int receive_data(int f_in, char *
+@@ -319,6 +319,27 @@ static int receive_data(int f_in, char *
}
static void discard_receive_data(int f_in, OFF_T length)
{
receive_data(f_in, NULL, -1, 0, NULL, -1, length);
-@@ -449,6 +470,10 @@ int recv_files(int f_in, struct file_lis
- case G2R_PARTIAL_DIR:
- fnamecmp = partialptr ? partialptr : fname;
+@@ -448,6 +469,10 @@ int recv_files(int f_in, struct file_lis
+ case G2R_BACKUP:
+ fnamecmp = get_backup_name(fname);
break;
+ case G2R_FUZZY:
+ read_gen_name(f_in_name, fnamecmpbuf);
default:
pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
compare_dest, fname);
---- orig/rsync.h 2004-07-30 07:16:38
-+++ rsync.h 2004-07-30 07:45:40
-@@ -120,6 +120,7 @@
-
+--- orig/rsync.h 2004-09-07 21:52:22
++++ rsync.h 2004-09-07 22:02:37
+@@ -122,6 +122,7 @@
#define G2R_FNAME 0x80
#define G2R_PARTIAL_DIR 0x81
-+#define G2R_FUZZY 0x82
+ #define G2R_BACKUP 0x82
++#define G2R_FUZZY 0x83
/* Log-message categories. FLOG is only used on the daemon side to
---- orig/rsync.yo 2004-08-13 07:18:59
+--- orig/rsync.yo 2004-09-22 08:47:31
+++ rsync.yo 2004-07-03 19:27:25
@@ -356,6 +356,7 @@ verb(
-T --temp-dir=DIR create temporary files in directory DIR
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff