aboutsummaryrefslogtreecommitdiffstats
path: root/backup.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2006-01-13 21:17:09 +0000
committerWayne Davison <wayned@samba.org>2006-01-13 21:17:09 +0000
commit45c49b52a488882bbbd5366420389abbbeede7c9 (patch)
treefe86f6a50bb45f0a4eeeb71a9c8f02d0f487b592 /backup.c
parent0ee32c62d3ba303f30007c8d53f327a8d98bfdf9 (diff)
downloadandroid_external_rsync-45c49b52a488882bbbd5366420389abbbeede7c9.tar.gz
android_external_rsync-45c49b52a488882bbbd5366420389abbbeede7c9.tar.bz2
android_external_rsync-45c49b52a488882bbbd5366420389abbbeede7c9.zip
Got rid of calls to (the soon to vanish) safe_fname() function.
Diffstat (limited to 'backup.c')
-rw-r--r--backup.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/backup.c b/backup.c
index 84715db8..e34b7be9 100644
--- a/backup.c
+++ b/backup.c
@@ -65,8 +65,7 @@ static int make_simple_backup(char *fname)
if (do_rename(fname, fnamebak) == 0) {
if (verbose > 1) {
rprintf(FINFO, "backed up %s to %s\n",
- safe_fname(fname),
- safe_fname(fnamebak));
+ fname, fnamebak);
}
break;
}
@@ -81,7 +80,7 @@ static int make_simple_backup(char *fname)
continue;
rsyserr(FERROR, rename_errno, "rename %s to backup %s",
- safe_fname(fname), safe_fname(fnamebak));
+ fname, fnamebak);
errno = rename_errno;
return 0;
}
@@ -197,7 +196,7 @@ static int keep_backup(char *fname)
full_fname(buf));
} else if (verbose > 2) {
rprintf(FINFO, "make_backup: DEVICE %s successful.\n",
- safe_fname(fname));
+ fname);
}
kept = 1;
do_unlink(fname);
@@ -235,7 +234,7 @@ static int keep_backup(char *fname)
|| do_symlink(file->u.link, buf) < 0)) {
rsyserr(FERROR, errno, "link %s -> \"%s\"",
full_fname(buf),
- safe_fname(file->u.link));
+ file->u.link);
}
do_unlink(fname);
kept = 1;
@@ -245,7 +244,7 @@ static int keep_backup(char *fname)
if (!kept && !S_ISREG(file->mode)) {
rprintf(FINFO, "make_bak: skipping non-regular file %s\n",
- safe_fname(fname));
+ fname);
return 1;
}
@@ -253,7 +252,7 @@ static int keep_backup(char *fname)
if (!kept) {
if (robust_move(fname, buf) != 0) {
rsyserr(FERROR, errno, "keep_backup failed: %s -> \"%s\"",
- full_fname(fname), safe_fname(buf));
+ full_fname(fname), buf);
} else if (st.st_nlink > 1) {
/* If someone has hard-linked the file into the backup
* dir, rename() might return success but do nothing! */
@@ -265,7 +264,7 @@ static int keep_backup(char *fname)
if (verbose > 1) {
rprintf(FINFO, "backed up %s to %s\n",
- safe_fname(fname), safe_fname(buf));
+ fname, buf);
}
return 1;
}