We don't disable inc_recurse due to -H anymore.

[rsync/rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index 3c80286..5d09fd3 100644 (file)
--- a/rsync.c
+++ b/rsync.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 3 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
@@ -32,7 +33,6 @@ extern int preserve_xattrs;
 extern int preserve_perms;
 extern int preserve_executability;
 extern int preserve_times;
-extern int omit_dir_times;
 extern int am_root;
 extern int am_server;
 extern int am_sender;
@@ -162,12 +162,12 @@ int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr,
                        continue;
                }
                ndx = NDX_FLIST_OFFSET - ndx;
-               if (ndx < 0 || ndx >= dir_flist->count) {
+               if (ndx < 0 || ndx >= dir_flist->used) {
                        ndx = NDX_FLIST_OFFSET - ndx;
                        rprintf(FERROR,
                                "[%s] Invalid dir index: %d (%d - %d)\n",
                                who_am_i(), ndx, NDX_FLIST_OFFSET,
-                               NDX_FLIST_OFFSET - dir_flist->count + 1);
+                               NDX_FLIST_OFFSET - dir_flist->used + 1);
                        exit_cleanup(RERR_PROTOCOL);
                }
 
@@ -188,7 +188,7 @@ int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr,
 
        /* Honor the old-style keep-alive indicator. */
        if (protocol_version < 30
-        && ndx == cur_flist->count && iflags == ITEM_IS_NEW) {
+        && ndx == cur_flist->used && iflags == ITEM_IS_NEW) {
                if (am_sender)
                        maybe_send_keepalive();
                goto read_loop;
@@ -198,9 +198,8 @@ int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr,
          invalid_ndx:
                rprintf(FERROR,
                        "Invalid file index: %d (%d - %d) with iflags %x [%s]\n",
-                       ndx, first_flist->ndx_start + first_flist->ndx_start,
-                       first_flist->prev->ndx_start + first_flist->ndx_start
-                       + first_flist->prev->count - 1, iflags, who_am_i());
+                       ndx, first_flist->ndx_start - 1, first_flist->prev->ndx_end,
+                       iflags, who_am_i());
                exit_cleanup(RERR_PROTOCOL);
        }
        cur_flist = flist;
@@ -220,7 +219,7 @@ int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr,
 
        if (iflags & ITEM_TRANSFER) {
                int i = ndx - cur_flist->ndx_start;
-               if (!S_ISREG(cur_flist->files[i]->mode)) {
+               if (i < 0 || !S_ISREG(cur_flist->files[i]->mode)) {
                        rprintf(FERROR,
                                "received request to transfer non-regular file: %d [%s]\n",
                                ndx, who_am_i());
@@ -311,7 +310,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, statx *sxp,
                set_stat_xattr(fname, file);
 #endif
 
-       if (!preserve_times || (S_ISDIR(sxp->st.st_mode) && omit_dir_times))
+       if (!preserve_times || (S_ISDIR(sxp->st.st_mode) && preserve_times == 1))
                flags |= ATTRS_SKIP_MTIME;
        if (!(flags & ATTRS_SKIP_MTIME)
            && cmp_time(sxp->st.st_mtime, file->modtime) != 0) {
@@ -495,12 +494,12 @@ struct file_list *flist_for_ndx(int ndx)
        if (!flist && !(flist = first_flist))
                return NULL;
 
-       while (ndx < flist->ndx_start) {
+       while (ndx < flist->ndx_start-1) {
                if (flist == first_flist)
                        return NULL;
                flist = flist->prev;
        }
-       while (ndx >= flist->ndx_start + flist->count) {
+       while (ndx > flist->ndx_end) {
                if (!(flist = flist->next))
                        return NULL;
        }