You must run "make proto" before compiling.
---- orig/generator.c 2004-08-03 15:41:32
-+++ generator.c 2004-07-30 07:18:03
-@@ -249,13 +249,13 @@ static void generate_and_send_sums(int f
+--- orig/generator.c 2004-09-20 19:50:13
++++ generator.c 2004-09-20 19:57:58
+@@ -254,14 +254,15 @@ static void generate_and_send_sums(int f
* out. It might be wrong.
*/
static void recv_generator(char *fname, struct file_struct *file, int i,
- int f_out)
+ int f_out, int f_out_name)
{
-- int fd;
-+ int fd = -1;
- STRUCT_STAT st;
+- int fd, f_copy;
++ int fd = -1, f_copy;
+ STRUCT_STAT st, partial_st;
+ struct file_struct *back_file;
int statret, stat_errno;
-- char *fnamecmp;
-- char fnamecmpbuf[MAXPATHLEN];
-+ char *fnamecmp, fnamecmpbuf[MAXPATHLEN];
+ char *fnamecmp, *partialptr, *backupptr;
+ char fnamecmpbuf[MAXPATHLEN];
+ uchar fnamecmp_type;
if (list_only)
return;
-@@ -411,6 +411,7 @@ static void recv_generator(char *fname,
+@@ -423,6 +424,7 @@ static void recv_generator(char *fname,
}
fnamecmp = fname;
if (statret == -1 && compare_dest != NULL) {
/* try the file at compare_dest instead */
-@@ -427,10 +428,14 @@ static void recv_generator(char *fname,
+@@ -439,10 +441,14 @@ static void recv_generator(char *fname,
safe_fname(fname));
}
fnamecmp = fnamecmpbuf;
statret = 0;
}
}
-@@ -445,11 +450,9 @@ static void recv_generator(char *fname,
+@@ -465,11 +471,9 @@ static void recv_generator(char *fname,
if (statret == -1) {
if (preserve_hard_links && hard_link_check(file, HL_SKIP))
return;
rsyserr(FERROR, stat_errno,
"recv_generator: failed to stat %s",
full_fname(fname));
-@@ -457,13 +460,13 @@ static void recv_generator(char *fname,
+@@ -477,13 +481,13 @@ static void recv_generator(char *fname,
return;
}
&& cmp_modtime(st.st_mtime, file->modtime) > 0) {
if (verbose > 1)
rprintf(FINFO, "%s is newer\n", safe_fname(fname));
-@@ -471,21 +474,17 @@ static void recv_generator(char *fname,
+@@ -491,26 +495,23 @@ static void recv_generator(char *fname,
}
if (skip_file(fnamecmp, file, &st)) {
return;
}
+ prepare_to_open:
- if (dry_run || read_batch) {
- write_int(f_out,i);
- return;
- write_int(f_out,i);
- write_sum_head(f_out, NULL);
- return;
-+ if (dry_run || whole_file) {
++ if (dry_run || whole_file > 0) {
+ statret = -1;
+ goto notify_others;
}
+ if (read_batch)
+ goto notify_others;
- if (partial_dir) {
- STRUCT_STAT st2;
-@@ -494,6 +493,7 @@ static void recv_generator(char *fname,
- && S_ISREG(st2.st_mode)) {
- st = st2;
- fnamecmp = partialptr;
-+ fnamecmp_type = G2R_PARTIAL_DIR;
- }
+ if (partialptr) {
+ st = partial_st;
+ fnamecmp = partialptr;
++ fnamecmp_type = G2R_PARTIAL_DIR;
}
-@@ -506,9 +506,8 @@ static void recv_generator(char *fname,
+ /* open the file */
+@@ -523,9 +524,8 @@ prepare_to_open:
/* pretend the file didn't exist */
if (preserve_hard_links && hard_link_check(file, HL_SKIP))
return;
+ goto notify_others;
}
- if (verbose > 3) {
-@@ -519,14 +518,28 @@ static void recv_generator(char *fname,
+ if (inplace && make_backups) {
+@@ -552,6 +552,7 @@ prepare_to_open:
+ close(fd);
+ return;
+ }
++ fnamecmp_type = G2R_BACKUP;
+ } else {
+ backupptr = NULL;
+ back_file = NULL;
+@@ -566,22 +567,38 @@ prepare_to_open:
if (verbose > 2)
rprintf(FINFO, "generating and sending sums for %d\n", i);
- write_int(f_out,i);
-- generate_and_send_sums(fd, st.st_size, f_out);
+- generate_and_send_sums(fd, st.st_size, f_out, f_copy);
+-
+- if (f_copy >= 0) {
+- close(f_copy);
+- set_perms(backupptr, back_file, NULL, 0);
+- if (verbose > 1)
+- rprintf(FINFO, "backed up %s to %s\n", fname, backupptr);
+- free(back_file);
+notify_others:
+ if (f_out_name >= 0) {
+ write_byte(f_out_name, fnamecmp_type);
+ io_flush(NORMAL_FLUSH); /* XXX make this more efficient! */
-+ }
-+
-+ write_int(f_out, i);
+ }
- close(fd);
++ write_int(f_out, i);
++
+ if (dry_run || read_batch)
+ return;
+
+ if (statret == 0) {
-+ generate_and_send_sums(fd, st.st_size, f_out);
++ generate_and_send_sums(fd, st.st_size, f_out, f_copy);
++
++ if (f_copy >= 0) {
++ close(f_copy);
++ set_perms(backupptr, back_file, NULL, 0);
++ if (verbose > 1) {
++ rprintf(FINFO, "backed up %s to %s\n",
++ fname, backupptr);
++ }
++ free(back_file);
++ }
+
+ close(fd);
+ } else
{
int i;
int phase = 0;
-@@ -567,7 +580,7 @@ void generate_files(int f_out, struct fi
+@@ -622,7 +639,7 @@ void generate_files(int f_out, struct fi
}
recv_generator(local_name ? local_name : f_name_to(file, fbuf),
}
phase++;
-@@ -584,7 +597,7 @@ void generate_files(int f_out, struct fi
+@@ -639,7 +656,7 @@ void generate_files(int f_out, struct fi
while ((i = get_redo_num()) != -1) {
struct file_struct *file = flist->files[i];
recv_generator(local_name ? local_name : f_name_to(file, fbuf),
}
phase++;
-@@ -603,7 +616,7 @@ void generate_files(int f_out, struct fi
+@@ -658,7 +675,7 @@ void generate_files(int f_out, struct fi
if (!file->basename || !S_ISDIR(file->mode))
continue;
recv_generator(local_name ? local_name : f_name(file),
}
if (verbose > 2)
---- orig/main.c 2004-07-31 16:41:04
+--- orig/main.c 2004-09-18 01:49:33
+++ main.c 2004-07-22 00:10:43
@@ -59,6 +59,7 @@ extern int filesfrom_fd;
extern pid_t cleanup_child_pid;
extern char *rsync_path;
extern char *shell_cmd;
extern char *batch_name;
-@@ -457,7 +458,8 @@ static int do_recv(int f_in,int f_out,st
+@@ -461,7 +462,8 @@ static int do_recv(int f_in,int f_out,st
{
int pid;
int status = 0;
/* The receiving side mustn't obey this, or an existing symlink that
* points to an identical file won't be replaced by the referent. */
-@@ -472,8 +474,9 @@ static int do_recv(int f_in,int f_out,st
+@@ -476,8 +478,9 @@ static int do_recv(int f_in,int f_out,st
delete_files(flist);
}
exit_cleanup(RERR_SOCKETIO);
}
-@@ -481,6 +484,11 @@ static int do_recv(int f_in,int f_out,st
+@@ -485,6 +488,11 @@ static int do_recv(int f_in,int f_out,st
if ((pid = do_fork()) == 0) {
close(error_pipe[0]);
if (f_in != f_out)
close(f_out);
-@@ -490,7 +498,7 @@ static int do_recv(int f_in,int f_out,st
+@@ -494,7 +502,7 @@ static int do_recv(int f_in,int f_out,st
/* set place to send errors */
set_msg_fd_out(error_pipe[1]);
io_flush(FULL_FLUSH);
report(f_in);
-@@ -509,6 +517,11 @@ static int do_recv(int f_in,int f_out,st
+@@ -513,6 +521,11 @@ static int do_recv(int f_in,int f_out,st
stop_write_batch();
close(error_pipe[1]);
if (f_in != f_out)
close(f_in);
-@@ -516,7 +529,7 @@ static int do_recv(int f_in,int f_out,st
+@@ -520,7 +533,7 @@ static int do_recv(int f_in,int f_out,st
set_msg_fd_in(error_pipe[0]);
get_redo_num(); /* Read final MSG_DONE and any prior messages. */
report(-1);
---- orig/receiver.c 2004-08-03 15:34:32
-+++ receiver.c 2004-07-30 07:17:48
-@@ -333,7 +333,8 @@ static void discard_receive_data(int f_i
+--- orig/receiver.c 2004-09-21 09:40:27
++++ receiver.c 2004-09-07 21:57:20
+@@ -329,7 +329,8 @@ static void discard_receive_data(int f_i
* main routine for receiver process.
*
* Receiver process runs on the same host as the generator process. */
{
int next_gen_i = -1;
int fd1,fd2;
-@@ -362,8 +363,13 @@ int recv_files(int f_in, struct file_lis
+@@ -358,8 +359,13 @@ int recv_files(int f_in, struct file_lis
i = read_int(f_in);
if (i == -1) {
if (read_batch) {
next_gen_i = -1;
}
-@@ -411,6 +417,8 @@ int recv_files(int f_in, struct file_lis
+@@ -407,6 +413,8 @@ int recv_files(int f_in, struct file_lis
if (read_batch) {
while (i > next_gen_i) {
next_gen_i = read_int(batch_gen_fd);
if (next_gen_i == -1)
next_gen_i = flist->count;
-@@ -421,6 +429,7 @@ int recv_files(int f_in, struct file_lis
+@@ -417,6 +425,7 @@ int recv_files(int f_in, struct file_lis
discard_receive_data(f_in, file->length);
continue;
}
}
if (server_exclude_list.head
-@@ -430,30 +439,28 @@ int recv_files(int f_in, struct file_lis
+@@ -426,35 +435,31 @@ int recv_files(int f_in, struct file_lis
exit_cleanup(RERR_PROTOCOL);
}
+ case G2R_PARTIAL_DIR:
+ fnamecmp = partialptr ? partialptr : fname;
+ break;
++ case G2R_BACKUP:
++ fnamecmp = get_backup_name(fname);
++ break;
+ default:
+ pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
+ compare_dest, fname);
+ }
} else
- fnamecmp = partialptr = fname;
+-
+- if (inplace && make_backups) {
+- if (!(fnamecmp = get_backup_name(fname)))
+- fnamecmp = partialptr;
+- }
+ fnamecmp = fname;
/* open the file */
if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
rsyserr(FERROR, errno, "fstat %s failed",
full_fname(fnamecmp));
---- orig/rsync.h 2004-08-03 15:41:32
-+++ rsync.h 2004-07-30 07:16:38
-@@ -118,6 +118,9 @@
+--- orig/rsync.h 2004-09-22 08:47:31
++++ rsync.h 2004-09-07 21:52:22
+@@ -119,6 +119,10 @@
#define PDIR_CREATE 1
#define PDIR_DELETE 0
+#define G2R_FNAME 0x80
+#define G2R_PARTIAL_DIR 0x81
++#define G2R_BACKUP 0x82
+
/* Log-message categories. FLOG is only used on the daemon side to
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff