Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e012f85
)
Added support for multiple --*-dest options.
author
Wayne Davison
<wayned@samba.org>
Sat, 27 Nov 2004 17:56:58 +0000
(17:56 +0000)
committer
Wayne Davison
<wayned@samba.org>
Sat, 27 Nov 2004 17:56:58 +0000
(17:56 +0000)
receiver.c
patch
|
blob
|
blame
|
history
diff --git
a/receiver.c
b/receiver.c
index
569b8fb
..
b4a32d5
100644
(file)
--- a/
receiver.c
+++ b/
receiver.c
@@
-39,7
+39,7
@@
extern int cvs_exclude;
extern int io_error;
extern char *tmpdir;
extern char *partial_dir;
extern int io_error;
extern char *tmpdir;
extern char *partial_dir;
-extern char *
compare_dest
;
+extern char *
basis_dir[]
;
extern int make_backups;
extern int do_progress;
extern char *backup_dir;
extern int make_backups;
extern int do_progress;
extern char *backup_dir;
@@
-439,7
+439,8
@@
int recv_files(int f_in, struct file_list *flist, char *local_name,
partialptr = partial_dir ? partial_dir_fname(fname) : fname;
if (f_in_name >= 0) {
partialptr = partial_dir ? partial_dir_fname(fname) : fname;
if (f_in_name >= 0) {
- switch (read_byte(f_in_name)) {
+ uchar j;
+ switch (j = read_byte(f_in_name)) {
case FNAMECMP_FNAME:
fnamecmp = fname;
break;
case FNAMECMP_FNAME:
fnamecmp = fname;
break;
@@
-449,10
+450,10
@@
int recv_files(int f_in, struct file_list *flist, char *local_name,
case FNAMECMP_BACKUP:
fnamecmp = get_backup_name(fname);
break;
case FNAMECMP_BACKUP:
fnamecmp = get_backup_name(fname);
break;
- case FNAMECMP_
CMPDEST
:
+ case FNAMECMP_
BASIS_DIR
:
default:
pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
default:
pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
-
compare_dest
, fname);
+
basis_dir[j]
, fname);
fnamecmp = fnamecmpbuf;
break;
}
fnamecmp = fnamecmpbuf;
break;
}