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
added --existing option, similar to one suggested by Gildas Quiniou <gildas@stip.fr>
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
c6e0006
..
b97c919
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-23,8
+23,6
@@
extern struct stats stats;
extern struct stats stats;
-extern int csum_length;
-
extern int verbose;
extern int am_server;
extern int always_checksum;
extern int verbose;
extern int am_server;
extern int always_checksum;
@@
-47,6
+45,7
@@
extern int copy_links;
extern int copy_unsafe_links;
extern int remote_version;
extern int io_error;
extern int copy_unsafe_links;
extern int remote_version;
extern int io_error;
+extern int sanitize_paths;
static char topsrcname[MAXPATHLEN];
static char topsrcname[MAXPATHLEN];
@@
-254,7
+253,11
@@
static void send_file_entry(struct file_struct *file,int f,unsigned base_flags)
#endif
if (always_checksum) {
#endif
if (always_checksum) {
- write_buf(f,file->sum,csum_length);
+ if (remote_version < 21) {
+ write_buf(f,file->sum,2);
+ } else {
+ write_buf(f,file->sum,MD4_SUM_LENGTH);
+ }
}
last_mode = file->mode;
}
last_mode = file->mode;
@@
-307,6
+310,10
@@
static void receive_file_entry(struct file_struct **fptr,
clean_fname(thisname);
clean_fname(thisname);
+ if (sanitize_paths) {
+ sanitize_path(thisname, NULL);
+ }
+
if ((p = strrchr(thisname,'/'))) {
static char *lastdir;
*p = 0;
if ((p = strrchr(thisname,'/'))) {
static char *lastdir;
*p = 0;
@@
-341,6
+348,9
@@
static void receive_file_entry(struct file_struct **fptr,
file->link = (char *)malloc(l+1);
if (!file->link) out_of_memory("receive_file_entry 2");
read_sbuf(f,file->link,l);
file->link = (char *)malloc(l+1);
if (!file->link) out_of_memory("receive_file_entry 2");
read_sbuf(f,file->link,l);
+ if (sanitize_paths) {
+ sanitize_path(file->link, file->dirname);
+ }
}
#if SUPPORT_HARD_LINKS
}
#if SUPPORT_HARD_LINKS
@@
-353,7
+363,11
@@
static void receive_file_entry(struct file_struct **fptr,
if (always_checksum) {
file->sum = (char *)malloc(MD4_SUM_LENGTH);
if (!file->sum) out_of_memory("md4 sum");
if (always_checksum) {
file->sum = (char *)malloc(MD4_SUM_LENGTH);
if (!file->sum) out_of_memory("md4 sum");
- read_buf(f,file->sum,csum_length);
+ if (remote_version < 21) {
+ read_buf(f,file->sum,2);
+ } else {
+ read_buf(f,file->sum,MD4_SUM_LENGTH);
+ }
}
last_mode = file->mode;
}
last_mode = file->mode;
@@
-408,6
+422,9
@@
static struct file_struct *make_file(int f, char *fname)
strlcpy(cleaned_name, fname, MAXPATHLEN);
cleaned_name[MAXPATHLEN-1] = 0;
clean_fname(cleaned_name);
strlcpy(cleaned_name, fname, MAXPATHLEN);
cleaned_name[MAXPATHLEN-1] = 0;
clean_fname(cleaned_name);
+ if (sanitize_paths) {
+ sanitize_path(cleaned_name, NULL);
+ }
fname = cleaned_name;
memset(sum,0,SUM_LENGTH);
fname = cleaned_name;
memset(sum,0,SUM_LENGTH);
@@
-752,7
+769,8
@@
struct file_list *send_file_list(int f,int argc,char *argv[])
/* if protocol version is >= 17 then send the io_error flag */
if (f != -1 && remote_version >= 17) {
/* if protocol version is >= 17 then send the io_error flag */
if (f != -1 && remote_version >= 17) {
- write_int(f, io_error);
+ extern int module_id;
+ write_int(f, lp_ignore_errors(module_id)? 0 : io_error);
}
if (f != -1) {
}
if (f != -1) {
@@
-837,7
+855,12
@@
struct file_list *recv_file_list(int f)
/* if protocol version is >= 17 then recv the io_error flag */
if (f != -1 && remote_version >= 17) {
/* if protocol version is >= 17 then recv the io_error flag */
if (f != -1 && remote_version >= 17) {
- io_error |= read_int(f);
+ extern int module_id;
+ if (lp_ignore_errors(module_id)) {
+ read_int(f);
+ } else {
+ io_error |= read_int(f);
+ }
}
if (list_only) {
}
if (list_only) {