Made some more char pointers const.

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index 2cb6c7b..47803c1 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -562,6 +562,11 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
                  && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
                 || (keep_time && cmp_time(file->modtime, sxp->st.st_mtime) != 0))
                        iflags |= ITEM_REPORT_TIME;
+#if !defined HAVE_LCHMOD && !defined HAVE_SETATTRLIST
+               if (S_ISLNK(file->mode)) {
+                       ;
+               } else
+#endif
                if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
                        iflags |= ITEM_REPORT_PERMS;
                if (uid_ndx && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid)
@@ -899,7 +904,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 #ifdef SUPPORT_HARD_LINKS
          try_a_copy: /* Copy the file locally. */
 #endif
-               if (copy_file(cmpbuf, fname, file->mode, 0) < 0) {
+               if (!dry_run && copy_file(cmpbuf, fname, file->mode, 0) < 0) {
                        if (verbose) {
                                rsyserr(FINFO, errno, "copy_file %s => %s",
                                        full_fname(cmpbuf), fname);
@@ -1251,7 +1256,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                if (!implied_dirs && file->flags & FLAG_IMPLIED_DIR)
                        goto cleanup;
                if (inc_recurse && ndx != cur_flist->ndx_start - 1) {
-                       /* In inc_recurse mode we want ot make sure any missing
+                       /* In inc_recurse mode we want to make sure any missing
                         * directories get created while we're still processing
                         * the parent dir (which allows us to touch the parent
                         * dir's mtime right away).  We will handle the dir in
@@ -1868,6 +1873,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
                file = flist->files[ndx - flist->ndx_start];
                assert(file->flags & FLAG_HLINKED);
                finish_hard_link(file, f_name(file, fbuf), ndx, NULL, itemizing, code, -1);
+               flist->in_progress--;
        }
 #endif