Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Further modifications to the copyright comment section.
[rsync/rsync.git]
/
receiver.c
diff --git
a/receiver.c
b/receiver.c
index
62d024c
..
3615e03
100644
(file)
--- a/
receiver.c
+++ b/
receiver.c
@@
-3,12
+3,11
@@
*
* Copyright (C) 1996-2000 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
*
* Copyright (C) 1996-2000 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003
, 2004, 2005, 2006
Wayne Davison
+ * Copyright (C) 2003
-2007
Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-26,7
+25,7
@@
extern int verbose;
extern int do_xfers;
extern int am_server;
extern int do_progress;
extern int do_xfers;
extern int am_server;
extern int do_progress;
-extern int inc
remental
;
+extern int inc
_recurse
;
extern int log_before_transfer;
extern int stdout_format_has_i;
extern int logfile_format_has_i;
extern int log_before_transfer;
extern int stdout_format_has_i;
extern int logfile_format_has_i;
@@
-36,10
+35,12
@@
extern int write_batch;
extern int batch_gen_fd;
extern int protocol_version;
extern int relative_paths;
extern int batch_gen_fd;
extern int protocol_version;
extern int relative_paths;
+extern int preserve_hard_links;
extern int preserve_perms;
extern int basis_dir_cnt;
extern int make_backups;
extern int cleanup_got_literal;
extern int preserve_perms;
extern int basis_dir_cnt;
extern int make_backups;
extern int cleanup_got_literal;
+extern int remove_source_files;
extern int append_mode;
extern int sparse_files;
extern int keep_partial;
extern int append_mode;
extern int sparse_files;
extern int keep_partial;
@@
-316,7
+317,7
@@
static int get_next_gen_ndx(int fd, int next_gen_ndx, int desired_ndx)
}
next_gen_ndx = read_int(fd);
if (next_gen_ndx == -1) {
}
next_gen_ndx = read_int(fd);
if (next_gen_ndx == -1) {
- if (inc
remental
)
+ if (inc
_recurse
)
next_gen_ndx = first_flist->prev->count + first_flist->prev->ndx_start;
else
next_gen_ndx = cur_flist->count;
next_gen_ndx = first_flist->prev->count + first_flist->prev->ndx_start;
else
next_gen_ndx = cur_flist->count;
@@
-363,13
+364,13
@@
int recv_files(int f_in, char *local_name)
ndx = read_ndx_and_attrs(f_in, -1, &iflags,
&fnamecmp_type, xname, &xlen);
if (ndx == NDX_DONE) {
ndx = read_ndx_and_attrs(f_in, -1, &iflags,
&fnamecmp_type, xname, &xlen);
if (ndx == NDX_DONE) {
- if (inc
remental
&& first_flist) {
+ if (inc
_recurse
&& first_flist) {
flist_free(first_flist);
if (first_flist)
continue;
}
if (read_batch && cur_flist) {
flist_free(first_flist);
if (first_flist)
continue;
}
if (read_batch && cur_flist) {
- int high = inc
remental
+ int high = inc
_recurse
? first_flist->prev->count + first_flist->prev->ndx_start
: cur_flist->count;
get_next_gen_ndx(batch_gen_fd, next_gen_ndx, high);
? first_flist->prev->count + first_flist->prev->ndx_start
: cur_flist->count;
get_next_gen_ndx(batch_gen_fd, next_gen_ndx, high);
@@
-662,7
+663,7
@@
int recv_files(int f_in, char *local_name)
cleanup_disable();
if (recv_ok > 0) {
cleanup_disable();
if (recv_ok > 0) {
- if (remove_source_files || inc
remental
+ if (remove_source_files || inc
_recurse
|| (preserve_hard_links && F_IS_HLINKED(file)))
send_msg_int(MSG_SUCCESS, ndx);
} else if (!recv_ok) {
|| (preserve_hard_links && F_IS_HLINKED(file)))
send_msg_int(MSG_SUCCESS, ndx);
} else if (!recv_ok) {
@@
-689,7
+690,7
@@
int recv_files(int f_in, char *local_name)
if (!redoing) {
send_msg_int(MSG_REDO, ndx);
file->flags |= FLAG_FILE_SENT;
if (!redoing) {
send_msg_int(MSG_REDO, ndx);
file->flags |= FLAG_FILE_SENT;
- } else if (inc
remental
)
+ } else if (inc
_recurse
)
send_msg_int(MSG_NO_SEND, ndx);
}
}
send_msg_int(MSG_NO_SEND, ndx);
}
}