Hi

Attached is a patch that enables LFS and fixes the --size option.

I'm not sure that the --size fix is correct.  I haven't touched C since uni 
(10+ years), and even that was mainly c++.  This patch works for me on 
i386, but I don't have access to any 64 bit systems.  

Tested on files to 19GB.  

Thanks for your work in Debian.

Andrew V.
diff -u fdupes-1.40/fdupes.c fdupes-1.40/fdupes.c
--- fdupes-1.40/fdupes.c
+++ fdupes-1.40/fdupes.c
@@ -592,7 +592,7 @@
   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');
@@ -680,7 +680,7 @@
       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);
diff -u fdupes-1.40/debian/changelog fdupes-1.40/debian/changelog
--- fdupes-1.40/debian/changelog
+++ fdupes-1.40/debian/changelog
@@ -1,3 +1,10 @@
+fdupes (1.40-4.0av1) unstable; urgency=low
+
+  * Add -D_FILE_OFFSET_BITS=64 to compile options
+  * Attempt to patch --size option.
+
+ -- Andrew Vaughan <[EMAIL PROTECTED]>  Tue, 23 Oct 2007 13:13:10 +1000
+
 fdupes (1.40-4) unstable; urgency=low
 
   * applied Peter Harvey's speed up (sped that up too!) (closes: #213385)
only in patch2:
unchanged:
--- fdupes-1.40.orig/Makefile
+++ fdupes-1.40/Makefile
@@ -35,7 +35,7 @@
 #####################################################################
 
 fdupes: fdupes.c md5/md5.c	
-	gcc fdupes.c md5/md5.c -Wall -o fdupes -DVERSION=\"$(VERSION)\" $(EXTERNAL_MD5) $(EXPERIMENTAL_RBTREE)
+	gcc fdupes.c md5/md5.c -Wall -o fdupes -D_FILE_OFFSET_BITS=64 -DVERSION=\"$(VERSION)\" $(EXTERNAL_MD5) $(EXPERIMENTAL_RBTREE)
 
 install: fdupes
 	cp fdupes $(INSTALLDIR)

Reply via email to