X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=finddup.git;a=blobdiff_plain;f=finddup.c;h=7f223136d4f3e06904e5669ffa1546c3041a6118;hp=350afa06586793aa312b096cc82119b9c5213c73;hb=HEAD;hpb=587468f168cc9532c9c8ed3e4c9e5c6ac0fa2e2a diff --git a/finddup.c b/finddup.c index 350afa0..7d15689 100644 --- a/finddup.c +++ b/finddup.c @@ -23,9 +23,9 @@ * */ -#define VERSION_NUMBER "1.2" +#define VERSION_NUMBER "1.2.1" -#define _BSD_SOURCE +#define _DEFAULT_SOURCE #include #include @@ -56,8 +56,8 @@ int ignore_dotfiles = 0; /* 1 means ignore files and directories 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_realpaths = 0; /* 1 show the canonical absolute pathname for + printed files */ int show_progress = 0; /* 1 means show a progress bar when we are in a tty */ @@ -75,6 +75,8 @@ int same_inodes_are_different = 0; /* 1 means that comparison between 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 */ @@ -273,7 +275,7 @@ struct file_node *scan_directory(struct file_node *tail, const char *name) { return result; } -void print_file(FILE *out, 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)) { @@ -331,11 +333,11 @@ int compare_nodes(const void *x1, const void *x2) { 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(n > 0 && nodes[n]->group_id != nodes[n-1]->group_id) { group_size = 0; } group_size++; @@ -350,8 +352,11 @@ void exec_command(int nb, struct file_node **nodes) { 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; @@ -375,18 +380,23 @@ void exec_command(int nb, struct file_node **nodes) { void write_groups_in_files(int nb, struct file_node **nodes) { FILE *file = 0; - int current_group = -1, n; + 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]); } - print_file(file, nodes[n]); } if(file) { fclose(file); } @@ -395,7 +405,7 @@ void write_groups_in_files(int nb, struct file_node **nodes) { 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) { @@ -433,10 +443,16 @@ void print_result(struct file_node *list1, struct file_node *list2) { 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(stdout, nodes[n]); } } @@ -495,7 +511,7 @@ void start(const char *dirname1, const char *dirname2) { 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); @@ -525,7 +541,6 @@ void start(const char *dirname1, const char *dirname2) { } nb_groups = 0; - previous_progress = -1; nb_nodes = 0; progress_state.bar_width = -1; @@ -610,10 +625,11 @@ void usage(FILE *out) { fprintf(out, " -h, --help show this help\n"); fprintf(out, " -d, --ignore-dots ignore dot files and directories\n"); fprintf(out, " -0, --ignore-empty ignore empty files\n"); - fprintf(out, " -c, --hide-matchings do not show which files in DIR2 corresponds to\n"); + fprintf(out, " -c, --hide-matchings do not show which files in DIR2 correspond to\n"); 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"); @@ -624,8 +640,8 @@ void usage(FILE *out) { fprintf(out, " -f , --result-prefix \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 the group number, and containing one\n"); - fprintf(out, " filename per line\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 .\n"); } @@ -640,6 +656,7 @@ static struct option long_options[] = { { "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' }, @@ -653,7 +670,7 @@ int main(int argc, char **argv) { setlocale (LC_ALL, ""); - while ((c = getopt_long(argc, argv, "vhircgtd0pme:f:", + while ((c = getopt_long(argc, argv, "vhircgtqd0pme:f:", long_options, NULL)) != -1) { switch (c) { @@ -692,6 +709,10 @@ int main(int argc, char **argv) { sort_by_time = 1; break; + case 'q': + trim_first = 1; + break; + case 'p': show_progress = 1; break;