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
- Use the new delete_before var.
[rsync/rsync.git]
/
receiver.c
diff --git
a/receiver.c
b/receiver.c
index
88552f4
..
76508bf
100644
(file)
--- a/
receiver.c
+++ b/
receiver.c
@@
-21,7
+21,6
@@
#include "rsync.h"
extern int verbose;
#include "rsync.h"
extern int verbose;
-extern int recurse;
extern int delete_after;
extern int max_delete;
extern int csum_length;
extern int delete_after;
extern int max_delete;
extern int csum_length;
@@
-32,6
+31,7
@@
extern int batch_gen_fd;
extern int am_server;
extern int protocol_version;
extern int relative_paths;
extern int am_server;
extern int protocol_version;
extern int relative_paths;
+extern int keep_dirs;
extern int keep_dirlinks;
extern int preserve_hard_links;
extern int preserve_perms;
extern int keep_dirlinks;
extern int preserve_hard_links;
extern int preserve_perms;
@@
-82,7
+82,7
@@
void delete_files(struct file_list *flist)
}
for (j = 0; j < flist->count; j++) {
}
for (j = 0; j < flist->count; j++) {
- if (!(flist->files[j]->flags & FLAG_
TOP_DIR
)
+ if (!(flist->files[j]->flags & FLAG_
DEL_START
)
|| !S_ISDIR(flist->files[j]->mode))
continue;
|| !S_ISDIR(flist->files[j]->mode))
continue;
@@
-111,7
+111,7
@@
void delete_files(struct file_list *flist)
}
} else {
delete_file(f, S_ISDIR(mode)
}
} else {
delete_file(f, S_ISDIR(mode)
-
? DEL_DIR | DEL_NO
_RECURSE : 0);
+
? DEL_DIR | DEL
_RECURSE : 0);
}
deletion_count++;
}
}
deletion_count++;
}
@@
-600,7
+600,7
@@
int recv_files(int f_in, struct file_list *flist, char *local_name,
}
make_backups = save_make_backups;
}
make_backups = save_make_backups;
- if (delete_after &&
recurse
&& !local_name && flist->count > 0)
+ if (delete_after &&
keep_dirs
&& !local_name && flist->count > 0)
delete_files(flist);
if (verbose > 2)
delete_files(flist);
if (verbose > 2)