Changeset 169 for trunk/src/sh_unix.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_unix.c (modified) (13 diffs)

trunk/src/sh_unix.c

@@ -43 +43 @@
 #include <fcntl.h>
 #include <unistd.h>
+/* need to undef these, since the #define's may be picked up from
+ * linux/wait.h, and will clash with a typedef in sys/wait.h
+ */
+#undef P_ALL
+#undef P_PID
+#undef P_PGID
 #include <sys/wait.h>
 
@@ -2993 +2999 @@
               someval *= 1000;  /* milliseconds in a second */
               sometime = (unsigned long) someval;
-              /* fprintf(stderr, "FIXME PAUSE %ld\n", sometime); */
               retry_msleep(0, sometime);
             }
@@ -2999 +3004 @@
             {
               sometime = (unsigned long) someval;
-              /* fprintf(stderr, "FIXME PAUSE %ld sec\n", sometime); */
               retry_msleep (sometime, 0);
             }
@@ -3037 +3041 @@
 
   SL_ENTER(_("sh_unix_checksum_size"));
+
+  tmpFile.link_path = NULL;
 
   if (sh.flag.checkSum != SH_CHECK_INIT)
@@ -3256 +3262 @@
 }
 #endif
-    
+
+#ifdef HAVE_LIBZ
+#include <zlib.h>
+#endif    
 
 int sh_unix_getinfo (int level, char * filename, file_type * theFile, 
@@ -3402 +3411 @@
               UINT64 length_nolim = TIGER_NOLIM;
 
-              if ((theFile->check_mask & MODI_TXT) != 0 && fbuf.st_size < SH_TXT_MAX)
+              if ((theFile->check_mask & MODI_TXT) != 0 && fbuf.st_size < (10 * SH_TXT_MAX))
                 {
                   sl_init_content (rval_open, fbuf.st_size);
@@ -3415 +3424 @@
 
               content = sl_get_content(rval_open);
+              content = sh_string_copy(content);
 
               if ((theFile->check_mask & MODI_SGROW) != 0)
@@ -3454 +3464 @@
               UINT64 length_nolim = TIGER_NOLIM;
 
-              if ((theFile->check_mask & MODI_TXT) != 0 && fbuf.st_size < SH_TXT_MAX)
+              if ((theFile->check_mask & MODI_TXT) != 0 && fbuf.st_size < (10 * SH_TXT_MAX))
                 {
                   sl_init_content (rval_open, fbuf.st_size);
@@ -3467 +3477 @@
 
               content = sl_get_content(rval_open);
+              content = sh_string_copy(content);
 
               if ((theFile->check_mask & MODI_SGROW) != 0) 
@@ -3759 +3770 @@
       if (content)
         {
-          sh_util_base64_enc_alloc (&(theFile->link_path), 
-                                    sh_string_str(content), 
-                                    sh_string_len(content));
+#ifdef HAVE_LIBZ
+          unsigned long   clen = compressBound(sh_string_len(content));
+          unsigned char * compressed = SH_ALLOC(clen);
+          if (Z_OK == compress(compressed, &clen, 
+                               (unsigned char *) sh_string_str(content), 
+                               sh_string_len(content)))
+              {
+                if (clen < SH_TXT_MAX)
+                  {
+                    sh_util_base64_enc_alloc (&(theFile->link_path), 
+                                              (char *) compressed, clen);
+                  }
+                else
+                  {
+                    char tmsg[128];
+                    char * tpath = sh_util_safe_name (theFile->fullpath);
+                    sl_snprintf(tmsg, sizeof(tmsg), 
+                                _("compressed file too large (%lu bytes)"),
+                                clen);
+                    sh_error_handle (SH_ERR_WARN, FIL__, __LINE__, -1, 
+                                     MSG_E_SUBGPATH, tmsg, 
+                                     _("sh_unix_getinfo"), tpath);
+                    SH_FREE(tpath);
+                  }
+              }
+          SH_FREE(compressed);
+#endif
+          sh_string_destroy(&content);
         }
     } 
@@ -3770 +3806 @@
 #endif
 
-int sh_unix_unlock (char * lockfile, char * flag);
-int sh_unix_lock   (char * lockfile, char * flag);
+int sh_unix_unlock(char * lockfile, char * flag)
+{
+  int         error = 0;
+  
+  SL_ENTER(_("sh_unix_unlock"));
+
+  if (sh.flag.isdaemon == S_FALSE && flag == NULL)
+    SL_RETURN((0),_("sh_unix_unlock"));
+
+  /* --- Logfile is not locked to us. ---
+   */
+  if (sh.flag.islocked == BAD && flag != NULL) 
+    SL_RETURN((-1),_("sh_unix_unlock"));
+
+  /* --- Check whether the directory is secure. ---
+   */
+  if (0 != tf_trust_check (lockfile, SL_YESPRIV))
+    SL_RETURN((-1),_("sh_unix_unlock"));
+
+  /* --- Delete the lock file. --- 
+   */
+  error = retry_aud_unlink (FIL__, __LINE__, lockfile);
+  
+  if (error == 0)
+    {
+      if (flag != NULL)
+        sh.flag.islocked = BAD; /* not locked anymore */
+    }
+  else if (flag != NULL)
+    {
+      char errbuf[SH_ERRBUF_SIZE];
+      error = errno;
+      sh_error_handle ((-1), FIL__, __LINE__, error, MSG_E_UNLNK,
+                       sh_error_message(error, errbuf, sizeof(errbuf)), 
+                       lockfile);
+      SL_RETURN((-1),_("sh_unix_unlock"));
+    }
+  SL_RETURN((0),_("sh_unix_unlock"));
+}
+
+int sh_unix_lock (char * lockfile, char * flag)
+{
+  int filed;
+  int errnum;
+  char myPid[64];
+  SL_TICKET  fd;
+  extern int get_the_fd (SL_TICKET ticket);
+
+  SL_ENTER(_("sh_unix_lock"));
+
+  sprintf (myPid, "%ld\n", (long) sh.pid);             /* known to fit  */
+
+  fd = sl_open_safe_rdwr (lockfile, SL_YESPRIV);       /* fails if file exists */
+
+  if (!SL_ISERROR(fd))
+    {
+      errnum = sl_write (fd, myPid, sl_strlen(myPid));
+      filed = get_the_fd(fd);
+      fchmod (filed, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
+      sl_close (fd);
+
+      if (!SL_ISERROR(errnum))
+        {
+          if (flag != NULL)
+            sh.flag.islocked = GOOD;
+          SL_RETURN((0),_("sh_unix_lock"));
+        }
+    }
+
+  TPT((0, FIL__, __LINE__, _("msg=<open pid file failed>\n")));
+  if (flag != NULL)
+    sh.flag.islocked       = BAD;
+  SL_RETURN((-1),_("sh_unix_lock"));
+
+  /* notreached */
+}
+
 
 /* check whether file is locked
@@ -3964 +4075 @@
 }
 
-int sh_unix_unlock(char * lockfile, char * flag)
-{
-  int         error = 0;
-  
-  SL_ENTER(_("sh_unix_unlock"));
-
-  /* --- Logfile is not locked to us. ---
-   */
-  if (sh.flag.islocked == BAD && flag != NULL) 
-    SL_RETURN((-1),_("sh_unix_unlock"));
-
-  /* --- Check whether the directory is secure. ---
-   */
-  if (0 != tf_trust_check (lockfile, SL_YESPRIV))
-    SL_RETURN((-1),_("sh_unix_unlock"));
-
-  /* --- Delete the lock file. --- 
-   */
-  error = retry_aud_unlink (FIL__, __LINE__, lockfile);
-  
-  if (error == 0)
-    {
-      if (flag != NULL)
-        sh.flag.islocked = BAD; /* not locked anymore */
-    }
-  else if (flag != NULL)
-    {
-      char errbuf[SH_ERRBUF_SIZE];
-      error = errno;
-      sh_error_handle ((-1), FIL__, __LINE__, error, MSG_E_UNLNK,
-                       sh_error_message(error, errbuf, sizeof(errbuf)), 
-                       lockfile);
-      SL_RETURN((-1),_("sh_unix_unlock"));
-    }
-  SL_RETURN((0),_("sh_unix_unlock"));
-}
-
 /* rm lock for filename
  */
@@ -4029 +4103 @@
 {
   return sh_unix_unlock(sh.srvlog.alt, NULL);
-}
-
-int sh_unix_lock (char * lockfile, char * flag)
-{
-  int filed;
-  int errnum;
-  char myPid[64];
-  SL_TICKET  fd;
-  extern int get_the_fd (SL_TICKET ticket);
-
-  SL_ENTER(_("sh_unix_lock"));
-
-  sprintf (myPid, "%ld\n", (long) sh.pid);             /* known to fit  */
-
-  fd = sl_open_safe_rdwr (lockfile, SL_YESPRIV);       /* fails if file exists */
-
-  if (!SL_ISERROR(fd))
-    {
-      errnum = sl_write (fd, myPid, sl_strlen(myPid));
-      filed = get_the_fd(fd);
-      fchmod (filed, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
-      sl_close (fd);
-
-      if (!SL_ISERROR(errnum))
-        {
-          if (flag != NULL)
-            sh.flag.islocked = GOOD;
-          SL_RETURN((0),_("sh_unix_lock"));
-        }
-    }
-
-  TPT((0, FIL__, __LINE__, _("msg=<open pid file failed>\n")));
-  if (flag != NULL)
-    sh.flag.islocked       = BAD;
-  SL_RETURN((-1),_("sh_unix_lock"));
-
-  /* notreached */
 }