Tweaked the alloc/realloc code in flist_expand().

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index 35bbed1..4e6cf04 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;
@@ -283,7 +282,7 @@ static int flist_dir_len;
  **/
 void flist_expand(struct file_list *flist)
 {
-       void *new_ptr;
+       struct file_struct **new_ptr;
 
        if (flist->count < flist->malloced)
                return;
@@ -302,12 +301,8 @@ void flist_expand(struct file_list *flist)
        if (flist->malloced < flist->count)
                flist->malloced = flist->count;
 
-       if (flist->files) {
-               new_ptr = realloc_array(flist->files,
-                   struct file_struct *, flist->malloced);
-       } else {
-               new_ptr = new_array(struct file_struct *, flist->malloced);
-       }
+       new_ptr = realloc_array(flist->files, struct file_struct *,
+                               flist->malloced);
 
        if (verbose >= 2) {
                rprintf(FINFO, "[%s] expand file_list to %.0f bytes, did%s move\n",
@@ -316,7 +311,7 @@ void flist_expand(struct file_list *flist)
                    (new_ptr == flist->files) ? " not" : "");
        }
 
-       flist->files = (struct file_struct **) new_ptr;
+       flist->files = new_ptr;
 
        if (!flist->files)
                out_of_memory("flist_expand");
@@ -779,8 +774,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;
        }
@@ -950,7 +945,11 @@ 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));
-               free_exclude_list(&local_exclude_list);
+               if (verbose > 2) {
+                       rprintf(FINFO, "[%s] popping %sexclude list\n",
+                               who_am_i(), local_exclude_list.debug_type);
+               }
+               clear_exclude_list(&local_exclude_list);
                local_exclude_list = last_list;
        }
 }
@@ -967,8 +966,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;
        }
 
@@ -1015,8 +1013,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);
@@ -1051,8 +1048,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;
@@ -1089,8 +1086,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;
                }
@@ -1159,8 +1156,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;
                        }
 
@@ -1182,8 +1179,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);
                        }
                }