- Made readlink_stat() and link_stat() optionally follow a symlink

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index 65b5825..1a24abf 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -47,6 +47,7 @@ extern char *files_from;
 extern int filesfrom_fd;
 
 extern int one_file_system;
+extern int keep_dirlinks;
 extern int preserve_links;
 extern int preserve_hard_links;
 extern int preserve_perms;
@@ -59,6 +60,9 @@ extern int copy_links;
 extern int copy_unsafe_links;
 extern int protocol_version;
 extern int sanitize_paths;
+extern int delete_excluded;
+extern int orig_umask;
+extern int list_only;
 
 extern int read_batch;
 extern int write_batch;
@@ -92,7 +96,7 @@ static int show_filelist_p(void)
 static void start_filelist_progress(char *kind)
 {
        rprintf(FINFO, "%s ... ", kind);
-       if ((verbose > 1) || do_progress)
+       if (verbose > 1 || do_progress)
                rprintf(FINFO, "\n");
        rflush(FINFO);
 }
@@ -106,7 +110,7 @@ static void emit_filelist_progress(const struct file_list *flist)
 
 static void maybe_emit_filelist_progress(const struct file_list *flist)
 {
-       if (do_progress && show_filelist_p() && ((flist->count % 100) == 0))
+       if (do_progress && show_filelist_p() && (flist->count % 100) == 0)
                emit_filelist_progress(flist);
 }
 
@@ -131,9 +135,10 @@ static void list_file_entry(struct file_struct *f)
 {
        char perms[11];
 
-       if (!f->basename)
+       if (!f->basename) {
                /* this can happen if duplicate names were removed */
                return;
+       }
 
        permstring(perms, f->mode);
 
@@ -145,10 +150,12 @@ static void list_file_entry(struct file_struct *f)
                        f_name(f), f->u.link);
        } else
 #endif
+       {
                rprintf(FINFO, "%s %11.0f %s %s\n",
                        perms,
                        (double)f->length, timestring(f->modtime),
                        f_name(f));
+       }
 }
 
 
@@ -171,7 +178,7 @@ int readlink_stat(const char *path, STRUCT_STAT *buffer, char *linkbuf)
 #if SUPPORT_LINKS
        if (copy_links)
                return do_stat(path, buffer);
-       if (do_lstat(path, buffer) == -1)
+       if (link_stat(path, buffer, keep_dirlinks) < 0)
                return -1;
        if (S_ISLNK(buffer->st_mode)) {
                int l = readlink((char *)path, linkbuf, MAXPATHLEN - 1);
@@ -192,12 +199,19 @@ int readlink_stat(const char *path, STRUCT_STAT *buffer, char *linkbuf)
 #endif
 }
 
-int link_stat(const char *path, STRUCT_STAT *buffer)
+int link_stat(const char *path, STRUCT_STAT *buffer, int follow_dirlinks)
 {
 #if SUPPORT_LINKS
        if (copy_links)
                return do_stat(path, buffer);
-       return do_lstat(path, buffer);
+       if (do_lstat(path, buffer) < 0)
+               return -1;
+       if (follow_dirlinks && S_ISLNK(buffer->st_mode)) {
+               STRUCT_STAT st;
+               if (do_stat(path, &st) == 0 && S_ISDIR(st.st_mode))
+                       *buffer = st;
+       }
+       return 0;
 #else
        return do_stat(path, buffer);
 #endif
@@ -247,7 +261,7 @@ static dev_t filesystem_dev;
 static void set_filesystem(char *fname)
 {
        STRUCT_STAT st;
-       if (link_stat(fname, &st) != 0)
+       if (do_stat(fname, &st) != 0)
                return;
        filesystem_dev = st.st_dev;
 }
@@ -510,7 +524,7 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 
 
 void receive_file_entry(struct file_struct **fptr, unsigned short flags,
-    struct file_list *flist, int f)
+                       struct file_list *flist, int f)
 {
        static time_t modtime;
        static mode_t mode;
@@ -704,7 +718,6 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
        }
 
        if (!preserve_perms) {
-               extern int orig_umask;
                /* set an appropriate set of permissions based on original
                 * permissions and umask. This emulates what GNU cp does */
                file->mode &= ~orig_umask;
@@ -727,8 +740,8 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
  * statting directories if we're not recursing, but this is not a very
  * important case.  Some systems may not have d_type.
  **/
-struct file_struct *make_file(char *fname,
-    struct file_list *flist, int exclude_level)
+struct file_struct *make_file(char *fname, struct file_list *flist,
+                             int exclude_level)
 {
        static char *lastdir;
        static int lastdir_len = -1;
@@ -762,13 +775,16 @@ struct file_struct *make_file(char *fname,
                    && check_exclude_file(thisname, 0, exclude_level))
                        return NULL;
                if (save_errno == ENOENT) {
+#if SUPPORT_LINKS
                        /* Avoid "vanished" error if symlink points nowhere. */
                        if (copy_links && do_lstat(thisname, &st) == 0
                            && S_ISLNK(st.st_mode)) {
                                io_error |= IOERR_GENERAL;
                                rprintf(FERROR, "symlink has no referent: %s\n",
                                        full_fname(thisname));
-                       } else {
+                       } else
+#endif
+                       {
                                enum logcode c = am_daemon && protocol_version < 28
                                    ? FERROR : FINFO;
                                io_error |= IOERR_VANISHED;
@@ -922,7 +938,6 @@ void send_file_name(int f, struct file_list *flist, char *fname,
 {
        struct file_struct *file;
        char fbuf[MAXPATHLEN];
-       extern int delete_excluded;
 
        /* f is set to -1 when calculating deletion file list */
        file = make_file(fname, flist,
@@ -1086,7 +1101,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                        }
                }
 
-               if (link_stat(fname, &st) != 0) {
+               if (link_stat(fname, &st, keep_dirlinks) != 0) {
                        if (f != -1) {
                                io_error |= IOERR_GENERAL;
                                rsyserr(FERROR, errno, "link_stat %s failed",
@@ -1233,7 +1248,6 @@ struct file_list *recv_file_list(int f)
        struct file_list *flist;
        unsigned short flags;
        int64 start_read;
-       extern int list_only;
 
        if (show_filelist_p())
                start_filelist_progress("receiving file list");