#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/param.h>
#include <dirent.h>
#include <stdlib.h>
#include <stdio.h>
#include <fcntl.h>
#define BUFFER_SIZE 4096
+#define LARGE_BUFFER_SIZE 65536
typedef int64_t size_sum_t;
int ignore_dotfiles = 0; /* 1 means ignore files and directories
starting with a dot */
+int ignore_empty_files = 0; /* 1 means ignore empty files */
+
int show_realpaths = 0; /* 1 means ignore files and directories
starting with a dot */
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 */
+
/********************************************************************/
/* malloc with error checking. */
int same_content(struct file_with_size *f1, struct file_with_size *f2) {
int fd1, fd2, s1, s2;
- char buffer1[BUFFER_SIZE], buffer2[BUFFER_SIZE];
+ char buffer1[LARGE_BUFFER_SIZE], buffer2[LARGE_BUFFER_SIZE];
fd1 = open(f1->filename, O_RDONLY);
fd2 = open(f2->filename, O_RDONLY);
if(fd1 >= 0 && fd2 >= 0) {
while(1) {
- s1 = read(fd1, buffer1, BUFFER_SIZE);
- s2 = read(fd2, buffer2, BUFFER_SIZE);
+ s1 = read(fd1, buffer1, LARGE_BUFFER_SIZE);
+ s2 = read(fd2, buffer2, LARGE_BUFFER_SIZE);
if(s1 < 0 || s2 < 0) {
close(fd1);
close(fd2);
return 1;
} else {
- if(strncmp(buffer1, buffer2, s1)) {
+ if(memcmp(buffer1, buffer2, s1)) {
close(fd1);
close(fd2);
return 0;
}
int same_files(struct file_with_size *f1, struct file_with_size *f2) {
+ if(ignore_same_inode && f1->inode == f2->inode) {
+ return 0;
+ }
return f1->size == f2->size && same_content(f1, f2);
}
struct dirent *dir_e;
struct stat sb;
struct file_with_size *tmp;
- char subname[PATH_MAX];
+ char subname[PATH_MAX + 1];
if(lstat(name, &sb) != 0) {
fprintf(stderr, "Can not stat \"%s\": %s\n", name, strerror(errno));
closedir(dir);
} else {
if(S_ISREG(sb.st_mode)) {
- tmp = safe_malloc(sizeof(struct file_with_size));
- tmp->next = tail;
- tmp->filename = strdup(name);
- tmp->size = sb.st_size;
- tmp->inode = sb.st_ino;
- tmp->group_id = -1;
- tail = tmp;
+ if(!ignore_entry(name)) {
+ if(!ignore_empty_files || sb.st_size > 0) {
+ tmp = safe_malloc(sizeof(struct file_with_size));
+ tmp->next = tail;
+ tmp->filename = strdup(name);
+ tmp->size = sb.st_size;
+ tmp->inode = sb.st_ino;
+ tmp->group_id = -1;
+ tail = tmp;
+ }
+ }
}
}
}
void print_file(struct file_with_size *node) {
- char tmp[PATH_MAX];
+ char tmp[PATH_MAX + 1];
if(show_realpaths) {
if(show_groups) {
realpath(node->filename, tmp);
if(node1->group_id >= 0) { nb++; }
}
- if(show_hits) {
+ if(list2) {
for(node2 = list2; node2; node2 = node2->next) {
if(node2->group_id >= 0) { nb++; }
}
}
}
- if(show_hits) {
+ if(list2) {
for(node2 = list2; node2; node2 = node2->next) {
if(node2->group_id >= 0) {
nodes[n++] = node2;
qsort(nodes, nb, sizeof(struct file_with_size *), compare_nodes);
for(n = 0; n < nb; n++) {
+ if(!show_groups && n > 0 && nodes[n]->group_id != nodes[n-1]->group_id) {
+ printf("\n");
+ }
print_file(nodes[n]);
}
void start(const char *dirname1, const char *dirname2) {
struct file_with_size *list1, *list2;
struct file_with_size *node1, *node2;
- struct stat sb1, sb2;
- int not_in, found, same_dir;
+ int not_in, found;
int k, p, pp, l1, n;
- if(strncmp(dirname2, "not:", 4) == 0) {
- not_in = 1;
- dirname2 += 4;
- } else {
- not_in = 0;
- }
-
- if(lstat(dirname1, &sb1) != 0) {
- fprintf(stderr, "Can not stat \"%s\": %s\n", dirname1, strerror(errno));
- exit(EXIT_FAILURE);
- }
-
- if(lstat(dirname2, &sb2) != 0) {
- fprintf(stderr, "Can not stat \"%s\": %s\n", dirname2, strerror(errno));
- exit(EXIT_FAILURE);
- }
-
- same_dir = (sb1.st_ino == sb2.st_ino);
+ not_in = 0;
if(show_progress) {
fprintf(stderr, "Scanning %s ... ", dirname1);
list1 = scan_directory(0, dirname1);
- if(same_dir) {
- list2 = list1;
- } else {
+ if(dirname2) {
+ if(strncmp(dirname2, "not:", 4) == 0) {
+ not_in = 1;
+ dirname2 += 4;
+ }
if(show_progress) {
fprintf(stderr, "%s ... ", dirname2);
}
list2 = scan_directory(0, dirname2);
+ } else {
+ list2 = list1;
}
if(show_progress) {
found = 0;
for(node2 = list2; !found && node2; node2 = node2->next) {
- if(node1->inode != node2->inode && same_files(node1, node2)) {
+ if(same_files(node1, node2)) {
found = 1;
}
}
}
for(node2 = list2; node2; node2 = node2->next) {
- if(node1->inode != node2->inode && same_files(node1, node2)) {
- if(node1->group_id < 0) {
- if(node2->group_id >= 0) {
- node1->group_id = node2->group_id;
- } else {
- node1->group_id = k;
- k++;
+ if(node1->group_id < 0 || node2->group_id < 0) {
+ if(same_files(node1, node2)) {
+ if(node1->group_id < 0) {
+ if(node2->group_id >= 0) {
+ node1->group_id = node2->group_id;
+ } else {
+ node1->group_id = k;
+ k++;
+ }
+ }
+ if(node2->group_id < 0) {
+ node2->group_id = node1->group_id;
}
- }
- if(node2->group_id < 0) {
- node2->group_id = node1->group_id;
}
}
}
}
}
- print_result(list1, list2);
-
- file_list_delete(list1);
- if(!same_dir) {
+ if(dirname2) {
+ print_result(list1, list2);
+ file_list_delete(list1);
file_list_delete(list2);
+ } else {
+ print_result(list1, 0);
+ file_list_delete(list1);
}
}
fprintf(out, "\n");
fprintf(out, " -h show this help\n");
fprintf(out, " -d ignore dot files and directories\n");
+ fprintf(out, " -0 ignore empty files\n");
fprintf(out, " -c do not show which files in DIR2 corresponds to those in DIR1\n");
fprintf(out, " -g do not show the file groups\n");
fprintf(out, " -p show progress\n");
fprintf(out, " -r show the real file paths\n");
+ fprintf(out, " -i consider files with same inode as different\n");
fprintf(out, "\n");
fprintf(out, "Report bugs and comments to <francois@fleuret.org>\n");
}
setlocale (LC_ALL, "");
while (1) {
- c = getopt(argc, argv, "hrcgdp");
+ c = getopt(argc, argv, "hrcgd0p");
if (c == -1)
break;
ignore_dotfiles = 1;
break;
+ case '0':
+ ignore_empty_files = 1;
+ break;
+
case 'r':
show_realpaths = 1;
break;
+ case 'i':
+ ignore_same_inode = 1;
+ break;
+
case 'g':
show_groups = 0;
break;
}
}
- if(optind + 1 < argc) {
+ if(optind + 2 == argc) {
start(argv[optind], argv[optind + 1]);
- } else if(optind < argc) {
- start(argv[optind], argv[optind]);
+ } else if(optind + 1 == argc) {
+ ignore_same_inode = 1;
+ start(argv[optind], 0);
} else {
print_help(stderr);
exit(EXIT_FAILURE);
projects / finddup.git / blobdiff