projects
/
finddup.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e4133d0
)
Cosmetics.
author
Francois Fleuret
<francois@fleuret.org>
Fri, 19 Mar 2010 16:43:21 +0000
(17:43 +0100)
committer
Francois Fleuret
<francois@fleuret.org>
Fri, 19 Mar 2010 16:43:21 +0000
(17:43 +0100)
finddup.c
patch
|
blob
|
history
diff --git
a/finddup.c
b/finddup.c
index
3edfd61
..
1ea54ce
100644
(file)
--- 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 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 */
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) {
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 0;
}
+
return f1->size == f2->size && same_content(f1, f2, buffer1, buffer2);
}
return f1->size == f2->size && same_content(f1, f2, buffer1, buffer2);
}
@@
-584,7
+586,7
@@
int main(int argc, char **argv) {
break;
case 'i':
break;
case 'i':
-
ignore_same_inode
= 1;
+
same_inodes_are_different
= 1;
break;
case 'g':
break;
case 'g':
@@
-617,7
+619,7
@@
int main(int argc, char **argv) {
if(optind + 2 == argc) {
start(argv[optind], argv[optind + 1]);
} else if(optind + 1 == argc) {
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);
start(argv[optind], 0);
} else {
print_help(stderr);