forked from pool/fdupes
ebd601a9d7
- update to 1.5.0-PR2 * new "--summarize" option * new "--recurse:" selective recursion option * new "--noprompt" option for totally automated deletion of duplicate files. * sorts duplicates (old to new) for consistent order when listing or deleteing duplicate files. * tests for early matching of files, which should help speed up the matching process when large files are involved. * warns whenever a file cannot be deleted. * bugfixes (proper file closing, zero-length files, ...) - add -p/--permissions switch so files with different permissions or uid/gid are not considered as duplicates (bnc#784670) * this mode is a default one for fdupes macro - refresh all patches - drop the fdupes-sort-output.diff - use the upstream mtime sorting - add the debian patches - see spec file for details OBS-URL: https://build.opensuse.org/request/show/138346 OBS-URL: https://build.opensuse.org/package/show/utilities/fdupes?expand=0&rev=6
49 lines
1.8 KiB
Diff
49 lines
1.8 KiB
Diff
From 9024d0c1bbbb323ae30b3b025705b076094e2c6c Mon Sep 17 00:00:00 2001
|
|
From: Andrew Vaughan <ajv-lists@netspace.net.au>
|
|
Date: Fri, 12 Oct 2012 15:00:30 +0200
|
|
Subject: [PATCH 04/10] Large file support for >2GB files (bts447601)
|
|
|
|
---
|
|
Makefile | 2 +-
|
|
fdupes.c | 4 ++--
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 0c968a8..4d50924 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -74,7 +74,7 @@ MKDIR = mkdir -p
|
|
CC = gcc
|
|
COMPILER_OPTIONS = -Wall -O -g
|
|
|
|
-CFLAGS= $(COMPILER_OPTIONS) -I. -DVERSION=\"$(VERSION)\" $(EXTERNAL_MD5) $(EXPERIMENTAL_RBTREE) $(OMIT_GETOPT_LONG)
|
|
+CFLAGS= $(COMPILER_OPTIONS) -I. -D_FILE_OFFSET_BITS=64 -DVERSION=\"$(VERSION)\" $(EXTERNAL_MD5) $(EXPERIMENTAL_RBTREE) $(OMIT_GETOPT_LONG)
|
|
|
|
INSTALL_PROGRAM = $(INSTALL) -c -m 0755
|
|
INSTALL_DATA = $(INSTALL) -c -m 0644
|
|
diff --git a/fdupes.c b/fdupes.c
|
|
index f16e4e0..4ecf51b 100644
|
|
--- a/fdupes.c
|
|
+++ b/fdupes.c
|
|
@@ -648,7 +648,7 @@ void printmatches(file_t *files)
|
|
while (files != NULL) {
|
|
if (files->hasdupes) {
|
|
if (!ISFLAG(flags, F_OMITFIRST)) {
|
|
- if (ISFLAG(flags, F_SHOWSIZE)) printf("%ld byte%seach:\n", files->size,
|
|
+ if (ISFLAG(flags, F_SHOWSIZE)) printf("%lld byte%seach:\n", files->size,
|
|
(files->size != 1) ? "s " : " ");
|
|
if (ISFLAG(flags, F_DSAMELINE)) escapefilename("\\ ", &files->d_name);
|
|
printf("%s%c", files->d_name, ISFLAG(flags, F_DSAMELINE)?' ':'\n');
|
|
@@ -801,7 +801,7 @@ void deletefiles(file_t *files, int prompt)
|
|
do {
|
|
printf("Set %d of %d, preserve files [1 - %d, all]",
|
|
curgroup, groups, counter);
|
|
- if (ISFLAG(flags, F_SHOWSIZE)) printf(" (%ld byte%seach)", files->size,
|
|
+ if (ISFLAG(flags, F_SHOWSIZE)) printf(" (%lld byte%seach)", files->size,
|
|
(files->size != 1) ? "s " : " ");
|
|
printf(": ");
|
|
fflush(stdout);
|
|
--
|
|
1.7.11.5
|
|
|