One more tweak to latest omit-dir-times code.

[rsync/rsync.git] / match.c

diff --git a/match.c b/match.c
index 81c3d9e..8367d15 100644 (file)
--- a/match.c
+++ b/match.c
@@ -3,11 +3,11 @@
  *
  * Copyright (C) 1996 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -15,9 +15,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, visit the http://fsf.org website.
  */
 
 #include "rsync.h"
@@ -85,7 +84,7 @@ static OFF_T last_match;
 static void matched(int f, struct sum_struct *s, struct map_struct *buf,
                    OFF_T offset, int32 i)
 {
-       int32 n = offset - last_match; /* max value: block_size (int32) */
+       int32 n = (int32)(offset - last_match); /* max value: block_size (int32) */
        int32 j;
 
        if (verbose > 2 && i >= 0) {
@@ -121,8 +120,8 @@ static void matched(int f, struct sum_struct *s, struct map_struct *buf,
 static void hash_search(int f,struct sum_struct *s,
                        struct map_struct *buf, OFF_T len)
 {
-       OFF_T offset, end, backup;
-       int32 k, want_i;
+       OFF_T offset, end;
+       int32 k, want_i, backup;
        char sum2[SUM_LENGTH];
        uint32 s1, s2, sum;
        int more;
@@ -254,7 +253,7 @@ static void hash_search(int f,struct sum_struct *s,
                } while ((i = s->sums[i].chain) >= 0);
 
          null_hash:
-               backup = offset - last_match;
+               backup = (int32)(offset - last_match);
                /* We sometimes read 1 byte prior to last_match... */
                if (backup < 0)
                        backup = 0;
@@ -304,7 +303,8 @@ static void hash_search(int f,struct sum_struct *s,
  **/
 void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len)
 {
-       char file_sum[MD4_SUM_LENGTH];
+       char file_sum[MAX_DIGEST_LEN];
+       int sum_len;
 
        last_match = 0;
        false_alarms = 0;
@@ -314,22 +314,24 @@ void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len)
 
        sum_init(checksum_seed);
 
-       if (append_mode) {
-               OFF_T j = 0;
-               for (j = CHUNK_SIZE; j < s->flength; j += CHUNK_SIZE) {
-                       if (buf && do_progress)
-                               show_progress(last_match, buf->file_size);
-                       sum_update(map_ptr(buf, last_match, CHUNK_SIZE),
-                                  CHUNK_SIZE);
-                       last_match = j;
-               }
-               if (last_match < s->flength) {
-                       int32 len = s->flength - last_match;
-                       if (buf && do_progress)
-                               show_progress(last_match, buf->file_size);
-                       sum_update(map_ptr(buf, last_match, len), len);
-                       last_match = s->flength;
+       if (append_mode > 0) {
+               if (append_mode == 2) {
+                       OFF_T j = 0;
+                       for (j = CHUNK_SIZE; j < s->flength; j += CHUNK_SIZE) {
+                               if (buf && do_progress)
+                                       show_progress(last_match, buf->file_size);
+                               sum_update(map_ptr(buf, last_match, CHUNK_SIZE),
+                                          CHUNK_SIZE);
+                               last_match = j;
+                       }
+                       if (last_match < s->flength) {
+                               int32 n = (int32)(s->flength - last_match);
+                               if (buf && do_progress)
+                                       show_progress(last_match, buf->file_size);
+                               sum_update(map_ptr(buf, last_match, n), n);
+                       }
                }
+               last_match = s->flength;
                s->count = 0;
        }
 
@@ -339,7 +341,7 @@ void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len)
                if (verbose > 2)
                        rprintf(FINFO,"built hash table\n");
 
-               hash_search(f,s,buf,len);
+               hash_search(f, s, buf, len);
 
                if (verbose > 2)
                        rprintf(FINFO,"done hash search\n");
@@ -351,14 +353,14 @@ void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len)
                matched(f, s, buf, len, -1);
        }
 
-       sum_end(file_sum);
+       sum_len = sum_end(file_sum);
        /* If we had a read error, send a bad checksum. */
        if (buf && buf->status != 0)
                file_sum[0]++;
 
        if (verbose > 2)
                rprintf(FINFO,"sending file_sum\n");
-       write_buf(f,file_sum,MD4_SUM_LENGTH);
+       write_buf(f, file_sum, sum_len);
 
        if (verbose > 2)
                rprintf(FINFO, "false_alarms=%d hash_hits=%d matches=%d\n",