X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=finddup.c;h=98008f4a631f3123059218ed46e5b1849f8d977b;hb=46181230584702e9d59e54890ee761d9373c4dd3;hp=3edfd611dd59c44ef8f13379c1b2e1ce6c8f1689;hpb=e4133d06373b48e8509afd0811bb0a726d74f8a8;p=finddup.git

diff --git a/finddup.c b/finddup.c
index 3edfd61..98008f4 100644
--- a/finddup.c
+++ b/finddup.c
@@ -68,8 +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 same_inodes_are_different = 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 */
@@ -235,9 +236,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);
 }
 
@@ -518,7 +520,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 +568,7 @@ int main(int argc, char **argv) {
     switch (c) {
 
     case 'h':
-      print_help(stdout);
+      usage(stdout);
       exit(EXIT_SUCCESS);
 
       break;
@@ -584,7 +586,7 @@ int main(int argc, char **argv) {
       break;
 
     case 'i':
-      ignore_same_inode = 1;
+      same_inodes_are_different = 1;
       break;
 
     case 'g':
@@ -604,12 +606,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 +621,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);
   }