Prints the number of files when scanning is done.

[finddup.git] / finddup.c

diff --git a/finddup.c b/finddup.c
index 3edfd61..197b82e 100644 (file)
--- a/finddup.c
+++ b/finddup.c
@@ -68,11 +68,9 @@ int show_hits = 1; /* 1 means to show the files from dir2
 int show_groups = 1; /* 1 means to show the group IDs when printing
                         file names */
 
-int ignore_same_inode = 0; /* 1 means that comparison between two file
-                              with same inode will always be false */
-
-int tty_width = -1; /* Positive value means what width to use to show
-                       the progress bar */
+int same_inodes_are_different = 0; /* 1 means that comparison between
+                                      two files with same inode will
+                                      always be false */
 
 #ifdef WITH_MD5
 int use_md5 = 0; /* 1 means we keep an MD5 signature for each file */
@@ -235,9 +233,10 @@ int same_content(struct file_node *f1, struct file_node *f2,
 
 int same_files(struct file_node *f1, struct file_node *f2,
                char *buffer1, char *buffer2) {
-  if(ignore_same_inode && f1->inode == f2->inode) {
+  if(same_inodes_are_different && f1->inode == f2->inode) {
     return 0;
   }
+
   return f1->size == f2->size && same_content(f1, f2, buffer1, buffer2);
 }
 
@@ -385,8 +384,13 @@ void print_result(struct file_node *list1, struct file_node *list2) {
 
 void print_progress(int max, int n, int *pp) {
   int p, k;
-  int width;
-  if(show_progress && tty_width > 0) {
+  int width, tty_width;
+  struct winsize win;
+
+  if(show_progress &&
+     isatty(STDOUT_FILENO) &&
+     !ioctl (STDOUT_FILENO, TIOCGWINSZ, (char *) &win)) {
+    tty_width = win.ws_col;
     width = tty_width - 7;
     p = (width * n) / (max - 1);
     if(p > *pp) {
@@ -408,8 +412,7 @@ void start(const char *dirname1, const char *dirname2) {
   struct file_node *node1, *node2;
   int not_in, found;
   int nb_groups, nb_nodes;
-  int list1_length, previous_progress;
-  struct winsize win;
+  int list1_length, list2_length, previous_progress;
 
   char *buffer1 = safe_malloc(sizeof(char) * READ_BUFFER_SIZE);
   char *buffer2 = safe_malloc(sizeof(char) * READ_BUFFER_SIZE);
@@ -417,15 +420,13 @@ void start(const char *dirname1, const char *dirname2) {
   not_in = 0;
 
   if(show_progress) {
-    if(isatty(STDOUT_FILENO) &&
-       !ioctl (STDOUT_FILENO, TIOCGWINSZ, (char *) &win)) {
-      tty_width = win.ws_col;
-    }
     fprintf(stderr, "Scanning %s ... ", dirname1);
   }
 
   list1 = scan_directory(0, dirname1);
 
+  list1_length = file_list_length(list1);
+
   if(dirname2) {
     if(strncmp(dirname2, "not:", 4) == 0) {
       not_in = 1;
@@ -445,12 +446,21 @@ void start(const char *dirname1, const char *dirname2) {
 
   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");
   }
 
   nb_groups = 0;
   previous_progress = -1;
   nb_nodes = 0;
-  list1_length = file_list_length(list1);
 
   if(not_in) {
     for(node1 = list1; node1; node1 = node1->next) {
@@ -518,7 +528,7 @@ void start(const char *dirname1, const char *dirname2) {
   free(buffer2);
 }
 
-void print_help(FILE *out) {
+void usage(FILE *out) {
   fprintf(out, "Usage: finddup [OPTION]... DIR1 [[and:|not:]DIR2]\n");
   fprintf(out, "Version %s (%s)\n", VERSION_NUMBER, UNAME);
   fprintf(out, "Without DIR2, lists duplicated files found in DIR1. With DIR2, lists files common to both directories. With the not: prefix, lists files found in DIR1 which do not exist in DIR2. The and: prefix is the default and should be used only if you have a directory starting with 'not:'\n");
@@ -566,7 +576,7 @@ int main(int argc, char **argv) {
     switch (c) {
 
     case 'h':
-      print_help(stdout);
+      usage(stdout);
       exit(EXIT_SUCCESS);
 
       break;
@@ -584,7 +594,7 @@ int main(int argc, char **argv) {
       break;
 
     case 'i':
-      ignore_same_inode = 1;
+      same_inodes_are_different = 1;
       break;
 
     case 'g':
@@ -604,12 +614,14 @@ int main(int argc, char **argv) {
       use_md5 = 1;
 #else
       fprintf(stderr,
-              "finddup has not be compiled with MD5 hashing.\n");
+              "finddup has not been compiled with MD5 hashing.\n");
+      usage(stderr);
       exit(EXIT_FAILURE);
 #endif
       break;
 
     default:
+      usage(stderr);
       exit(EXIT_FAILURE);
     }
   }
@@ -617,10 +629,10 @@ int main(int argc, char **argv) {
   if(optind + 2 == argc) {
     start(argv[optind], argv[optind + 1]);
   } else if(optind + 1 == argc) {
-    ignore_same_inode = 1;
+    same_inodes_are_different = 1;
     start(argv[optind], 0);
   } else {
-    print_help(stderr);
+    usage(stderr);
     exit(EXIT_FAILURE);
   }