Changeset 107 for trunk/src

Timestamp:

Jun 16, 2007, 3:29:39 PM (17 years ago)

Author:

rainer

Message:

Fix incorrect handling of files with zero size in GrowingLogFiles.

Location:

trunk/src

Files:

• cutest_sh_tiger0.c (modified) (11 diffs)
• sh_hash.c (modified) (1 diff)
• sh_prelink.c (modified) (1 diff)
• sh_tiger0.c (modified) (3 diffs)
• sh_unix.c (modified) (3 diffs)

trunk/src/cutest_sh_tiger0.c

@@ -139 +139 @@
   /* same result as GnuPG 1.0.6 (gpg --load-extension tiger --print-md TIGER192) 
    */
-  actual = sh_tiger_generic_hash("cutest_foo", TIGER_FILE, 0, 0);
+  actual = sh_tiger_generic_hash("cutest_foo", TIGER_FILE, TIGER_NOLIM, 0);
   expected = "0E9321614C966A33608C2A15F156E0435CACFD1213B9F095";
   CuAssertStrEquals(tc, expected, actual);
@@ -147 +147 @@
   tiger_fd  = rval_open;
 
-  actual = sh_tiger_generic_hash("cutest_foo", TIGER_FD, 0, 0);
+  actual = sh_tiger_generic_hash("cutest_foo", TIGER_FD, TIGER_NOLIM, 0);
   expected = "0E9321614C966A33608C2A15F156E0435CACFD1213B9F095";
   CuAssertStrEquals(tc, expected, actual);
@@ -163 +163 @@
   /* same result as GNU md5sum 
    */
-  actual = sh_tiger_generic_hash("cutest_foo", TIGER_FD, 0, 0);
+  actual = sh_tiger_generic_hash("cutest_foo", TIGER_FD, TIGER_NOLIM, 0);
   expected = "AEEC4DDA496BCFBA691F4E8863BA84C00000000000000000";
   CuAssertStrEquals(tc, expected, actual);
@@ -179 +179 @@
   /* same result as gpg --print-md SHA1 
    */
-  actual = sh_tiger_generic_hash("cutest_foo", TIGER_FD, 0, 0);
+  actual = sh_tiger_generic_hash("cutest_foo", TIGER_FD, TIGER_NOLIM, 0);
   expected = "2FE65D1D995B8F8BC8B13F798C07E7E935A787ED00000000";
   CuAssertStrEquals(tc, expected, actual);
@@ -205 +205 @@
   /* same result as GnuPG 1.0.6 (gpg --load-extension tiger --print-md TIGER192) 
    */
-  actual = sh_tiger_generic_hash("cutest_foo", TIGER_FILE, 0, 0);
+  actual = sh_tiger_generic_hash("cutest_foo", TIGER_FILE, TIGER_NOLIM, 0);
   expected = "F987845A0EA784367BF9E4DB09014995810F27C99C891734";
   CuAssertStrEquals(tc, expected, actual);
@@ -228 +228 @@
   /* same result as GnuPG 1.0.6 (gpg --load-extension tiger --print-md TIGER192) 
    */
-  actual = sh_tiger_generic_hash("cutest_foo", TIGER_FILE, 0, 0);
+  actual = sh_tiger_generic_hash("cutest_foo", TIGER_FILE, TIGER_NOLIM, 0);
   expected = "75B98A7AE257A230189828A40792E30B4038D286479CC7B8";
   CuAssertStrEquals(tc, expected, actual);
@@ -268 +268 @@
   /* same as GnuPG 1.0.6 (gpg --load-extension tiger --print-md TIGER192) 
    */
+  actual = sh_tiger_generic_hash("cutest_foo", TIGER_FILE, 0, 0);
+  expected = "24F0130C63AC933216166E76B1BB925FF373DE2D49584E7A";
+  CuAssertStrEquals(tc, expected, actual);
+
   actual = sh_tiger_generic_hash("cutest_foo", TIGER_FILE, testlen, 0);
   expected = "75B98A7AE257A230189828A40792E30B4038D286479CC7B8";
@@ -276 +280 @@
   CuAssertStrEquals(tc, expected, actual);
 
