Changed verbosity back from -vvvv to -vv.

[rsync/rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index 935c5dd..292e518 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -166,15 +166,19 @@ int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr,
                if (ndx < 0 || ndx >= dir_flist->count) {
                        ndx = NDX_FLIST_OFFSET - ndx;
                        rprintf(FERROR,
-                               "Invalid dir index: %d (%d - %d)\n",
-                               ndx, NDX_FLIST_OFFSET,
-                               NDX_FLIST_OFFSET - dir_flist->count);
+                               "[%s] Invalid dir index: %d (%d - %d)\n",
+                               who_am_i(), ndx, NDX_FLIST_OFFSET,
+                               NDX_FLIST_OFFSET - dir_flist->count + 1);
                        exit_cleanup(RERR_PROTOCOL);
                }
 
                /* 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);
+               }
                flist = recv_file_list(f_in);
                flist->parent_ndx = ndx;
                stop_flist_forward();
@@ -322,9 +326,9 @@ int set_file_attrs(const char *fname, struct file_struct *file, statx *sxp,
                        updated = 1;
        }
 
-       change_uid = am_root && preserve_uid && sxp->st.st_uid != F_OWNER(file);
+       change_uid = am_root && preserve_uid && sxp->st.st_uid != (uid_t)F_OWNER(file);
        change_gid = preserve_gid && !(file->flags & FLAG_SKIP_GROUP)
-                 && sxp->st.st_gid != F_GROUP(file);
+                 && sxp->st.st_gid != (gid_t)F_GROUP(file);
 #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
        if (S_ISLNK(sxp->st.st_mode))
                ;
@@ -346,8 +350,8 @@ int set_file_attrs(const char *fname, struct file_struct *file, statx *sxp,
                if (am_root < 0) {
                        ;
                } else if (do_lchown(fname,
-                   change_uid ? F_OWNER(file) : sxp->st.st_uid,
-                   change_gid ? F_GROUP(file) : sxp->st.st_gid) != 0) {
+                   change_uid ? (uid_t)F_OWNER(file) : sxp->st.st_uid,
+                   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",