[gentoo-commits] gentoo-x86 commit in app-misc/fdupes/files: fdupes-1.50_pre2-lfs.patch fdupes-1.50_pre2-typo.patch fdupes-1.50_pre2-compare-file.patch fdupes-1.40-memcpy.patch fdupes-1.40-external-md5sum-quotation.patch fdupes-1.40-external-md5sum-quotation-1.patch

[Justin Lecher (jlec)]

jlec        12/07/06 07:28:38

  Added:                fdupes-1.50_pre2-lfs.patch
                        fdupes-1.50_pre2-typo.patch
                        fdupes-1.50_pre2-compare-file.patch
  Removed:              fdupes-1.40-memcpy.patch
                        fdupes-1.40-external-md5sum-quotation.patch
                        fdupes-1.40-external-md5sum-quotation-1.patch
  Log:
  app-misc/fdupes: Import some fixes from fedora
  
  (Portage version: 2.2.0_alpha116/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-misc/fdupes/files/fdupes-1.50_pre2-lfs.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/fdupes/files/fdupes-1.50_pre2-lfs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/fdupes/files/fdupes-1.50_pre2-lfs.patch?rev=1.1&content-type=text/plain

Index: fdupes-1.50_pre2-lfs.patch
===================================================================
diff -urNp fdupes-1.50-PR2.orig/fdupes.c fdupes-1.50-PR2/fdupes.c
--- fdupes-1.50-PR2.orig/fdupes.c	2009-01-31 20:11:49.577968848 +0530
+++ fdupes-1.50-PR2/fdupes.c	2009-01-31 20:29:17.103220311 +0530
@@ -643,7 +643,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');
@@ -796,7 +796,7 @@ void deletefiles(file_t *files, int prom
       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.1                  app-misc/fdupes/files/fdupes-1.50_pre2-typo.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/fdupes/files/fdupes-1.50_pre2-typo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/fdupes/files/fdupes-1.50_pre2-typo.patch?rev=1.1&content-type=text/plain

Index: fdupes-1.50_pre2-typo.patch
===================================================================
diff -urNp fdupes-1.50-PR2.orig/fdupes.1 fdupes-1.50-PR2/fdupes.1
--- fdupes-1.50-PR2.orig/fdupes.1	2009-01-31 20:11:49.581967819 +0530
+++ fdupes-1.50-PR2/fdupes.1	2009-01-31 20:32:46.383969471 +0530
@@ -84,7 +84,7 @@ If fdupes returns with an error message 
 .B fdupes: error invoking md5sum
 it means the program has been compiled to use an external
 program to calculate MD5 signatures (otherwise, fdupes uses
-interal routines for this purpose), and an error has occurred
+internal routines for this purpose), and an error has occurred
 while attempting to execute it. If this is the case, the 
 specified program should be properly installed prior 
 to running fdupes.



1.1                  app-misc/fdupes/files/fdupes-1.50_pre2-compare-file.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/fdupes/files/fdupes-1.50_pre2-compare-file.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/fdupes/files/fdupes-1.50_pre2-compare-file.patch?rev=1.1&content-type=text/plain

Index: fdupes-1.50_pre2-compare-file.patch
===================================================================
diff -urNp fdupes-1.50-PR2.orig/fdupes.c fdupes-1.50-PR2/fdupes.c
--- fdupes-1.50-PR2.orig/fdupes.c	2009-01-31 20:11:49.577968848 +0530
+++ fdupes-1.50-PR2/fdupes.c	2009-01-31 22:01:11.872219443 +0530
@@ -492,7 +492,10 @@ file_t **checkmatch(filetree_t **root, f
   else {
     if (checktree->file->crcpartial == NULL) {
       crcsignature = getcrcpartialsignature(checktree->file->d_name);
-      if (crcsignature == NULL) return NULL;
+      if (crcsignature == NULL) {
+        errormsg ("cannot read file %s\n", checktree->file->d_name);
+        return NULL;
+      }
 
       checktree->file->crcpartial = (char*) malloc(strlen(crcsignature)+1);
       if (checktree->file->crcpartial == NULL) {
@@ -504,7 +507,10 @@ file_t **checkmatch(filetree_t **root, f
 
     if (file->crcpartial == NULL) {
       crcsignature = getcrcpartialsignature(file->d_name);
-      if (crcsignature == NULL) return NULL;
+      if (crcsignature == NULL) {
+        errormsg ("cannot read file %s\n", file->d_name);
+        return NULL;
+      }
 
       file->crcpartial = (char*) malloc(strlen(crcsignature)+1);
       if (file->crcpartial == NULL) {
@@ -577,8 +583,8 @@ file_t **checkmatch(filetree_t **root, f
 
 int confirmmatch(FILE *file1, FILE *file2)
 {
-  unsigned char c1 = 0;
-  unsigned char c2 = 0;
+  unsigned char c1[CHUNK_SIZE];
+  unsigned char c2[CHUNK_SIZE];
   size_t r1;
   size_t r2;
   
@@ -586,14 +592,13 @@ int confirmmatch(FILE *file1, FILE *file
   fseek(file2, 0, SEEK_SET);
 
   do {
-    r1 = fread(&c1, sizeof(c1), 1, file1);
-    r2 = fread(&c2, sizeof(c2), 1, file2);
+    r1 = fread(c1, 1, sizeof(c1), file1);
+    r2 = fread(c2, 1, sizeof(c2), file2);
 
-    if (c1 != c2) return 0; /* file contents are different */
-  } while (r1 && r2);
+    if (r1 != r2) return 0; /* file lengths are different */
+    if (memcmp (c1, c2, r1)) return 0; /* file contents are different */
+  } while (r2);
   
-  if (r1 != r2) return 0; /* file lengths are different */
-
   return 1;
 }