* to several directories, or files present in one directory and not
* in another one.
*
- * Copyright (c) 2010 Francois Fleuret
+ * Copyright (c) 2010, 2011 Francois Fleuret
* Written by Francois Fleuret <francois@fleuret.org>
*
* This file is part of finddup.
*
*/
-#define VERSION_NUMBER "1.1"
+#define VERSION_NUMBER "1.2"
#define _BSD_SOURCE
int sort_by_time = 0; /* 1 means to sort files in each group according
to the modification time */
+int trim_first = 0; /* remove the first entry in each group */
+
char *command_to_exec = 0; /* the name of the command to exec for each
group of identical files */
+char *result_file_prefix = 0; /* The prefix to use to write result */
+
/********************************************************************/
/* malloc with error checking. */
return result;
}
-void print_file(struct file_node *node) {
+void write_one_entry_to_file(FILE *out, struct file_node *node) {
char tmp[PATH_MAX + 1];
if(show_realpaths) {
if(realpath(node->name, tmp)) {
if(show_groups) {
- printf("%d %s\n", node->group_id, tmp);
+ fprintf(out, "%d %s\n", node->group_id, tmp);
} else {
- printf("%s\n", tmp);
+ fprintf(out, "%s\n", tmp);
}
} else {
fprintf(stderr,
}
} else {
if(show_groups) {
- printf("%d %s\n", node->group_id, node->name);
+ fprintf(out, "%d %s\n", node->group_id, node->name);
} else {
- printf("%s\n", node->name);
+ fprintf(out, "%s\n", node->name);
}
}
}
void exec_command(int nb, struct file_node **nodes) {
char **args;
- int max_group_size = 0, group_size, m, n, status;
+ int max_group_size = 0, group_size = 0, m, n, status;
pid_t pid;
for(n = 0; n < nb; n++) {
- if(n == 0 || nodes[n]->group_id != nodes[n-1]->group_id) {
+ if(nodes[n]->group_id != nodes[n-1]->group_id) {
group_size = 0;
}
group_size++;
n = 0;
while(n < nb) {
m = n;
+ if(trim_first) { m++; }
while(n < nb && nodes[n]->group_id == nodes[m]->group_id) {
- args[n - m + 1] = nodes[n]->name;
+ if(n >= m) {
+ args[n - m + 1] = nodes[n]->name;
+ }
n++;
}
args[n - m + 1] = 0;
free(args);
}
+void write_groups_in_files(int nb, struct file_node **nodes) {
+ FILE *file = 0;
+ int current_group = -1, n, first_of_group;
+ char filename[PATH_MAX + 1];
+
+ for(n = 0; n < nb; n++) {
+ first_of_group = (n == 0);
+ if(nodes[n]->group_id != current_group) {
+ if(file) { fclose(file); }
+ sprintf(filename, "%s%06d", result_file_prefix, nodes[n]->group_id);
+ file = fopen(filename, "w");
+ current_group = nodes[n]->group_id;
+ printf("Writing %s.\n" , filename);
+ first_of_group = 1;
+ }
+
+ if(!trim_first || !first_of_group) {
+ write_one_entry_to_file(file, nodes[n]);
+ }
+ }
+
+ if(file) { fclose(file); }
+}
+
void print_result(struct file_node *list1, struct file_node *list2) {
struct file_node *node1, *node2;
struct file_node **nodes;
- int nb, n;
+ int nb, n, first_of_group;
nb = 0;
for(node1 = list1; node1; node1 = node1->next) {
if(command_to_exec) {
exec_command(nb, nodes);
+ } else if(result_file_prefix) {
+ write_groups_in_files(nb, nodes);
} else {
for(n = 0; n < nb; n++) {
- if(!show_groups && n > 0 && nodes[n]->group_id != nodes[n-1]->group_id) {
- printf("\n");
+ first_of_group = (n == 0);
+ if(n > 0 && nodes[n]->group_id != nodes[n-1]->group_id) {
+ if(!show_groups) {
+ printf("\n");
+ }
+ first_of_group = 1;
+ }
+ if(!trim_first || !first_of_group) {
+ write_one_entry_to_file(stdout, nodes[n]);
}
- print_file(nodes[n]);
}
}
struct progress_state progress_state;
int not_in, found;
int nb_groups, nb_nodes;
- int list1_length, previous_progress;
+ int list1_length;
char *buffer1 = safe_malloc(sizeof(char) * READ_BUFFER_SIZE);
char *buffer2 = safe_malloc(sizeof(char) * READ_BUFFER_SIZE);
}
nb_groups = 0;
- previous_progress = -1;
nb_nodes = 0;
progress_state.bar_width = -1;
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, " -q, --trim-first do not show the first file 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");
fprintf(out, " -e <command>, --exec <command>\n");
fprintf(out, " execute the provided command for each group of\n");
fprintf(out, " identical files, with their names as arguments\n");
+ fprintf(out, " -f <string>, --result-prefix <string>\n");
+ fprintf(out, " for each group of identical files, write one\n");
+ fprintf(out, " result file whose name is the given prefix string\n");
+ fprintf(out, " followed by the group number, and containing\n");
+ fprintf(out, " one filename per line\n");
fprintf(out, "\n");
fprintf(out, "Report bugs and comments to <francois@fleuret.org>.\n");
}
{ "hide-matchings", no_argument, 0, 'c' },
{ "no-group-ids", no_argument, 0, 'g' },
{ "time-sort", no_argument, 0, 't' },
+ { "trim-first", no_argument, 0, 'q' },
{ "ignore-dots", no_argument, 0, 'd' },
{ "ignore-empty", no_argument, 0, '0' },
{ "show-progress", no_argument, 0, 'p' },
{ "exec", 1, 0, 'e' },
+ { "result-prefix", 1, 0, 'f' },
{ 0, 0, 0, 0 }
};
setlocale (LC_ALL, "");
- while ((c = getopt_long(argc, argv, "vhircgtd0pme:",
+ while ((c = getopt_long(argc, argv, "vhircgtqd0pme:f:",
long_options, NULL)) != -1) {
switch (c) {
sort_by_time = 1;
break;
+ case 'q':
+ trim_first = 1;
+ break;
+
case 'p':
show_progress = 1;
break;
command_to_exec = strdup(optarg);
break;
+ case 'f':
+ if(result_file_prefix != 0) {
+ free(result_file_prefix);
+ }
+ result_file_prefix = strdup(optarg);
+ show_groups = 0;
+ break;
+
default:
usage(stderr);
exit(EXIT_FAILURE);