Changed rprintf() calls that included strerror() to use rsyserr().

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index 077e42c..41acca3 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -53,7 +53,6 @@ extern int preserve_perms;
 extern int preserve_devices;
 extern int preserve_uid;
 extern int preserve_gid;
-extern int preserve_times;
 extern int relative_paths;
 extern int implied_dirs;
 extern int copy_links;
@@ -211,6 +210,8 @@ int link_stat(const char *path, STRUCT_STAT * buffer)
  */
 static int check_exclude_file(char *fname, int is_dir, int exclude_level)
 {
+       int rc;
+
 #if 0 /* This currently never happens, so avoid a useless compare. */
        if (exclude_level == NO_EXCLUDES)
                return 0;
@@ -227,14 +228,15 @@ static int check_exclude_file(char *fname, int is_dir, int exclude_level)
                }
        }
        if (server_exclude_list.head
-        && check_exclude(&server_exclude_list, fname, is_dir))
+           && check_exclude(&server_exclude_list, fname, is_dir) < 0)
                return 1;
        if (exclude_level != ALL_EXCLUDES)
                return 0;
-       if (exclude_list.head && check_exclude(&exclude_list, fname, is_dir))
-               return 1;
+       if (exclude_list.head
+           && (rc = check_exclude(&exclude_list, fname, is_dir)) != 0)
+               return rc < 0;
        if (local_exclude_list.head
-           && check_exclude(&local_exclude_list, fname, is_dir))
+           && check_exclude(&local_exclude_list, fname, is_dir) < 0)
                return 1;
        return 0;
 }
@@ -536,6 +538,7 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
                rdev_major = 0;
                uid = 0, gid = 0;
                *lastname = '\0';
+               lastdir_len = -1;
                return;
        }
 
@@ -742,7 +745,7 @@ struct file_struct *make_file(char *fname,
        char *basename, *dirname, *bp;
        unsigned short flags = 0;
 
-       if (!flist)     /* lastdir isn't valid if flist is NULL */
+       if (!flist || !flist->count)    /* Ignore lastdir when invalid. */
                lastdir_len = -1;
 
        if (strlcpy(thisname, fname, sizeof thisname)
@@ -775,8 +778,8 @@ struct file_struct *make_file(char *fname,
                }
                else {
                        io_error |= IOERR_GENERAL;
-                       rprintf(FERROR, "readlink %s failed: %s\n",
-                           full_fname(thisname), strerror(save_errno));
+                       rsyserr(FERROR, save_errno, "readlink %s failed",
+                               full_fname(thisname));
                }
                return NULL;
        }
@@ -946,6 +949,10 @@ void send_file_name(int f, struct file_list *flist, char *fname,
                struct exclude_list_struct last_list = local_exclude_list;
                local_exclude_list.head = local_exclude_list.tail = NULL;
                send_directory(f, flist, f_name_to(file, fbuf));
+               if (verbose > 2) {
+                       rprintf(FINFO, "[%s] popping %sexclude list\n",
+                               who_am_i(), local_exclude_list.debug_type);
+               }
                free_exclude_list(&local_exclude_list);
                local_exclude_list = last_list;
        }
@@ -963,8 +970,7 @@ static void send_directory(int f, struct file_list *flist, char *dir)
        d = opendir(dir);
        if (!d) {
                io_error |= IOERR_GENERAL;
-               rprintf(FERROR, "opendir %s failed: %s\n",
-                       full_fname(dir), strerror(errno));
+               rsyserr(FERROR, errno, "opendir %s failed", full_fname(dir));
                return;
        }
 
@@ -986,7 +992,7 @@ static void send_directory(int f, struct file_list *flist, char *dir)
                if (strlcpy(p, ".cvsignore", MAXPATHLEN - offset)
                    < MAXPATHLEN - offset) {
                        add_exclude_file(&local_exclude_list, fname,
-                                        XFLG_WORD_SPLIT | XFLG_NO_PREFIXES);
+                                        XFLG_WORD_SPLIT | XFLG_WORDS_ONLY);
                } else {
                        io_error |= IOERR_GENERAL;
                        rprintf(FINFO,
@@ -1011,8 +1017,7 @@ static void send_directory(int f, struct file_list *flist, char *dir)
        }
        if (errno) {
                io_error |= IOERR_GENERAL;
-               rprintf(FERROR, "readdir(%s): (%d) %s\n",
-                       dir, errno, strerror(errno));
+               rsyserr(FERROR, errno, "readdir(%s)", dir);
        }
 
        closedir(d);
@@ -1047,8 +1052,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                io_start_buffering_out(f);
                if (filesfrom_fd >= 0) {
                        if (argv[0] && !push_dir(argv[0])) {
-                               rprintf(FERROR, "push_dir %s failed: %s\n",
-                                       full_fname(argv[0]), strerror(errno));
+                               rsyserr(FERROR, errno, "push_dir %s failed",
+                                       full_fname(argv[0]));
                                exit_cleanup(RERR_FILESELECT);
                        }
                        use_ff_fd = 1;
@@ -1085,8 +1090,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                if (link_stat(fname, &st) != 0) {
                        if (f != -1) {
                                io_error |= IOERR_GENERAL;
-                               rprintf(FERROR, "link_stat %s failed: %s\n",
-                                       full_fname(fname), strerror(errno));
+                               rsyserr(FERROR, errno, "link_stat %s failed",
+                                       full_fname(fname));
                        }
                        continue;
                }
@@ -1155,8 +1160,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 
                        if (!push_dir(dir)) {
                                io_error |= IOERR_GENERAL;
-                               rprintf(FERROR, "push_dir %s failed: %s\n",
-                                       full_fname(dir), strerror(errno));
+                               rsyserr(FERROR, errno, "push_dir %s failed",
+                                       full_fname(dir));
                                continue;
                        }
 
@@ -1178,8 +1183,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                        flist_dir = NULL;
                        flist_dir_len = 0;
                        if (!pop_dir(olddir)) {
-                               rprintf(FERROR, "pop_dir %s failed: %s\n",
-                                       full_fname(dir), strerror(errno));
+                               rsyserr(FERROR, errno, "pop_dir %s failed",
+                                       full_fname(dir));
                                exit_cleanup(RERR_FILESELECT);
                        }
                }
@@ -1514,11 +1519,17 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
        if (!(c1 = (uchar*)f1->dirname)) {
                state1 = fnc_BASE;
                c1 = (uchar*)f1->basename;
+       } else if (!*c1) {
+               state1 = fnc_SLASH;
+               c1 = (uchar*)"/";
        } else
                state1 = fnc_DIR;
        if (!(c2 = (uchar*)f2->dirname)) {
                state2 = fnc_BASE;
                c2 = (uchar*)f2->basename;
+       } else if (!*c2) {
+               state2 = fnc_SLASH;
+               c2 = (uchar*)"/";
        } else
                state2 = fnc_DIR;