New logging categories added to allow differentiation between

[rsync/rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index d22e4df..c5bcbb5 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -71,7 +71,7 @@ static const char *default_charset(void)
 # endif
 }
 
-void setup_iconv()
+void setup_iconv(void)
 {
        const char *defset = default_charset();
 # ifdef ICONV_OPTION
@@ -134,8 +134,6 @@ void setup_iconv()
 # endif
 }
 
-# ifdef ICONV_OPTION
-
 /* This function converts the characters in the "in" xbuf into characters
  * in the "out" xbuf.  The "len" of the "in" xbuf is used starting from its
  * "pos".  The "size" of the "out" xbuf restricts how many characters can be
@@ -205,7 +203,6 @@ int iconvbufs(iconv_t ic, xbuf *in, xbuf *out, int flags)
 
        return errno ? -1 : 0;
 }
-# endif
 #endif
 
 int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr,
@@ -214,7 +211,7 @@ int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr,
        int len, iflags = 0;
        struct file_list *flist;
        uchar fnamecmp_type = FNAMECMP_FNAME;
-       int ndx;
+       int ndx, save_verbose = verbose;
 
   read_loop:
        while (1) {
@@ -242,15 +239,17 @@ int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr,
                }
 
                /* Send everything read from f_in to msg_fd_out. */
-               send_msg_int(MSG_FLIST, ndx);
-               start_flist_forward(f_in);
                if (verbose > 3) {
                        rprintf(FINFO, "[%s] receiving flist for dir %d\n",
                                who_am_i(), ndx);
                }
+               verbose = 0;
+               send_msg_int(MSG_FLIST, ndx);
+               start_flist_forward(f_in);
                flist = recv_file_list(f_in);
                flist->parent_ndx = ndx;
                stop_flist_forward();
+               verbose = save_verbose;
        }
 
        iflags = protocol_version >= 29 ? read_shortint(f_in)
@@ -268,7 +267,8 @@ int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr,
          invalid_ndx:
                rprintf(FERROR,
                        "Invalid file index: %d (%d - %d) with iflags %x [%s]\n",
-                       ndx, first_flist->ndx_start - 1, first_flist->prev->ndx_end,
+                       ndx, first_flist ? first_flist->ndx_start - 1 : -1,
+                       first_flist ? first_flist->prev->ndx_end : -1,
                        iflags, who_am_i());
                exit_cleanup(RERR_PROTOCOL);
        }
@@ -337,11 +337,11 @@ mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms,
        return new_mode;
 }
 
-int set_file_attrs(const char *fname, struct file_struct *file, statx *sxp,
+int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
                   const char *fnamecmp, int flags)
 {
        int updated = 0;
-       statx sx2;
+       stat_x sx2;
        int change_uid, change_gid;
        mode_t new_mode = file->mode;
        int inherit;
@@ -350,7 +350,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, statx *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, statx *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;
                }
@@ -401,9 +401,9 @@ int set_file_attrs(const char *fname, struct file_struct *file, statx *sxp,
        change_gid = gid_ndx && !(file->flags & FLAG_SKIP_GROUP)
                  && sxp->st.st_gid != (gid_t)F_GROUP(file);
 #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
-       if (S_ISLNK(sxp->st.st_mode))
+       if (S_ISLNK(sxp->st.st_mode)) {
                ;
-       else
+       } else
 #endif
        if (change_uid || change_gid) {
                if (verbose > 2) {
@@ -425,7 +425,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, statx *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, statx *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);