X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=finddup.c;h=aa16dac99582b2c1365c06b97f9c9552044df26b;hb=0c962f1c0fabf85606069ab40c7b943a28c61abd;hp=a888bee93812c1e4e3620e25dfcb2601cd749a9d;hpb=106214e00510f0e4c2bae6e18412bd12a4f821be;p=finddup.git diff --git a/finddup.c b/finddup.c index a888bee..aa16dac 100644 --- a/finddup.c +++ b/finddup.c @@ -90,7 +90,7 @@ int ignore_entry(const char *name) { return strcmp(name, ".") == 0 || strcmp(name, "..") == 0 || - (ignore_dotfiles && name[0] == '.'); + (ignore_dotfiles && name[0] == '.' && name[1] != '/'); } /**********************************************************************/ @@ -176,6 +176,7 @@ int same_content(struct file_node *f1, struct file_node *f2, f2->name, strerror(errno)); } + exit(EXIT_FAILURE); } } @@ -190,8 +191,7 @@ int same_files(struct file_node *f1, struct file_node *f2, /**********************************************************************/ -struct file_node *scan_directory(struct file_node *tail, - const char *name) { +struct file_node *scan_directory(struct file_node *tail, const char *name) { DIR *dir; struct dirent *dir_e; struct stat sb; @@ -468,24 +468,19 @@ void print_help(FILE *out) { 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"); fprintf(out, "\n"); - fprintf(out, " -h, --help\n"); - fprintf(out, " show this help\n"); - fprintf(out, " -d, --ignore-dots\n"); - fprintf(out, " ignore dot files and directories\n"); - fprintf(out, " -0, --ignore-empty\n"); - fprintf(out, " ignore empty files\n"); - fprintf(out, " -c, --hide-matchings\n"); - fprintf(out, " do not show which files in DIR2 corresponds to those in DIR1\n"); - fprintf(out, " -g, --no-group-ids\n"); - fprintf(out, " do not show the file groups\n"); - fprintf(out, " -p, --show-progress\n"); - fprintf(out, " show progress\n"); - fprintf(out, " -r, --real-paths\n"); - fprintf(out, " show the real file paths\n"); + /* 01234567890123456789012345678901234567890123456789012345678901234567890123456789*/ + 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, " those in DIR1\n"); + fprintf(out, " -g, --no-group-ids do not show the file groups\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, " consider files with same inode as different\n"); + fprintf(out, " consider files with same inode as different\n"); fprintf(out, "\n"); - fprintf(out, "Report bugs and comments to \n"); + fprintf(out, "Report bugs and comments to .\n"); } /**********************************************************************/