Made the types used in the sum_buf and sum_struct structures consistent

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index fd2ac59..d017762 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -30,6 +30,9 @@ extern int preserve_links;
 extern int am_root;
 extern int preserve_devices;
 extern int preserve_hard_links;
+extern int preserve_perms;
+extern int preserve_uid;
+extern int preserve_gid;
 extern int update_only;
 extern int opt_ignore_existing;
 extern int csum_length;
@@ -50,18 +53,15 @@ static int skip_file(char *fname,
                return 0;
        }
        if (link_dest) {
-               extern int preserve_perms;
-               extern int preserve_uid;
-               extern int preserve_gid;
-
                if (preserve_perms
                    && (st->st_mode & ~_S_IFMT) != (file->mode & ~_S_IFMT))
                        return 0;
 
-               if (preserve_uid && st->st_uid != file->uid)
+               if (am_root && preserve_uid && st->st_uid != file->uid)
                        return 0;
 
-               if (preserve_gid && st->st_gid != file->gid)
+               if (preserve_gid && file->gid != GID_NONE
+                   && st->st_gid != file->gid)
                        return 0;
        }
 
@@ -136,8 +136,9 @@ void write_sum_head(int f, struct sum_struct *sum)
 
 static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
 {
-       extern int block_size;
-       int blength, s2length, b;
+       extern unsigned int block_size;
+       unsigned int blength;
+       int s2length;
        uint32 c;
        uint64 l;
 
@@ -166,7 +167,7 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
        } else if (csum_length == SUM_LENGTH) {
                s2length = SUM_LENGTH;
        } else {
-               b = BLOCKSUM_BIAS;
+               int b = BLOCKSUM_BIAS;
                l = len;
                while (l >>= 1) {
                        b += 2;
@@ -191,10 +192,9 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
        sum->remainder  = (len % blength);
 
        if (sum->count && verbose > 2) {
-               rprintf(FINFO, "count=%ld rem=%ld blength=%ld s2length=%ld flength=%.0f\n",
-                       (long) sum->count, (long) sum->remainder,
-                       (long) sum->blength, (long) sum->s2length,
-                       (double) sum->flength);
+               rprintf(FINFO, "count=%ld rem=%u blength=%u s2length=%d flength=%.0f\n",
+                       (long)sum->count, sum->remainder, sum->blength,
+                       sum->s2length, (double)sum->flength);
        }
 }
 
@@ -226,7 +226,7 @@ static BOOL disable_deltas_p(void)
  *
  * Generate approximately one checksum every block_len bytes.
  */
-static void generate_and_send_sums(struct map_struct *buf, OFF_T len, int f_out)
+static void generate_and_send_sums(struct map_struct *buf, size_t len, int f_out)
 {
        size_t i;
        struct sum_struct sum;
@@ -277,7 +277,6 @@ void recv_generator(char *fname, struct file_list *flist, int i, int f_out)
        char fnamecmpbuf[MAXPATHLEN];
        extern char *compare_dest;
        extern int list_only;
-       extern int preserve_perms;
        extern int only_existing;
        extern int orig_umask;