diff options
author | Wayne Davison <wayned@samba.org> | 2007-11-22 09:56:21 -0800 |
---|---|---|
committer | Wayne Davison <wayned@samba.org> | 2007-11-22 10:05:36 -0800 |
commit | 3f0211b63a6cdc4a2cecfd2a0dffeba172c86a47 (patch) | |
tree | 2ec9e186c513214ff35ea1060b773e1d63106858 /rsync.c | |
parent | a6c6f8e650f9790c7827ad1ff321fe21daf522cf (diff) | |
download | android_external_rsync-3f0211b63a6cdc4a2cecfd2a0dffeba172c86a47.tar.gz android_external_rsync-3f0211b63a6cdc4a2cecfd2a0dffeba172c86a47.tar.bz2 android_external_rsync-3f0211b63a6cdc4a2cecfd2a0dffeba172c86a47.zip |
New logging categories added to allow differentiation between
transfer errors, normal errors, and warnings. New messages are
translated into old FERROR/FINFO categories for older protocols.
Diffstat (limited to 'rsync.c')
-rw-r--r-- | rsync.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -350,7 +350,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, if (dry_run) return 1; if (link_stat(fname, &sx2.st, 0) < 0) { - rsyserr(FERROR, errno, "stat %s failed", + rsyserr(FERROR_XFER, errno, "stat %s failed", full_fname(fname)); return 0; } @@ -389,7 +389,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, && cmp_time(sxp->st.st_mtime, file->modtime) != 0) { int ret = set_modtime(fname, file->modtime, sxp->st.st_mode); if (ret < 0) { - rsyserr(FERROR, errno, "failed to set times on %s", + rsyserr(FERROR_XFER, errno, "failed to set times on %s", full_fname(fname)); goto cleanup; } @@ -425,7 +425,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, change_gid ? (gid_t)F_GROUP(file) : sxp->st.st_gid) != 0) { /* shouldn't have attempted to change uid or gid * unless have the privilege */ - rsyserr(FERROR, errno, "%s %s failed", + rsyserr(FERROR_XFER, errno, "%s %s failed", change_uid ? "chown" : "chgrp", full_fname(fname)); goto cleanup; @@ -458,7 +458,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, if (!BITS_EQUAL(sxp->st.st_mode, new_mode, CHMOD_BITS)) { int ret = am_root < 0 ? 0 : do_chmod(fname, new_mode); if (ret < 0) { - rsyserr(FERROR, errno, + rsyserr(FERROR_XFER, errno, "failed to set permissions on %s", full_fname(fname)); goto cleanup; @@ -533,7 +533,7 @@ void finish_transfer(const char *fname, const char *fnametmp, ret = robust_rename(fnametmp, fname, partialptr, file->mode & INITACCESSPERMS); if (ret < 0) { - rsyserr(FERROR, errno, "%s %s -> \"%s\"", + rsyserr(FERROR_XFER, errno, "%s %s -> \"%s\"", ret == -2 ? "copy" : "rename", full_fname(fnametmp), fname); do_unlink(fnametmp); @@ -553,7 +553,7 @@ void finish_transfer(const char *fname, const char *fnametmp, if (partialptr) { if (do_rename(fnametmp, fname) < 0) { - rsyserr(FERROR, errno, "rename %s -> \"%s\"", + rsyserr(FERROR_XFER, errno, "rename %s -> \"%s\"", full_fname(fnametmp), fname); } else handle_partial_dir(partialptr, PDIR_DELETE); |