When running with --fake-super, get/put ACLs from/to an xattr and don't

[rsync/rsync.git] / match.c

diff --git a/match.c b/match.c
index b856bb4..8367d15 100644 (file)
--- a/match.c
+++ b/match.c
@@ -6,8 +6,9 @@
  * 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 version 2 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * 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,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +16,7 @@
  * 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.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
  */
 
 #include "rsync.h"
@@ -303,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,21 +315,23 @@ void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len)
        sum_init(checksum_seed);
 
        if (append_mode > 0) {
-               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 = (int32)(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 == 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;
        }
 
@@ -338,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");
@@ -350,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",