From: Francois Fleuret Date: Tue, 6 Apr 2010 06:21:09 +0000 (+0200) Subject: Cosmetic change in the progress display. X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=commitdiff_plain;h=ba0a93e5d70103f2aee5395eac74b05792aaa3a8;p=finddup.git Cosmetic change in the progress display. --- diff --git a/finddup.c b/finddup.c index acbbddc..5167a59 100644 --- a/finddup.c +++ b/finddup.c @@ -442,13 +442,18 @@ void start(const char *dirname1, const char *dirname2) { not_in = 0; if(show_progress) { - fprintf(stderr, "Scanning %s ... ", dirname1); + fprintf(stderr, "Scanning '%s' ... ", dirname1); } list1 = scan_directory(0, dirname1); list1_length = file_list_length(list1); + if(show_progress) { + fprintf(stderr, "done (%d file%s).\n", + list1_length, (list1_length > 1 ? "s" : "")); + } + if(dirname2) { if(strncmp(dirname2, "not:", 4) == 0) { not_in = 1; @@ -459,25 +464,20 @@ void start(const char *dirname1, const char *dirname2) { dirname2 += 4; } if(show_progress) { - fprintf(stderr, "%s ... ", dirname2); + fprintf(stderr, "Scanning '%s' ... ", dirname2); } list2 = scan_directory(0, dirname2); + if(show_progress) { + list2_length = file_list_length(list2); + fprintf(stderr, "done (%d file%s).\n", + list2_length, (list2_length > 1 ? "s" : "")); + } } else { list2 = list1; } if(show_progress) { - fprintf(stderr, "done.\n"); - fprintf(stderr, - "%s: %d file%s.\n", - dirname1, list1_length, (list1_length > 1 ? "s" : "")); - if(dirname2) { - list2_length = file_list_length(list2); - fprintf(stderr, - "%s: %d file%s.\n", - dirname2, list2_length, (list2_length > 1 ? "s" : "")); - } - fprintf(stderr, "Now looking for identical files.\n"); + fprintf(stderr, "Now looking for identical files (this may take a while).\n"); } nb_groups = 0;