-/* FDUPES Copyright (c) 1999-2018 Adrian Lopez
+/* FDUPES Copyright (c) 1999-2022 Adrian Lopez
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation files
#include "ncurses-interface.h"
#endif
#include "fdupes.h"
+#include "confirmmatch.h"
#include "errormsg.h"
#include "log.h"
#include "sigint.h"
#include "flags.h"
+#include "removeifnotchanged.h"
long long minsize = -1;
long long maxsize = -1;
ordertype_t ordertype = ORDER_MTIME;
-#define CHUNK_SIZE 8192
-
-#define INPUT_SIZE 256
-
-#define PARTIAL_MD5_SIZE 4096
-
#define MD5_DIGEST_LENGTH 16
-/*
-
-TODO: Partial sums (for working with very large files).
-
-typedef struct _signature
-{
- md5_state_t state;
- md5_byte_t digest[16];
-} signature_t;
-
-typedef struct _signatures
-{
- int num_signatures;
- signature_t *signatures;
-} signatures_t;
-
-*/
-
typedef struct _filetree {
file_t *file;
struct _filetree *left;
}
/* ignore logfile */
- if (info.st_dev == logfile_status->st_dev && info.st_ino == logfile_status->st_ino)
+ if (logfile_status != 0 && info.st_dev == logfile_status->st_dev && info.st_ino == logfile_status->st_ino)
{
free(newfile->d_name);
free(newfile);
}
cmpresult = md5cmp(file->crcpartial, checktree->file->crcpartial);
- /*if (cmpresult != 0) errormsg(" on %s vs %s\n", file->d_name, checktree->file->d_name);*/
if (cmpresult == 0) {
if (checktree->file->crcsignature == NULL) {
}
cmpresult = md5cmp(file->crcsignature, checktree->file->crcsignature);
- /*if (cmpresult != 0) errormsg("P on %s vs %s\n",
- file->d_name, checktree->file->d_name);
- else errormsg("P F on %s vs %s\n", file->d_name,
- checktree->file->d_name);
- printf("%s matches %s\n", file->d_name, checktree->file->d_name);*/
}
}
}
}
-/* Do a bit-for-bit comparison in case two different files produce the
- same signature. Unlikely, but better safe than sorry. */
-
-int confirmmatch(FILE *file1, FILE *file2)
-{
- unsigned char c1[CHUNK_SIZE];
- unsigned char c2[CHUNK_SIZE];
- size_t r1;
- size_t r2;
-
- fseek(file1, 0, SEEK_SET);
- fseek(file2, 0, SEEK_SET);
-
- do {
- r1 = fread(c1, sizeof(unsigned char), sizeof(c1), file1);
- r2 = fread(c2, sizeof(unsigned char), sizeof(c2), file2);
-
- if (r1 != r2) return 0; /* file lengths are different */
- if (memcmp (c1, c2, r1)) return 0; /* file contents are different */
- } while (r2);
-
- return 1;
-}
-
void summarizematches(file_t *files)
{
int numsets = 0;
file_t *curfile;
file_t **dupelist;
int *preserve;
+ int firstpreserved;
char *preservestr;
char *token;
char *tstr;
int i;
struct log_info *loginfo;
int log_error;
+ FILE *file1;
+ FILE *file2;
+ int ismatch;
+ char *errorstring;
curfile = files;
log_file_remaining(loginfo, dupelist[x]->d_name);
}
else {
- if (remove(dupelist[x]->d_name) == 0) {
- printf(" [-] %s\n", dupelist[x]->d_name);
+ if (ISFLAG(flags, F_DEFERCONFIRMATION))
+ {
+ firstpreserved = 0;
+ for (i = 1; i <= counter; ++i)
+ {
+ if (preserve[i])
+ {
+ firstpreserved = i;
+ break;
+ }
+ }
- if (loginfo)
- log_file_deleted(loginfo, dupelist[x]->d_name);
- } else {
- printf(" [!] %s ", dupelist[x]->d_name);
- printf("-- unable to delete file!\n");
+ file1 = fopen(dupelist[x]->d_name, "rb");
+ file2 = fopen(dupelist[firstpreserved]->d_name, "rb");
- if (loginfo)
- log_file_remaining(loginfo, dupelist[x]->d_name);
- }
+ if (file1 && file2)
+ ismatch = confirmmatch(file1, file2);
+ else
+ ismatch = 0;
+
+ if (file2)
+ fclose(file2);
+
+ if (file1)
+ fclose(file1);
+ }
+ else
+ {
+ ismatch = 1;
+ }
+
+ if (ismatch) {
+ if (removeifnotchanged(dupelist[x], &errorstring) == 0) {
+ printf(" [-] %s\n", dupelist[x]->d_name);
+
+ if (loginfo)
+ log_file_deleted(loginfo, dupelist[x]->d_name);
+ }
+ else {
+ printf(" [!] %s ", dupelist[x]->d_name);
+ printf("-- unable to delete file: %s!\n", errorstring);
+
+ if (loginfo)
+ log_file_remaining(loginfo, dupelist[x]->d_name);
+ }
+ }
+ else {
+ printf(" [!] %s\n", dupelist[x]->d_name);
+ printf(" -- unable to confirm match; file not deleted!\n");
+
+ if (loginfo)
+ log_file_remaining(loginfo, dupelist[x]->d_name);
+ }
}
}
printf("\n");
}
}
-void deletesuccessor(file_t **existing, file_t *duplicate,
+void deletesuccessor(file_t **existing, file_t *duplicate, int matchconfirmed,
int (*comparef)(file_t *f1, file_t *f2), struct log_info *loginfo)
{
file_t *to_keep;
file_t *to_delete;
+ char *errorstring;
if (comparef(duplicate, *existing) >= 0)
{
if (loginfo)
log_file_remaining(loginfo, to_keep->d_name);
- if (remove(to_delete->d_name) == 0) {
- printf(" [-] %s\n", to_delete->d_name);
+ if (matchconfirmed)
+ {
+ if (removeifnotchanged(to_delete, &errorstring) == 0) {
+ printf(" [-] %s\n", to_delete->d_name);
- if (loginfo)
- log_file_deleted(loginfo, to_delete->d_name);
- } else {
- printf(" [!] %s ", to_delete->d_name);
- printf("-- unable to delete file!\n");
+ if (loginfo)
+ log_file_deleted(loginfo, to_delete->d_name);
+ } else {
+ printf(" [!] %s ", to_delete->d_name);
+ printf("-- unable to delete file: %s!\n", errorstring);
+
+ if (loginfo)
+ log_file_remaining(loginfo, to_delete->d_name);
+ }
+ }
+ else
+ {
+ printf(" [!] %s\n", to_delete->d_name);
+ printf(" -- unable to confirm match; file not deleted!\n");
if (loginfo)
log_file_remaining(loginfo, to_delete->d_name);
printf(" with -s or --symlinks, or when specifying a\n");
printf(" particular directory more than once; refer to the\n");
printf(" fdupes documentation for additional information\n");
+ printf(" -D --deferconfirmation in interactive mode, defer byte-for-byte confirmation\n");
+ printf(" of duplicates until just before file deletion\n");
#ifndef NO_NCURSES
printf(" -P --plain with --delete, use line-based prompt (as with older\n");
printf(" versions of fdupes) instead of screen-mode interface\n");
{ "order", 1, 0, 'o' },
{ "reverse", 0, 0, 'i' },
{ "log", 1, 0, 'l' },
+ { "deferconfirmation", 0, 0, 'D' },
{ 0, 0, 0, 0 }
};
#define GETOPT getopt_long
oldargv = cloneargs(argc, argv);
- while ((opt = GETOPT(argc, argv, "frRq1StsHG:L:nAdPvhNImpo:il:"
+ while ((opt = GETOPT(argc, argv, "frRq1StsHG:L:nAdPvhNImpo:il:D"
#ifdef HAVE_GETOPT_H
, long_options, NULL
#endif
case 'l':
logfile = optarg;
break;
+ case 'D':
+ SETFLAG(flags, F_DEFERCONFIRMATION);
+ break;
default:
fprintf(stderr, "Try `fdupes --help' for more information.\n");
exit(1);
exit(1);
}
+ if (ISFLAG(flags, F_DEFERCONFIRMATION) && (!ISFLAG(flags, F_DELETEFILES) || ISFLAG(flags, F_NOPROMPT)))
+ {
+ errormsg("--deferconfirmation only works with interactive deletion modes\n");
+ exit(1);
+ }
+
if (!ISFLAG(flags, F_DELETEFILES))
logfile = 0;
/* F_RECURSE is not set for directories before --recurse: */
for (x = optind; x < firstrecurse; x++)
- filecount += grokdir(argv[x], &files, &logfile_status);
+ filecount += grokdir(argv[x], &files, logfile ? &logfile_status : 0);
/* Set F_RECURSE for directories after --recurse: */
SETFLAG(flags, F_RECURSE);
for (x = firstrecurse; x < argc; x++)
- filecount += grokdir(argv[x], &files, &logfile_status);
+ filecount += grokdir(argv[x], &files, logfile ? &logfile_status : 0);
} else {
for (x = optind; x < argc; x++)
- filecount += grokdir(argv[x], &files, &logfile_status);
+ filecount += grokdir(argv[x], &files, logfile ? &logfile_status : 0);
}
if (!files) {
continue;
}
- if (confirmmatch(file1, file2)) {
- if (ISFLAG(flags, F_DELETEFILES) && ISFLAG(flags, F_IMMEDIATE))
- deletesuccessor(match, curfile,
+ if (ISFLAG(flags, F_DELETEFILES) && ISFLAG(flags, F_IMMEDIATE))
+ {
+ deletesuccessor(match, curfile, confirmmatch(file1, file2),
ordertype == ORDER_MTIME ? sort_pairs_by_mtime :
ordertype == ORDER_CTIME ? sort_pairs_by_ctime :
sort_pairs_by_filename, loginfo );
- else
- registerpair(match, curfile,
- ordertype == ORDER_MTIME ? sort_pairs_by_mtime :
- ordertype == ORDER_CTIME ? sort_pairs_by_ctime :
- sort_pairs_by_filename );
}
-
+ else if (ISFLAG(flags, F_DEFERCONFIRMATION) || confirmmatch(file1, file2))
+ registerpair(match, curfile,
+ ordertype == ORDER_MTIME ? sort_pairs_by_mtime :
+ ordertype == ORDER_CTIME ? sort_pairs_by_ctime :
+ sort_pairs_by_filename );
+
fclose(file1);
fclose(file2);
}
projects / platform / upstream / fdupes.git / blobdiff