Changeset 167 for trunk/src/sh_unix.c

Timestamp:

Mar 15, 2008, 12:38:20 PM (17 years ago)

Author:

katerina

Message:

First parts of changes for MODI_TXT

File:

• trunk/src/sh_unix.c (modified) (9 diffs)

trunk/src/sh_unix.c

@@ -3062 +3062 @@
       
        /* return */
+      if (tmpFile.link_path)   SH_FREE(tmpFile.link_path);
       SL_RETURN( 0, _("sh_unix_checksum_size"));
     }
 
  out:
+  if (tmpFile.link_path)   SH_FREE(tmpFile.link_path);
   sl_strlcpy(fileHash, SH_KEY_NULL, KEY_LEN+1);
   SL_RETURN( -1, _("sh_unix_checksum_size"));
@@ -3279 +3281 @@
   int           fd;
   int           fstat_return;
-
+  sh_string   * content = NULL;
+      
   time_t        tend;
   time_t        tstart;
@@ -3302 +3305 @@
   fstat_return = -1;
   rval_open    = -1;
+
+  theFile->link_path = NULL;
 
   if (stat_return == 0 && S_ISREG(buf.st_mode)) 
@@ -3396 +3401 @@
               char hashbuf[KEYBUF_SIZE];
               UINT64 length_nolim = TIGER_NOLIM;
+
+              if ((theFile->check_mask & MODI_TXT) != 0 && fbuf.st_size < SH_TXT_MAX)
+                {
+                  sl_init_content (rval_open, fbuf.st_size);
+                }
+
               sl_strlcpy(fileHash,
                          sh_tiger_generic_hash (theFile->fullpath, 
@@ -3402 +3413 @@
                                                 hashbuf, sizeof(hashbuf)),
                          KEY_LEN+1);
+
+              content = sl_get_content(rval_open);
+
               if ((theFile->check_mask & MODI_SGROW) != 0)
                 {
@@ -3439 +3453 @@
               char hashbuf[KEYBUF_SIZE];
               UINT64 length_nolim = TIGER_NOLIM;
+
+              if ((theFile->check_mask & MODI_TXT) != 0 && fbuf.st_size < SH_TXT_MAX)
+                {
+                  sl_init_content (rval_open, fbuf.st_size);
+                }
+
               sl_strlcpy(fileHash, 
                          sh_tiger_generic_hash (theFile->fullpath, rval_open, 
@@ -3445 +3465 @@
                                                 hashbuf, sizeof(hashbuf)),
                          KEY_LEN + 1);
+
+              content = sl_get_content(rval_open);
+
               if ((theFile->check_mask & MODI_SGROW) != 0) 
                 {
@@ -3617 +3640 @@
   if (theFile->c_mode[0] == 'l') 
     {
-
       linknamebuf = SH_ALLOC(PATH_MAX);
 
@@ -3637 +3659 @@
           SH_FREE(tmp2);
           SH_FREE(linknamebuf);
-          theFile->linkpath[0] = '-';
-          theFile->linkpath[1] = '\0';
+          theFile->link_path = sh_util_strdup("-");
           SL_RETURN((-1),_("sh_unix_getinfo"));
         }
 
-    if (linknamebuf[0] == '/') 
-      {
-        sl_strlcpy (theFile->linkpath, linknamebuf, PATH_MAX);
-      } 
-    else 
-      {
-        tmp = sh_util_dirname(theFile->fullpath);
-        if (tmp) {
-          sl_strlcpy (theFile->linkpath, tmp, PATH_MAX);
+      if (linknamebuf[0] == '/') 
+        {
+          theFile->link_path = sh_util_strdup (linknamebuf);
+        } 
+      else 
+        {
+          tmp = sh_util_dirname(theFile->fullpath);
+          if (tmp) {
+            theFile->link_path = SH_ALLOC(PATH_MAX);
+            sl_strlcpy (theFile->link_path, tmp, PATH_MAX);
+            SH_FREE(tmp);
+          } else {
+            theFile->link_path = SH_ALLOC(PATH_MAX);
+            theFile->link_path[0] = '\0';
+          }
+          /*
+           * Only attach '/' if not root directory. Handle "//", which
+           * according to POSIX is implementation-defined, and may be
+           * different from "/" (however, three or more '/' will collapse
+           * to one).
+           */
+          tmp = theFile->link_path; while (*tmp == '/') ++tmp;
+          if (*tmp != '\0')
+            {
+              sl_strlcat (theFile->link_path, "/", PATH_MAX);
+            }
+          sl_strlcat (theFile->link_path, linknamebuf, PATH_MAX);
+        }
+      
+      /* stat the link
+       */
+      stat_return = retry_lstat (FIL__, __LINE__, theFile->link_path, &lbuf); 
+      
+      /* check for error
+       */
+      if (stat_return != 0) 
+        { 
+          stat_return = errno;
+          tmp  = sh_util_safe_name (theFile->fullpath);
+          tmp2 = sh_util_safe_name (theFile->link_path);
+          if (stat_return != ENOENT)
+            { 
+              char errbuf[SH_ERRBUF_SIZE];
+              sh_error_handle (level, FIL__, __LINE__, stat_return, 
+                               MSG_FI_LSTAT,
+                               sh_error_message (stat_return,errbuf, sizeof(errbuf)), 
+                               tmp2);
+            }
+          else 
+            {
+              /* a dangling link -- everybody seems to have plenty of them 
+               */
+              sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_FI_DLNK,
+                               tmp, tmp2);
+            }
+          theFile->linkisok = BAD;
           SH_FREE(tmp);
-        } else {
-          theFile->linkpath[0] = '\0';
-        }
-        /*
-         * Only attach '/' if not root directory. Handle "//", which
-         * according to POSIX is implementation-defined, and may be
-         * different from "/" (however, three or more '/' will collapse
-         * to one).
-         */
-        tmp = theFile->linkpath; while (*tmp == '/') ++tmp;
-        if (*tmp != '\0')
-          {
-            sl_strlcat (theFile->linkpath, "/", PATH_MAX);
-          }
-        sl_strlcat (theFile->linkpath, linknamebuf, PATH_MAX);
-      }
-    
-    /* stat the link
-     */
-    stat_return = retry_lstat (FIL__, __LINE__, theFile->linkpath, &lbuf); 
-
-    /* check for error
-     */
-    if (stat_return != 0) 
-      { 
-        stat_return = errno;
-        tmp  = sh_util_safe_name (theFile->fullpath);
-        tmp2 = sh_util_safe_name (theFile->linkpath);
-        if (stat_return != ENOENT)
-          { 
-            char errbuf[SH_ERRBUF_SIZE];
-            sh_error_handle (level, FIL__, __LINE__, stat_return, 
-                             MSG_FI_LSTAT,
-                             sh_error_message (stat_return,errbuf, sizeof(errbuf)), 
-                             tmp2);
-          }
-        else 
-          {
-            /* a dangling link -- everybody seems to have plenty of them 
-             */
-            sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_FI_DLNK,
-                             tmp, tmp2);
-          }
-        theFile->linkisok = BAD;
-        SH_FREE(tmp);
-        SH_FREE(tmp2);
-        SH_FREE(linknamebuf);
-        /* 
-         * changed Tue Feb 10 16:16:13 CET 2004:
-         *  add dangling symlinks into database
-         * SL_RETURN((-1),_("sh_unix_getinfo")); 
-         */
-        theFile->linkmode = 0;
-        SL_RETURN((0),_("sh_unix_getinfo")); 
-      }
-
-    theFile->linkisok = GOOD;
+          SH_FREE(tmp2);
+          SH_FREE(linknamebuf);
+          /* 
+           * changed Tue Feb 10 16:16:13 CET 2004:
+           *  add dangling symlinks into database
+           * SL_RETURN((-1),_("sh_unix_getinfo")); 
+           */
+          theFile->linkmode = 0;
+          SL_RETURN((0),_("sh_unix_getinfo")); 
+        }
       
