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
Document --delete-before and --delete's new "during" behavior.
[rsync/rsync.git]
/
backup.c
diff --git
a/backup.c
b/backup.c
index
ca43386
..
c909a94
100644
(file)
--- a/
backup.c
+++ b/
backup.c
@@
-162,12
+162,7
@@
static int keep_backup(char *fname)
int ret_code;
/* return if no file to keep */
int ret_code;
/* return if no file to keep */
-#if SUPPORT_LINKS
- ret_code = do_lstat(fname, &st);
-#else
- ret_code = do_stat(fname, &st);
-#endif
- if (ret_code < 0)
+ if (do_lstat(fname, &st) < 0)
return 1;
if (!(file = make_file(fname, NULL, NO_EXCLUDES)))
return 1;
if (!(file = make_file(fname, NULL, NO_EXCLUDES)))
@@
-176,7
+171,6
@@
static int keep_backup(char *fname)
if (!(buf = get_backup_name(fname)))
return 0;
if (!(buf = get_backup_name(fname)))
return 0;
-#ifdef HAVE_MKNOD
/* Check to see if this is a device file, or link */
if (IS_DEVICE(file->mode)) {
if (am_root && preserve_devices) {
/* Check to see if this is a device file, or link */
if (IS_DEVICE(file->mode)) {
if (am_root && preserve_devices) {
@@
-194,7
+188,6
@@
static int keep_backup(char *fname)
kept = 1;
do_unlink(fname);
}
kept = 1;
do_unlink(fname);
}
-#endif
if (!kept && S_ISDIR(file->mode)) {
/* make an empty directory */
if (!kept && S_ISDIR(file->mode)) {
/* make an empty directory */
@@
-254,7
+247,7
@@
static int keep_backup(char *fname)
free(file);
if (verbose > 1)
free(file);
if (verbose > 1)
- rprintf(FINFO, "
keep_backup %s ->
%s\n", fname, buf);
+ rprintf(FINFO, "
backed up %s to
%s\n", fname, buf);
return 1;
}
return 1;
}