ino_t inode;
int group_id; /* one per identical file content */
int dir_id; /* 1 for DIR1, and 2 for DIR2 */
ino_t inode;
int group_id; /* one per identical file content */
int dir_id; /* 1 for DIR1, and 2 for DIR2 */
-#ifdef WITH_MD5
- MD5_CTX c1, c2;
-
- if(use_md5) {
- if(f1->md5_computed && f2->md5_computed) {
- if(!memcmp(f1->md5, f2->md5, MD5_DIGEST_LENGTH)) {
- return 0;
- }
- } else {
- if(!f1->md5_computed) {
- MD5_Init(&c1);
- }
- if(!f2->md5_computed) {
- MD5_Init(&c2);
- }
- }
- }
-#endif
-
fd1 = open(f1->name, O_RDONLY);
fd2 = open(f2->name, O_RDONLY);
fd1 = open(f1->name, O_RDONLY);
fd2 = open(f2->name, O_RDONLY);
-#ifdef WITH_MD5
- if(use_md5) {
- if(!f1->md5_computed) {
- MD5_Final(f1->md5, &c1);
- f1->md5_computed = 1;
- }
- if(!f2->md5_computed) {
- MD5_Final(f2->md5, &c2);
- f2->md5_computed = 1;
- }
- }
-#endif
-#ifdef WITH_MD5
- if(use_md5) {
- if(!f1->md5_computed) {
- MD5_Update(&c1, buffer1, s1);
- }
- if(!f2->md5_computed) {
- MD5_Update(&c2, buffer2, s2);
- }
- }
-#endif
char subname[PATH_MAX + 1];
if(lstat(name, &sb) != 0) {
char subname[PATH_MAX + 1];
if(lstat(name, &sb) != 0) {
- fprintf(stderr, "Can not stat \"%s\": %s\n", name, strerror(errno));
+ fprintf(stderr, "finddup: Can not stat \"%s\": %s\n", name, strerror(errno));
while((dir_e = readdir(dir))) {
if(!ignore_entry(dir_e->d_name)) {
snprintf(subname, PATH_MAX, "%s/%s", name, dir_e->d_name);
while((dir_e = readdir(dir))) {
if(!ignore_entry(dir_e->d_name)) {
snprintf(subname, PATH_MAX, "%s/%s", name, dir_e->d_name);
+struct file_node *scan_directory(struct file_node *tail, const char *name) {
+ struct file_node *result;
+ int length;
+
+ if(show_progress) {
+ fprintf(stderr, "Scanning '%s' ... ", name);
+ }
+
+ result = scan_directory_rec(tail, name);
+ length = file_list_length(result);
+
+ if(show_progress) {
+ fprintf(stderr, "done (%d file%s).\n",
+ length, (length > 1 ? "s" : ""));
+ }
+
+
+ return result;
+}
+
if(show_progress) {
/* We use the previous bar_width to compute the position, so that
we avoid doing too many ioctls */
if(show_progress) {
/* We use the previous bar_width to compute the position, so that
we avoid doing too many ioctls */
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(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 */
/* We need four % because of the fprintf that follows */
sprintf(s, " [%3d%%%%]\r",
/* We need four % because of the fprintf that follows */
sprintf(s, " [%3d%%%%]\r",
char *buffer1 = safe_malloc(sizeof(char) * READ_BUFFER_SIZE);
char *buffer2 = safe_malloc(sizeof(char) * READ_BUFFER_SIZE);
not_in = 0;
char *buffer1 = safe_malloc(sizeof(char) * READ_BUFFER_SIZE);
char *buffer2 = safe_malloc(sizeof(char) * READ_BUFFER_SIZE);
not_in = 0;
- if(show_progress) {
- list2_length = file_list_length(list2);
- fprintf(stderr, "done (%d file%s).\n",
- list2_length, (list2_length > 1 ? "s" : ""));
- }
fprintf(out, "Version %s (%s)\n", VERSION_NUMBER, UNAME);
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, "Without DIR2, lists duplicated files found in DIR1, or the current directory if DIR1 is not provided. 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, " -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, " -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, " -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");
/**********************************************************************/
static struct option long_options[] = {
/**********************************************************************/
static struct option long_options[] = {
{ "help", no_argument, 0, 'h' },
{ "same-inodes-are-different", no_argument, 0, 'i' },
{ "real-paths", no_argument, 0, 'r' },
{ "hide-matchings", no_argument, 0, 'c' },
{ "no-group-ids", no_argument, 0, 'g' },
{ "help", no_argument, 0, 'h' },
{ "same-inodes-are-different", no_argument, 0, 'i' },
{ "real-paths", no_argument, 0, 'r' },
{ "hide-matchings", no_argument, 0, 'c' },
{ "no-group-ids", no_argument, 0, 'g' },
{ "ignore-dots", no_argument, 0, 'd' },
{ "ignore-empty", no_argument, 0, '0' },
{ "show-progress", no_argument, 0, 'p' },
{ "ignore-dots", no_argument, 0, 'd' },
{ "ignore-empty", no_argument, 0, '0' },
{ "show-progress", no_argument, 0, 'p' },
- while ((c = getopt_long(argc, argv, "hircgd0pm",
+ while ((c = getopt_long(argc, argv, "vhircgtd0pm",