Don't let --chmod tweak a 0 mode value (which marks a missing arg).
[rsync/rsync.git] / flist.c
diff --git a/flist.c b/flist.c
index 1fa2cac..1c15d8c 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -51,6 +51,7 @@ extern int preserve_links;
 extern int preserve_hard_links;
 extern int preserve_devices;
 extern int preserve_specials;
+extern int delete_missing_args;
 extern int uid_ndx;
 extern int gid_ndx;
 extern int eol_nulls;
@@ -431,7 +432,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
                        stats.num_symlinks++;
                else if (IS_DEVICE(file->mode))
                        stats.num_devices++;
-               else
+               else if (IS_SPECIAL(file->mode))
                        stats.num_specials++;
                xflags = 0;
        }
@@ -793,7 +794,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
        if (!(xflags & XMIT_SAME_MODE))
                mode = from_wire_mode(read_int(f));
 
-       if (chmod_modes && !S_ISLNK(mode))
+       if (chmod_modes && !S_ISLNK(mode) && mode)
                mode = tweak_mode(mode, chmod_modes);
 
        if (preserve_uid && !(xflags & XMIT_SAME_UID)) {
@@ -1124,8 +1125,10 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
        if (sanitize_paths)
                sanitize_path(thisname, thisname, "", 0, SP_DEFAULT);
 
-       if (stp && S_ISDIR(stp->st_mode)) {
-               st = *stp; /* Needed for "symlink/." with --relative. */
+       if (stp && (S_ISDIR(stp->st_mode) || stp->st_mode == 0)) {
+               /* This is needed to handle a "symlink/." with a --relative
+                * dir, or a request to delete a specific file. */
+               st = *stp;
                *linkname = '\0'; /* make IBM code checker happy */
        } else if (readlink_stat(thisname, &st, linkname) != 0) {
                int save_errno = errno;
@@ -1166,6 +1169,11 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
                                full_fname(thisname));
                }
                return NULL;
+       } else if (st.st_mode == 0) {
+               io_error |= IOERR_GENERAL;
+               rprintf(FINFO, "skipping file with bogus (zero) st_mode: %s\n",
+                       full_fname(thisname));
+               return NULL;
        }
 
        if (filter_level == NO_FILTERS)
@@ -1364,7 +1372,7 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
        if (!file)
                return NULL;
 
-       if (chmod_modes && !S_ISLNK(file->mode))
+       if (chmod_modes && !S_ISLNK(file->mode) && file->mode)
                file->mode = tweak_mode(file->mode, chmod_modes);
 
        if (f >= 0) {
@@ -1627,6 +1635,19 @@ static void add_dirs_to_tree(int parent_ndx, struct file_list *from_flist,
                DIR_NEXT_SIBLING(dp) = -1;
 }
 
+static void interpret_stat_error(const char *fname, int is_dir)
+{
+       if (errno == ENOENT) {
+               io_error |= IOERR_VANISHED;
+               rprintf(FWARNING, "%s has vanished: %s\n",
+                       is_dir ? "directory" : "file", full_fname(fname));
+       } else {
+               io_error |= IOERR_GENERAL;
+               rsyserr(FERROR_XFER, errno, "link_stat %s failed",
+                       full_fname(fname));
+       }
+}
+
 /* This function is normally called by the sender, but the receiving side also
  * calls it from get_dirlist() with f set to -1 so that we just construct the
  * file list in memory without sending it over the wire.  Also, get_dirlist()
@@ -1646,8 +1667,11 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len,
        assert(flist != NULL);
 
        if (!(d = opendir(fbuf))) {
-               if (errno == ENOENT)
+               if (errno == ENOENT) {
+                       if (am_sender) /* Can abuse this for vanished error w/ENOENT: */
+                               interpret_stat_error(fbuf, True);
                        return;
+               }
                io_error |= IOERR_GENERAL;
                rsyserr(FERROR_XFER, errno, "opendir %s failed", full_fname(fbuf));
                return;
@@ -1819,9 +1843,7 @@ static void send1extra(int f, struct file_struct *file, struct file_list *flist)
                if (one_file_system) {
                        STRUCT_STAT st;
                        if (link_stat(fbuf, &st, copy_dirlinks) != 0) {
-                               io_error |= IOERR_GENERAL;
-                               rsyserr(FERROR_XFER, errno, "link_stat %s failed",
-                                       full_fname(fbuf));
+                               interpret_stat_error(fbuf, True);
                                return;
                        }
                        filesystem_dev = st.st_dev;
@@ -1856,9 +1878,7 @@ static void send1extra(int f, struct file_struct *file, struct file_list *flist)
                if (name_type != NORMAL_NAME) {
                        STRUCT_STAT st;
                        if (link_stat(fbuf, &st, 1) != 0) {
-                               io_error |= IOERR_GENERAL;
-                               rsyserr(FERROR_XFER, errno, "link_stat %s failed",
-                                       full_fname(fbuf));
+                               interpret_stat_error(fbuf, True);
                                continue;
                        }
                        send_file_name(f, flist, fbuf, &st, FLAG_TOP_DIR | flags, ALL_FILTERS);
@@ -2157,10 +2177,15 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                if (link_stat(fbuf, &st, copy_dirlinks || name_type != NORMAL_NAME) != 0
                 || (name_type != DOTDIR_NAME && is_daemon_excluded(fbuf, S_ISDIR(st.st_mode)))
                 || (relative_paths && path_is_daemon_excluded(fbuf, 1))) {
-                       io_error |= IOERR_GENERAL;
-                       rsyserr(FERROR_XFER, errno, "link_stat %s failed",
-                               full_fname(fbuf));
-                       continue;
+                       if (errno == ENOENT && delete_missing_args) {
+                               /* Rsync will treat a mode of 0 as deleted. */
+                               memset(&st, 0, sizeof st);
+                       } else {
+                               io_error |= IOERR_GENERAL;
+                               rsyserr(FERROR_XFER, errno, "link_stat %s failed",
+                                       full_fname(fbuf));
+                               continue;
+                       }
                }
 
                /* A dot-dir should not be excluded! */
@@ -2262,6 +2287,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
        if (numeric_ids <= 0 && !inc_recurse)
                send_id_list(f);
 
+       set_msg_fd_in(-1);
+
        /* send the io_error flag */
        if (protocol_version < 30)
                write_int(f, ignore_errors ? 0 : io_error);
@@ -2296,7 +2323,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                         * file-list to check if this is a 1-file xfer. */
                        send_extra_file_list(f, 1);
                }
-       }
+       } else
+               flist_eof = 1;
 
        return flist;
 }
@@ -2422,8 +2450,10 @@ struct file_list *recv_file_list(int f)
 
        if (inc_recurse)
                flist_done_allocating(flist);
-       else if (f >= 0)
+       else if (f >= 0) {
                recv_id_list(f, flist);
+               flist_eof = 1;
+       }
 
        flist_sort_and_clean(flist, relative_paths);