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
- The variable allowed_lull is now our global.
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
a1e5663
..
e46da84
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-186,7
+186,7
@@
static int delete_item(char *fname, int mode, int flags)
if (do_rmdir(fname) == 0) {
if (!(flags & DEL_TERSE))
log_delete(fname, mode);
if (do_rmdir(fname) == 0) {
if (!(flags & DEL_TERSE))
log_delete(fname, mode);
- } else if (errno != ENOTEMPTY && errno != ENOENT) {
+ } else if (errno != ENOTEMPTY && errno != E
EXIST && errno != E
NOENT) {
rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
full_fname(fname));
return -1;
rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
full_fname(fname));
return -1;
@@
-282,7
+282,8
@@
static void do_delete_pass(struct file_list *flist)
char fbuf[MAXPATHLEN];
int j;
char fbuf[MAXPATHLEN];
int j;
- if (dry_run > 1) /* destination doesn't exist yet */
+ if (dry_run > 1 /* destination doesn't exist yet */
+ || list_only)
return;
for (j = 0; j < flist->count; j++) {
return;
for (j = 0; j < flist->count; j++) {
@@
-726,16
+727,6
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
return;
}
return;
}
- if (max_size && file->length > max_size) {
- if (verbose > 1) {
- if (the_file_list->count == 1)
- fname = f_name(file);
- rprintf(FINFO, "%s is over max-size\n",
- safe_fname(fname));
- }
- return;
- }
-
if (preserve_links && S_ISLNK(file->mode)) {
#ifdef SUPPORT_LINKS
if (safe_symlinks && unsafe_symlink(file->u.link, fname)) {
if (preserve_links && S_ISLNK(file->mode)) {
#ifdef SUPPORT_LINKS
if (safe_symlinks && unsafe_symlink(file->u.link, fname)) {
@@
-847,6
+838,16
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
return;
}
return;
}
+ if (max_size && file->length > max_size) {
+ if (verbose > 1) {
+ if (the_file_list->count == 1)
+ fname = f_name(file);
+ rprintf(FINFO, "%s is over max-size\n",
+ safe_fname(fname));
+ }
+ return;
+ }
+
if (opt_ignore_existing && statret == 0) {
if (verbose > 1)
rprintf(FINFO, "%s exists\n", safe_fname(fname));
if (opt_ignore_existing && statret == 0) {
if (verbose > 1)
rprintf(FINFO, "%s exists\n", safe_fname(fname));