Update TODO to reflect recent changes.

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index a14320d..8505b9b 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -31,10 +31,12 @@ extern struct stats stats;
 
 extern int verbose;
 extern int do_progress;
+extern int am_root;
 extern int am_server;
 extern int always_checksum;
 extern int module_id;
 extern int ignore_errors;
+extern int numeric_ids;
 
 extern int cvs_exclude;
 
@@ -72,14 +74,15 @@ static char empty_sum[MD4_SUM_LENGTH];
 static unsigned int min_file_struct_len;
 
 static void clean_flist(struct file_list *flist, int strip_root, int no_dups);
+static void output_flist(struct file_list *flist);
 
 
 void init_flist(void)
 {
-    struct file_struct f;
+       struct file_struct f;
 
-    /* Figure out how big the file_struct is without trailing padding */
-    min_file_struct_len = ((char*)&f.flags - (char*)&f) + sizeof f.flags;
+       /* Figure out how big the file_struct is without trailing padding */
+       min_file_struct_len = ((char*)&f.flags - (char*)&f) + sizeof f.flags;
 }
 
 
@@ -297,10 +300,9 @@ static void flist_expand(struct file_list *flist)
 
                if (verbose >= 2) {
                        rprintf(FINFO, "[%s] expand file_list to %.0f bytes, did%s move\n",
-                               who_am_i(),
-                               (double)sizeof(flist->files[0])
-                               * flist->malloced,
-                               (new_ptr == flist->files) ? " not" : "");
+                           who_am_i(),
+                           (double) sizeof flist->files[0] * flist->malloced,
+                           (new_ptr == flist->files) ? " not" : "");
                }
 
                flist->files = (struct file_struct **) new_ptr;
@@ -434,11 +436,13 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
        if (!(flags & XMIT_SAME_MODE))
                write_int(f, to_wire_mode(mode));
        if (preserve_uid && !(flags & XMIT_SAME_UID)) {
-               add_uid(uid);
+               if (!numeric_ids)
+                       add_uid(uid);
                write_int(f, uid);
        }
        if (preserve_gid && !(flags & XMIT_SAME_GID)) {
-               add_gid(gid);
+               if (!numeric_ids)
+                       add_gid(gid);
                write_int(f, gid);
        }
        if (preserve_devices && IS_DEVICE(mode)) {
@@ -767,13 +771,12 @@ struct file_struct *make_file(char *fname, int exclude_level)
                return NULL;
        }
 
-       if (one_file_system && st.st_dev != filesystem_dev) {
-               /* We allow a directory though to preserve the mount point.
-                * However, flag it so that we don't recurse. */
-               if (!S_ISDIR(st.st_mode))
-                       return NULL;
+       /* We only care about directories because we need to avoid recursing
+        * into a mount-point directory, not to avoid copying a symlinked
+        * file if -L (or similar) was specified. */
+       if (one_file_system && st.st_dev != filesystem_dev
+           && S_ISDIR(st.st_mode))
                flags |= FLAG_MOUNT_POINT;
-       }
 
        if (check_exclude_file(thisname, S_ISDIR(st.st_mode) != 0, exclude_level))
                return NULL;
@@ -811,9 +814,17 @@ struct file_struct *make_file(char *fname, int exclude_level)
 
 #if SUPPORT_HARD_LINKS
        if (preserve_hard_links) {
-               idev_len = (protocol_version < 28 ? S_ISREG(st.st_mode)
-                         : !S_ISDIR(st.st_mode) && st.st_nlink > 1)
-                        ? sizeof (struct idev) : 0;
+               if (protocol_version < 28) {
+                       if (S_ISREG(st.st_mode))
+                               idev_len = sizeof (struct idev);
+                       else
+                               idev_len = 0;
+               } else {
+                       if (!S_ISDIR(st.st_mode) && st.st_nlink > 1)
+                               idev_len = sizeof (struct idev);
+                       else
+                               idev_len = 0;
+               }
        } else
 #endif
                idev_len = 0;
@@ -1183,6 +1194,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                        write_batch_flist_info(flist->count, flist->files);
        }
 
+       if (verbose > 3)
+               output_flist(flist);
+
        if (verbose > 2)
                rprintf(FINFO, "send_file_list done\n");
 
@@ -1258,6 +1272,9 @@ struct file_list *recv_file_list(int f)
                }
        }
 
+       if (verbose > 3)
+               output_flist(flist);
+
        if (list_only) {
                int i;
                for (i = 0; i < flist->count; i++)
@@ -1330,7 +1347,7 @@ void free_file(struct file_struct *file, int free_the_struct)
        if (free_the_struct)
                free(file);
        else
-               memset(file, 0, sizeof file[0]);
+               memset(file, 0, min_file_struct_len);
 }
 
 
@@ -1377,7 +1394,7 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
                return;
 
        qsort(flist->files, flist->count,
-             sizeof(flist->files[0]), (int (*)()) file_compare);
+             sizeof flist->files[0], (int (*)()) file_compare);
 
        for (i = no_dups? 0 : flist->count; i < flist->count; i++) {
                if (flist->files[i]->basename) {
@@ -1422,18 +1439,28 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
                        }
                }
        }
+}
 
-       if (verbose <= 3)
-               return;
+static void output_flist(struct file_list *flist)
+{
+       char uidbuf[16], gidbuf[16];
+       struct file_struct *file;
+       int i;
 
        for (i = 0; i < flist->count; i++) {
-               rprintf(FINFO, "[%s] i=%d %s %s %s mode=0%o len=%.0f\n",
-                       who_am_i(), i,
-                       NS(flist->files[i]->basedir),
-                       NS(flist->files[i]->dirname),
-                       NS(flist->files[i]->basename),
-                       (int) flist->files[i]->mode,
-                       (double) flist->files[i]->length);
+               file = flist->files[i];
+               if (am_root && preserve_uid)
+                       sprintf(uidbuf, " uid=%ld", (long)file->uid);
+               else
+                       *uidbuf = '\0';
+               if (preserve_gid && file->gid != GID_NONE)
+                       sprintf(gidbuf, " gid=%ld", (long)file->gid);
+               else
+                       *gidbuf = '\0';
+               rprintf(FINFO, "[%s] i=%d %s %s %s mode=0%o len=%.0f%s%s\n",
+                       who_am_i(), i, NS(file->basedir), NS(file->dirname),
+                       NS(file->basename), (int) file->mode,
+                       (double) file->length, uidbuf, gidbuf);
        }
 }