*
*/
-#define VERSION_NUMBER "0.8"
+#define VERSION_NUMBER "0.9"
#define _BSD_SOURCE
/* 1M really helps compared to 64k */
#define READ_BUFFER_SIZE (1024 * 1024)
+#define PROGRESS_BUFFER_SIZE 1024
+
typedef int64_t size_sum_t;
/* Yeah, global variables! */
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 */
/********************************************************************/
return 1;
} else {
if(memcmp(buffer1, buffer2, s1)) {
+ /* printf("size_to_read = %d\n", size_to_read); */
close(fd1);
close(fd2);
return 0;
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);
}
free(nodes);
}
-void print_progress(int max, int n, int *pp) {
- int p, k;
- int width;
- if(show_progress && tty_width > 0) {
- width = tty_width - 7;
- p = (width * n) / (max - 1);
- if(p > *pp) {
- for(k = 0; k < p; k++) {
- fprintf(stderr, "+");
- }
- for(; k < width; k++) {
- fprintf(stderr, "-");
+struct progress_state {
+ int bar_width;
+ int nb_values, value;
+ int last_position;
+};
+
+void print_progress(struct progress_state *state) {
+ int position, k;
+ struct winsize win;
+ char buffer[PROGRESS_BUFFER_SIZE];
+ char *s;
+
+ 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);
+ 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 */
+ if(win.ws_col >= PROGRESS_BUFFER_SIZE - 3) {
+ state->bar_width = PROGRESS_BUFFER_SIZE - 10;
+ } else {
+ state->bar_width = win.ws_col - 7;
+ }
+ position = (state->bar_width * state->value) / (state->nb_values - 1);
+ state->last_position = position;
+ s = buffer;
+ for(k = 0; k < position; k++) {
+ *(s++) = '+';
+ }
+ for(; k < state->bar_width; k++) {
+ *(s++) = '-';
+ }
+
+ /* We need four % because of the fprintf that follows */
+ sprintf(s, " [%3d%%%%]\r",
+ (100 * state->value) / (state->nb_values - 1));
+
+ fprintf(stderr, buffer);
}
- *pp = p;
- p = (100 * n) / (max - 1);
- fprintf(stderr, " [%3d%%]\r", p);
}
}
}
void start(const char *dirname1, const char *dirname2) {
struct file_node *list1, *list2;
struct file_node *node1, *node2;
+ struct progress_state progress_state;
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);
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);
+ fprintf(stderr, "Scanning '%s' ... ", dirname1);
}
list1 = scan_directory(0, dirname1);
+ list1_length = file_list_length(list1);
+
+ if(show_progress) {
+ fprintf(stderr, "done (%d file%s).\n",
+ list1_length, (list1_length > 1 ? "s" : ""));
+ }
+
if(dirname2) {
if(strncmp(dirname2, "not:", 4) == 0) {
not_in = 1;
dirname2 += 4;
}
if(show_progress) {
- fprintf(stderr, "%s ... ", dirname2);
+ fprintf(stderr, "Scanning '%s' ... ", dirname2);
}
list2 = scan_directory(0, dirname2);
+ if(show_progress) {
+ list2_length = file_list_length(list2);
+ fprintf(stderr, "done (%d file%s).\n",
+ list2_length, (list2_length > 1 ? "s" : ""));
+ }
} else {
list2 = list1;
}
if(show_progress) {
- fprintf(stderr, "done.\n");
+ fprintf(stderr, "Now looking for identical files (this may take a while).\n");
}
nb_groups = 0;
previous_progress = -1;
nb_nodes = 0;
- list1_length = file_list_length(list1);
+
+ progress_state.bar_width = -1;
+ progress_state.last_position = -1;
+ progress_state.nb_values = list1_length;
if(not_in) {
for(node1 = list1; node1; node1 = node1->next) {
- print_progress(list1_length, nb_nodes, &previous_progress);
+ progress_state.value = nb_nodes;
+ print_progress(&progress_state);
nb_nodes++;
found = 0;
} else {
for(node1 = list1; node1; node1 = node1->next) {
- print_progress(list1_length, nb_nodes, &previous_progress);
+ progress_state.value = nb_nodes;
+ print_progress(&progress_state);
nb_nodes++;
for(node2 = list2; node2; node2 = node2->next) {
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");
setlocale (LC_ALL, "");
- while ((c = getopt_long(argc, argv, "hircgd0p",
+ while ((c = getopt_long(argc, argv, "hircgd0pm",
long_options, NULL)) != -1) {
switch (c) {
case 'h':
- print_help(stdout);
+ usage(stdout);
exit(EXIT_SUCCESS);
break;
break;
case 'i':
- ignore_same_inode = 1;
+ same_inodes_are_different = 1;
break;
case 'g':
break;
default:
+ usage(stderr);
exit(EXIT_FAILURE);
}
}
+ if(!isatty(STDERR_FILENO)) {
+ show_progress = 0;
+ }
+
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);
}
projects / finddup.git / blobdiff