Changeset 93 for trunk/src/sh_hash.c

Timestamp:

Feb 26, 2007, 10:48:51 PM (18 years ago)

Author:

rainer

Message:

Add check for PCI ROMs; fix ticket #51 (symlinks in root directory reported with leading double slash).

File:

• trunk/src/sh_hash.c (modified) (5 diffs)

trunk/src/sh_hash.c

@@ -1926 +1926 @@
  ******************************************************************/
 
-static char * sh_hash_charhex( unsigned char i )
-{
-  static char i2h[2];
-  int j, k;
-
-  j = i / 16;
-  k = i - (j*16);
-
-  if (j < 10) i2h[0] = '0'+j;
-  else        i2h[0] = 'A'+(j-10);
-  
-  if (k < 10) i2h[1] = '0'+k;
-  else        i2h[1] = 'A'+(k-10);
-
-  return i2h;
-}
-
 void sh_hash_push2db (char * key, unsigned long val1, 
                       unsigned long val2, unsigned long val3,
@@ -1975 +1958 @@
       for (i = 0; i < size; ++i)
         {
-          p = sh_hash_charhex (str[i]);
+          p = sh_util_charhex (str[i]);
           tmpFile.linkpath[2*i]   = p[0];
           tmpFile.linkpath[2*i+1] = p[1];
@@ -1983 +1966 @@
   else
     {
-      tmpFile.c_mode[0] = '-';  
-      tmpFile.c_mode[1] = '-'; tmpFile.c_mode[2]  = '-';
-      tmpFile.c_mode[3] = '-'; tmpFile.c_mode[4]  = '-'; 
-      tmpFile.c_mode[5] = '-'; tmpFile.c_mode[6]  = '-'; 
-      tmpFile.c_mode[7] = '-'; tmpFile.c_mode[8]  = '-'; 
-      tmpFile.c_mode[9] = '-'; tmpFile.c_mode[10] = '\0'; 
-      tmpFile.linkpath[0] = '-'; tmpFile.linkpath[1] = '\0';
+      for (i = 0; i < 10; ++i) 
+        tmpFile.c_mode[i] = '-';
+      tmpFile.c_mode[10] = '\0'; 
+      tmpFile.linkpath[0] = '-'; 
+      tmpFile.linkpath[1] = '\0';
     }
 
   if (sh.flag.checkSum == SH_CHECK_CHECK && 
       sh.flag.update == S_TRUE)
-    sh_hash_pushdata_memory (&tmpFile, 
-                             _("000000000000000000000000000000000000000000000000"));
-  else
-    sh_hash_pushdata (&tmpFile, 
-                      _("000000000000000000000000000000000000000000000000"));
+    sh_hash_pushdata_memory (&tmpFile, SH_KEY_NULL);
+  else
+    sh_hash_pushdata (&tmpFile, SH_KEY_NULL);
 
   return;
@@ -2018 +1997 @@
   if (0 == sh_hash_get_it (key, &tmpFile))
     {
-      *val1  = tmpFile.size;
+      *val1 = tmpFile.size;
       *val2 = tmpFile.mtime;
       *val3 = tmpFile.ctime;
@@ -2701 +2680 @@
           maxcomp = KEY_LEN;
         }
-
-    if ( sl_strncmp (linkHash, p->linkpath, maxcomp) != 0 &&
-         (theFile->check_mask & MODI_LNK) != 0)
-      {
-        modi_mask |= MODI_LNK;
-        change_code[1] = 'L';
-        TPT ((0, FIL__, __LINE__, _("mod=<link>")));
-      } 
+      
+
+      if ( sl_strncmp (linkHash, p->linkpath, maxcomp) != 0 &&
+           (theFile->check_mask & MODI_LNK) != 0)
+        {
+          modi_mask |= MODI_LNK;
+          change_code[1] = 'L';
+          TPT ((0, FIL__, __LINE__, _("mod=<link>")));
+        } 
     }