Changeset 169 for trunk/src/sh_hash.c

Timestamp:

Apr 13, 2008, 9:59:55 PM (17 years ago)

Author:

katerina

Message:

Fixes for tickes #93 to #104 (yes, big commit, bad, bad,...).

File:

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

trunk/src/sh_hash.c

@@ -2497 +2497 @@
   sl_strlcat(msg, tmp, SH_BUFSIZE); 
 
-  if (theFile->c_mode[0] == 'l' || theFile->link_path != NULL)
+  if (theFile->c_mode[0] == 'l' || 
+      (theFile->link_path != NULL && theFile->link_path[0] != '-'))
     {
       tmp_lnk     = sh_util_safe_name(theFile->link_path);
@@ -2663 +2664 @@
   sl_strlcat(msg, tmp, SH_BUFSIZE); 
 
-  if (theFile->c_mode[0] == 'l' || theFile->link_path != NULL)
+  if (theFile->c_mode[0] == 'l' || 
+      (theFile->link_path != NULL && theFile->link_path[0] != '-'))
     {
       tmp_lnk     = sh_util_safe_name(theFile->link_path);
@@ -2739 +2741 @@
   char timstr2m[32];
   char linkHash[KEY_LEN+1];
+  char * linkComp;
   int  maxcomp;
 
@@ -2869 +2872 @@
   if (p->theFile.c_mode[0] == 'l') 
     {
-      if (sl_strlen(theFile->link_path) >= MAX_PATH_STORE) 
-        {
-          sl_strlcpy(linkHash, 
-                     sh_tiger_hash(theFile->link_path, 
-                                   TIGER_DATA,
-                                   sl_strlen(theFile->link_path),
-                                   hashbuf, sizeof(hashbuf)), 
-                     MAX_PATH_STORE+1);
-          maxcomp = MAX_PATH_STORE;
-        } 
-      else 
-        {
-          sl_strlcpy(linkHash, theFile->link_path, KEY_LEN + 1);
-          maxcomp = KEY_LEN;
-        }
-      
-
-      if ( sl_strncmp (linkHash, p->linkpath, maxcomp) != 0 &&
-           (theFile->check_mask & MODI_LNK) != 0)
-        {
+      if (!(theFile->link_path) &&
+          (theFile->check_mask & MODI_LNK) != 0)
+        {
+          linkComp = NULL;
           modi_mask |= MODI_LNK;
           change_code[1] = 'L';
           TPT ((0, FIL__, __LINE__, _("mod=<link>")));
-        } 
+        }
+      else
+        {
+          if (sl_strlen(theFile->link_path) >= MAX_PATH_STORE) 
+            {
+              sl_strlcpy(linkHash, 
+                         sh_tiger_hash(theFile->link_path, 
+                                       TIGER_DATA,
+                                       sl_strlen(theFile->link_path),
+                                       hashbuf, sizeof(hashbuf)), 
+                         MAX_PATH_STORE+1);
+              linkComp = linkHash;
+              maxcomp  = KEY_LEN;
+            } 
+          else 
+            {
+              linkComp = theFile->link_path;
+              maxcomp  = MAX_PATH_STORE;
+            }
+          
+          if ( sl_strncmp (linkComp, p->linkpath, maxcomp) != 0 &&
+               (theFile->check_mask & MODI_LNK) != 0)
+            {
+              modi_mask |= MODI_LNK;
+              change_code[1] = 'L';
+              TPT ((0, FIL__, __LINE__, _("mod=<link>")));
+            } 
+        }
     }
 
@@ -3349 +3363 @@
             }
 #endif
-        }
-
-
-      if ((modi_mask & MODI_LNK) != 0 && theFile->c_mode[0] == 'l')
-        {
-          tmp_lnk     = sh_util_safe_name(theFile->link_path);
-          tmp_lnk_old = sh_util_safe_name(p->linkpath);
+          /* FIXME is this correct? */
+          if (theFile->c_mode[0] != 'l' && theFile->link_path &&
+              strlen(theFile->link_path) > 2)
+            modi_mask |= MODI_LNK;
+        }
+
+
+      if ((modi_mask & MODI_LNK) != 0 /* && theFile->c_mode[0] == 'l' */)
+        {
+          if (theFile->link_path)
+            tmp_lnk     = sh_util_safe_name(theFile->link_path);
+          else
+            tmp_lnk     = sh_util_strdup("-");
+          if (p->linkpath)
+            tmp_lnk_old = sh_util_safe_name(p->linkpath);
+          else
+            tmp_lnk_old = sh_util_strdup("-");
 #ifdef SH_USE_XML
           sl_snprintf(tmp, SH_BUFSIZE, _("link_old=\"%s\" link_new=\"%s\" "),
@@ -3599 +3623 @@
 #endif
 
-static int ListFullDetail = S_FALSE;
+static int ListFullDetail    = S_FALSE;
 static int ListWithDelimiter = S_FALSE;
+static char * ListFile       = NULL;
+
+int set_list_file (const char * c)
+{
+  ListFile = sh_util_strdup(c);
+  return 0;
+}
 
 int set_full_detail (const char * c)
@@ -3858 +3889 @@
 }
 
+#ifdef HAVE_LIBZ
+#include <zlib.h>
+#endif    
+
+int sh_hash_printcontent(char * linkpath)
+{
+#ifdef HAVE_LIBZ
+  unsigned char * decoded;
+  unsigned char * decompressed = NULL;
+  size_t dlen;
+  unsigned long clen;
+  unsigned long clen_o;
+  int    res;
+
+  if (linkpath && *linkpath != '-')
+    {
+      dlen = sh_util_base64_dec_alloc (&decoded, 
+                                       (unsigned char *)linkpath, 
+                                       strlen(linkpath));
+      clen = dlen * 2 + 1;
+      do {
+        if (decompressed)
+          SH_FREE(decompressed);
+        clen += dlen; clen_o = clen;
+        decompressed = SH_ALLOC(clen);
+        res = uncompress(decompressed, &clen, decoded, dlen);
+        if (res == Z_MEM_ERROR)
+          { fprintf(stderr, _("Error: Not enough memory\n")); return -1; }
+        if (res == Z_DATA_ERROR)
+          { fprintf(stderr, _("Error: Data corrupt or incomplete\n")); return -1; }
+      } while (res == Z_BUF_ERROR || clen == clen_o);
+      decompressed[clen] = '\0';
+      fputs( (char*) decompressed, stdout);
+      return 0;
+    }
+#else
+  (void) linkpath;
+#endif
+  fprintf(stderr, _("Error: No data available\n")); 
+  return -1;
+}
+
 int sh_hash_list_db (const char * db_file)
 {
@@ -3863 +3936 @@
   SL_TICKET fd;
   char * line;
+  int  flag = 0;
 
   if (!db_file)
@@ -3900 +3974 @@
     {
       p = sh_hash_getdataent (fd, line, MAX_PATH_STORE);
-      if ((p != NULL) && (p->fullpath[0] != 'K'))
-        {
-          if (ListFullDetail == S_FALSE)
-            sh_hash_list_db_entry (p); 
+      if ((p != NULL) && (p->fullpath[0] == '/'))
+        {
+          if (!ListFile)
+            {
+              flag = 1;
+              if (ListFullDetail == S_FALSE)
+                sh_hash_list_db_entry (p); 
+              else
+                sh_hash_list_db_entry_full_detail (p);
+            }
           else
-            sh_hash_list_db_entry_full_detail (p); 
+            {
+              if (0 != sl_strcmp(ListFile, p->fullpath))
+                {
+                  continue;
+                }
+              flag = 1;
+              if ('l' != p->theFile.c_mode[0])
+                {
+                  if (sh_hash_printcontent(p->linkpath) < 0)
+                    {
+                      _exit(EXIT_FAILURE);
+                      return -1;
+                    }
+                }
+              else
+                {
+                  fprintf(stderr, _("File is a link\n"));
+                  _exit(EXIT_FAILURE);
+                  return -1;
+                }
+              break;
+            }
         }
       else if (p == NULL)
@@ -3919 +4020 @@
   fflush(NULL);
 
+  if (flag == 0)
+    {
+      fprintf(stderr, _("No file found\n"));
+      _exit(EXIT_FAILURE);
+    }
   _exit(EXIT_SUCCESS);
   return 0;