int width;
if(show_progress && tty_width > 0) {
width = tty_width - 7;
- p = (width * n) / max;
+ p = (width * n) / (max - 1);
if(p > *pp) {
for(k = 0; k < p; k++) {
fprintf(stderr, "+");
fprintf(stderr, "-");
}
*pp = p;
- p = (100 * n) / max;
- fprintf(stderr, " [% 3d%%]\r", p);
+ p = (100 * n) / (max - 1);
+ fprintf(stderr, " [%3d%%]\r", p);
}
}
}
if(dirname2) {
if(strncmp(dirname2, "not:", 4) == 0) {
not_in = 1;
- /* We should show groups even in that mode. However they are not
- properly calculated for now, so we force it off. */
+ /* groups are not computed in the not: mode */
show_groups = 0;
dirname2 += 4;
+ } else if(strncmp(dirname2, "and:", 4) == 0) {
+ dirname2 += 4;
}
if(show_progress) {
fprintf(stderr, "%s ... ", dirname2);
}
void print_help(FILE *out) {
- fprintf(out, "Usage: finddup [OPTION]... DIR1 [[not:]DIR2]\n");
+ 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.\n");
+ 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");
fprintf(out, "\n");
fprintf(out, " -h show this help\n");
fprintf(out, " -d ignore dot files and directories\n");