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
When we say we're skipping a non-regular file, actually skip it.
[rsync/rsync.git]
/
backup.c
diff --git
a/backup.c
b/backup.c
index
ed08fae
..
05f5360
100644
(file)
--- a/
backup.c
+++ b/
backup.c
@@
-228,6
+228,7
@@
static int keep_backup(char *fname)
if (!kept && !S_ISREG(file->mode)) {
rprintf(FINFO, "make_bak: skipping non-regular file %s\n",
fname);
if (!kept && !S_ISREG(file->mode)) {
rprintf(FINFO, "make_bak: skipping non-regular file %s\n",
fname);
+ return 1;
}
/* move to keep tree if a file */
}
/* move to keep tree if a file */
@@
-237,7
+238,7
@@
static int keep_backup(char *fname)
full_fname(fname), backup_dir_buf);
} else if (st.st_nlink > 1) {
/* If someone has hard-linked the file into the backup
full_fname(fname), backup_dir_buf);
} else if (st.st_nlink > 1) {
/* If someone has hard-linked the file into the backup
- * dir, rename()
can
return success but do nothing! */
+ * dir, rename()
might
return success but do nothing! */
robust_unlink(fname); /* Just in case... */
}
}
robust_unlink(fname); /* Just in case... */
}
}