Removed a crashing bug with the progress bar when only one file was present.

[finddup.git] / finddup.c

diff --git a/finddup.c b/finddup.c
index 8f2b6c9..cb4b8ca 100644 (file)
--- a/finddup.c
+++ b/finddup.c
@@ -23,7 +23,7 @@
  *
  */
 
-#define VERSION_NUMBER "0.9"
+#define VERSION_NUMBER "1.1"
 
 #define _BSD_SOURCE
 
@@ -71,6 +71,9 @@ int same_inodes_are_different = 0; /* 1 means that comparison between
                                       two files with same inode will
                                       always be false */
 
+int sort_by_time = 0; /* 1 means to sort files in each group according
+                         to the modification time */
+
 /********************************************************************/
 
 /* malloc with error checking.  */
@@ -99,6 +102,7 @@ struct file_node {
   struct file_node *next;
   char *name;
   size_t size;
+  time_t atime, mtime, ctime;
   ino_t inode;
   int group_id; /* one per identical file content */
   int dir_id; /* 1 for DIR1, and 2 for DIR2 */
@@ -227,6 +231,9 @@ struct file_node *scan_directory(struct file_node *tail, const char *name) {
           tmp->next = tail;
           tmp->name = strdup(name);
           tmp->size = sb.st_size;
+          tmp->atime = sb.st_atime;
+          tmp->mtime = sb.st_mtime;
+          tmp->ctime = sb.st_ctime;
           tmp->inode = sb.st_ino;
           tmp->group_id = -1;
           tmp->dir_id = -1;
@@ -274,12 +281,22 @@ int compare_nodes(const void *x1, const void *x2) {
   } else if((*f1)->group_id > (*f2)->group_id) {
     return 1;
   } else {
-    if((*f1)->dir_id < (*f2)->dir_id) {
-      return -1;
-    } else if((*f1)->dir_id > (*f2)->dir_id) {
-      return 1;
+    if(sort_by_time) {
+      if((*f1)->mtime < (*f2)->mtime) {
+        return -1;
+      } else if((*f1)->mtime > (*f2)->mtime) {
+        return 1;
+      } else {
+        return 0;
+      }
     } else {
-      return 0;
+      if((*f1)->dir_id < (*f2)->dir_id) {
+        return -1;
+      } else if((*f1)->dir_id > (*f2)->dir_id) {
+        return 1;
+      } else {
+        return 0;
+      }
     }
   }
 }
@@ -337,15 +354,17 @@ struct progress_state {
 };
 
 void print_progress(struct progress_state *state) {
-  int position, k;
+  int position, k, normalizer;
   struct winsize win;
   char buffer[PROGRESS_BUFFER_SIZE];
   char *s;
 
+  normalizer = (state->nb_values > 1 ? state->nb_values - 1 : 1);
+
   if(show_progress) {
     /* We use the previous bar_width to compute the position, so that
        we avoid doing too many ioctls */
-    position = (state->bar_width * state->value) / (state->nb_values - 1);
+    position = (state->bar_width * state->value) / normalizer;
     if(state->bar_width <= 0 || position != state->last_position) {
       if(!ioctl (STDERR_FILENO, TIOCGWINSZ, (char *) &win)) {
         /* Something weird is going on if the previous test is wrong */
@@ -354,7 +373,7 @@ void print_progress(struct progress_state *state) {
         } else {
           state->bar_width = win.ws_col - 7;
         }
-        position = (state->bar_width * state->value) / (state->nb_values - 1);
+        position = (state->bar_width * state->value) / normalizer;
         state->last_position = position;
         s = buffer;
         for(k = 0; k < position; k++) {
@@ -366,7 +385,7 @@ void print_progress(struct progress_state *state) {
 
         /* We need four % because of the fprintf that follows */
         sprintf(s, " [%3d%%%%]\r",
-                (100 * state->value) / (state->nb_values - 1));
+                (100 * state->value) / normalizer);
 
         fprintf(stderr, buffer);
       }
@@ -503,9 +522,9 @@ void start(const char *dirname1, const char *dirname2) {
 }
 
 void usage(FILE *out) {
-  fprintf(out, "Usage: finddup [OPTION]... DIR1 [[and:|not:]DIR2]\n");
+  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");
+  fprintf(out, "Without DIR2, lists duplicated files found in DIR1, or the current directory if DIR1 is not provided. 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");
   fprintf(out, "\n");
   /*            01234567890123456789012345678901234567890123456789012345678901234567890123456789*/
   fprintf(out, "   -h, --help                 show this help\n");
@@ -514,6 +533,7 @@ void usage(FILE *out) {
   fprintf(out, "   -c, --hide-matchings       do not show which files in DIR2 corresponds to\n");
   fprintf(out, "                              those in DIR1\n");
   fprintf(out, "   -g, --no-group-ids         do not show the file groups\n");
+  fprintf(out, "   -t, --time-sort            sort according to modification time in each group\n");
   fprintf(out, "   -p, --show-progress        show progress\n");
   fprintf(out, "   -r, --real-paths           show the real file paths\n");
   fprintf(out, "   -i, --same-inodes-are-different\n");
@@ -530,6 +550,7 @@ static struct option long_options[] = {
   { "real-paths", no_argument, 0, 'r' },
   { "hide-matchings", no_argument, 0, 'c' },
   { "no-group-ids", no_argument, 0, 'g' },
+  { "time-sort", no_argument, 0, 't' },
   { "ignore-dots", no_argument, 0, 'd' },
   { "ignore-empty", no_argument, 0, '0' },
   { "show-progress", no_argument, 0, 'p' },
@@ -541,7 +562,7 @@ int main(int argc, char **argv) {
 
   setlocale (LC_ALL, "");
 
-  while ((c = getopt_long(argc, argv, "hircgd0pm",
+  while ((c = getopt_long(argc, argv, "hircgtd0pm",
                           long_options, NULL)) != -1) {
     switch (c) {
 
@@ -571,6 +592,10 @@ int main(int argc, char **argv) {
       show_groups = 0;
       break;
 
+    case 't':
+      sort_by_time = 1;
+      break;
+
     case 'p':
       show_progress = 1;
       break;
@@ -594,6 +619,9 @@ int main(int argc, char **argv) {
   } else if(optind + 1 == argc) {
     same_inodes_are_different = 1;
     start(argv[optind], 0);
+  } else if(optind == argc) {
+    same_inodes_are_different = 1;
+    start(".", 0);
   } else {
     usage(stderr);
     exit(EXIT_FAILURE);