-
-    /* --- Determine file type. ---
-     */
-    sh_unix_getinfo_type (&lbuf, &type, theFile->link_c_mode);
-    theFile->type = type;
-  
-    /* --- Determine permissions. ---
-     */
-    sh_unix_getinfo_mode (&lbuf, &mode, theFile->link_c_mode);
-    theFile->linkmode = lbuf.st_mode;
-
-    /* --- Output the link. ---
-     */
-    if (theFile->linkisok == GOOD) 
-      {
-        tmp2 = sh_util_safe_name (linknamebuf);      
-        sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_FI_LLNK,
-                         theFile->link_c_mode, tmp2);
-        SH_FREE(tmp2);
-      }
-    SH_FREE(linknamebuf);
-  }  
+      theFile->linkisok = GOOD;
+      
+      
+      /* --- Determine file type. ---
+       */
+      sh_unix_getinfo_type (&lbuf, &type, theFile->link_c_mode);
+      theFile->type = type;
+      
+      /* --- Determine permissions. ---
+       */
+      sh_unix_getinfo_mode (&lbuf, &mode, theFile->link_c_mode);
+      theFile->linkmode = lbuf.st_mode;
+      
+      /* --- Output the link. ---
+       */
+      if (theFile->linkisok == GOOD) 
+        {
+          tmp2 = sh_util_safe_name (linknamebuf);      
+          sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_FI_LLNK,
+                           theFile->link_c_mode, tmp2);
+          SH_FREE(tmp2);
+        }
+      SH_FREE(linknamebuf);
+    }
+  else /* not a link */
+    {
+      if (content)
+        {
+          sh_util_base64_enc_alloc (&(theFile->link_path), 
+                                    sh_string_str(content), 
+                                    sh_string_len(content));
+        }
+    } 
   SL_RETURN((0),_("sh_unix_getinfo"));
 }