X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/db719fb0d77ad232c74a3a73c348e1e69672fe61..d27cbec598136ff8ff767ebbfb5d9d39e0b7c03e:/flist.c diff --git a/flist.c b/flist.c index 2e0e7870..151ae876 100644 --- a/flist.c +++ b/flist.c @@ -84,16 +84,16 @@ static void start_filelist_progress(char *kind) } -static void maybe_emit_filelist_progress(const struct file_list *flist) +static void emit_filelist_progress(const struct file_list *flist) { - if (do_progress && show_filelist_p() && ((flist->count % 100) == 0)) - emit_filelist_progress(flist); + rprintf(FINFO, " %d files...\r", flist->count); } -static void emit_filelist_progress(const struct file_list *flist) +static void maybe_emit_filelist_progress(const struct file_list *flist) { - rprintf(FINFO, " %d files...\r", flist->count); + if (do_progress && show_filelist_p() && ((flist->count % 100) == 0)) + emit_filelist_progress(flist); } @@ -301,7 +301,10 @@ static void flist_expand(struct file_list *flist) new_bytes = sizeof(flist->files[0]) * flist->malloced; - new_ptr = realloc(flist->files, new_bytes); + if (flist->files) + new_ptr = realloc(flist->files, new_bytes); + else + new_ptr = malloc(new_bytes); if (verbose >= 2) { rprintf(FINFO, "expand file_list to %.0f bytes, did%s move\n",