-  actual = sh_tiger_generic_hash("cutest_foo", TIGER_FILE, 0, 0);
+  actual = sh_tiger_generic_hash("cutest_foo", TIGER_FILE, TIGER_NOLIM, 0);
   expected = "B5B4FB97B01ADB58794D87A6A01B2368852FA764BD93AB90";
   CuAssertStrEquals(tc, expected, actual);
@@ -299 +303 @@
   CuAssertStrEquals(tc, expected, actual);
 
-  actual = sh_tiger_generic_hash("cutest_foo", TIGER_FILE, 0, 0);
+  actual = sh_tiger_generic_hash("cutest_foo", TIGER_FILE, TIGER_NOLIM, 0);
   expected = "D0EE1A9956CAB22D84B51A5E0C093B724828C6A1F9CBDB7F";
   CuAssertStrEquals(tc, expected, actual);
@@ -337 +341 @@
   CuAssertTrue(tc, rval_open >= 0);
 
-  actual = sh_tiger_generic_hash("cutest_foo", TIGER_FD, 0, 0);
+  actual = sh_tiger_generic_hash("cutest_foo", TIGER_FD, TIGER_NOLIM, 0);
   expected = "00A1F1C5EDDCCFC430D3862FDA94593E0000000000000000";
   CuAssertStrEquals(tc, expected, actual);
@@ -371 +375 @@
   CuAssertTrue(tc, rval_open >= 0);
 
-  actual = sh_tiger_generic_hash("cutest_foo", TIGER_FD, 0, 0);
+  actual = sh_tiger_generic_hash("cutest_foo", TIGER_FD, TIGER_NOLIM, 0);
   expected = "FAA937EF3389C7E786EB0F1006D049D7AEA7B7B600000000";
   CuAssertStrEquals(tc, expected, actual);

trunk/src/sh_hash.c

@@ -3143 +3143 @@
 #ifdef REPLACE_OLD
           if (sh.flag.reportonce == S_TRUE && sh.flag.update == S_FALSE)
-            sl_strlcpy(p->theFile.checksum, fileHash, KEY_LEN+1);
+            {
+              sl_strlcpy(p->theFile.checksum, fileHash, KEY_LEN+1);
+              if ((theFile->check_mask & MODI_SGROW) != 0)            
+                p->theFile.size  = theFile->size;
+            }
 #endif
         }

trunk/src/sh_prelink.c

@@ -259 +259 @@
 
   sl_strlcpy(file_hash,
-             sh_tiger_generic_hash (path, TIGER_FD, 0, alert_timeout),
+             sh_tiger_generic_hash (path, TIGER_FD, TIGER_NOLIM, alert_timeout),
              KEY_LEN+1);
 

trunk/src/sh_tiger0.c

@@ -236 +236 @@
           }
 
-        if (Length > 0)
+        if (Length != TIGER_NOLIM)
           {
             bcount += count;
@@ -879 +879 @@
         }
 
-      if (Length > 0)
+      if (Length != TIGER_NOLIM)
         {
           bcount += n;
@@ -1402 +1402 @@
         }
 
-      if (Length > 0)
+      if (Length != TIGER_NOLIM)
         {
           bcount += n;

trunk/src/sh_unix.c

@@ -2891 +2891 @@
                  KEY_LEN+1);
       
-      /* return */
+       /* return */
       SL_RETURN( 0, _("sh_unix_checksum_size"));
     }
@@ -3226 +3226 @@
               sl_strlcpy(fileHash,
                          sh_tiger_generic_hash (theFile->fullpath, 
-                                                TIGER_FD, 0, 
+                                                TIGER_FD, TIGER_NOLIM, 
                                                 alert_timeout),
                          KEY_LEN+1);
@@ -3265 +3265 @@
               tiger_fd = rval_open;
               sl_strlcpy(fileHash, 
-                         sh_tiger_generic_hash (theFile->fullpath, TIGER_FD, 0,
+                         sh_tiger_generic_hash (theFile->fullpath, TIGER_FD, TIGER_NOLIM,
                                                 alert_timeout),
                          KEY_LEN + 1);