Changeset 481 for trunk/src/sh_unix.c

Timestamp:

Jul 18, 2015, 5:06:52 PM (6 years ago)

Author:

katerina

Message:

Enhancements and fixes for tickets #374, #375, #376, #377, #378, and #379.

File:

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

trunk/src/sh_unix.c

@@ -103 +103 @@
 #include "sh_prelink.h"
 #include "sh_pthread.h"
+#include "sh_sem.h"
 
 /* moved here from far below
@@ -482 +483 @@
   sl_strlcat(msg, details, 128);
   (void) safe_logger (thesignal, method, msg);
+
+  close_ipc ();
   raise(SIGKILL);
 }
@@ -526 +529 @@
           } while (val_return < 0 && errno == EINTR);
 
+          close_ipc ();
           safe_logger (mysignal, 0, NULL);
         }
@@ -594 +598 @@
       if (skey != NULL)
         memset (skey, '\0', sizeof(sh_key_t));
-#ifdef WITH_MESSAGE_QUEUE
       close_ipc ();
-#endif
       safe_logger (mysignal, 0, NULL);
       do {
@@ -636 +638 @@
   if (skey != NULL)
     memset (skey, '\0', sizeof(sh_key_t));
-#ifdef WITH_MESSAGE_QUEUE
   close_ipc ();
-#endif
 
   do {
@@ -669 +669 @@
 #endif
 #ifdef SIGTTOU
-  if (mysignal == SIGTTOU)
-    sig_force_check = 1;
+  if (mysignal == SIGTTOU) {
+    sig_force_check = 1; sh_sem_trylock(); }
 #endif
 #ifdef SIGTTIN
@@ -682 +682 @@
 #ifdef SIGQUIT
   if (mysignal == SIGQUIT)
-    {
-      sig_terminate       = 1;
-      ++sig_urgent;
-    }
+    sig_terminate       = 1;
 #endif
 #ifdef SIGTERM
@@ -1042 +1039 @@
       if ((status == ERANGE) && (w == NULL)) 
         {
-          if (SL_TRUE ==  sl_ok_adds( gbufsize, SH_GRBUF_SIZE ))
+          if (S_TRUE ==  sl_ok_adds( gbufsize, SH_GRBUF_SIZE ))
             {
               SH_FREE(buffer);
@@ -1722 +1719 @@
   struct utsname   buf;
   int              i;
-  int              ddot;
+  unsigned int     ddot;
   int              len;
   char           * p;
@@ -1892 +1889 @@
    */
 #if defined(HAVE_MLOCK) && !defined(HAVE_BROKEN_MLOCK)
-  if (skey->mlock_failed == SL_FALSE)
+  if (skey->mlock_failed == S_FALSE)
     {
       if ( (-1) == sh_unix_mlock( FIL__, __LINE__, 
@@ -1898 +1895 @@
         {
           SH_MUTEX_LOCK_UNSAFE(mutex_skey);
-          skey->mlock_failed = SL_TRUE;
+          skey->mlock_failed = S_TRUE;
           SH_MUTEX_UNLOCK_UNSAFE(mutex_skey);
         }
     }
 #else
-  if (skey->mlock_failed == SL_FALSE)
+  if (skey->mlock_failed == S_FALSE)
     {
       SH_MUTEX_LOCK_UNSAFE(mutex_skey);
-      skey->mlock_failed = SL_TRUE;
+      skey->mlock_failed = S_TRUE;
       SH_MUTEX_UNLOCK_UNSAFE(mutex_skey);
     }
@@ -1980 +1977 @@
 
   if (dummy == NULL)
-    sh.flag.isdaemon = ON;
+    sh.flag.isdaemon = S_TRUE;
   else 
     res = sh_util_flagval (dummy, &sh.flag.isdaemon);
@@ -2003 +2000 @@
 
   if (dummy == NULL)
-    sh.flag.isdaemon = OFF;
+    sh.flag.isdaemon = S_FALSE;
   else 
     res = sh_util_flagval (dummy, &sh.flag.isdaemon);
@@ -2221 +2218 @@
     char * tz = sh_util_strdup(getenv("TZ")); /* flawfinder: ignore */
     size_t tzlen = strlen(tz);
-    if (SL_TRUE == sl_ok_adds (4, tzlen)) {
+    if (S_TRUE == sl_ok_adds (4, tzlen)) {
         env[3] = SH_ALLOC(4+tzlen);
         sl_strlcpy(env[3], "TZ=", 4);
@@ -2244 +2241 @@
       memset(skey, 0, sizeof(sh_key_t));
       (void) umask(S_IRGRP|S_IWGRP|S_IXGRP|S_IROTH|S_IWOTH|S_IXOTH);
-      sh_unix_closeall (3, -1, SL_TRUE); /* in child process */
+      sh_unix_closeall (3, -1, S_TRUE); /* in child process */
       execve(path, arg, env);
       _exit(EXIT_FAILURE);
@@ -2284 +2281 @@
   struct tm   bb;
 
+  struct tm * aptr;
+  struct tm * bptr;
+
   int  sign =  0;
   int  diff =  0;
@@ -2292 +2292 @@
 
 #if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GMTIME_R)
-  gmtime_r (xx, &aa);
+  aptr = gmtime_r (xx, &aa);
 #else
-  memcpy (&aa, gmtime(xx), sizeof(struct tm));
+  aptr = gmtime(xx);
+  if (aptr)
+    memcpy (&aa, aptr, sizeof(struct tm));
 #endif
 
 #if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_LOCALTIME_R)
-  localtime_r (xx, &bb);
+  bptr = localtime_r (xx, &bb);
 #else
-  memcpy (&bb, localtime(xx), sizeof(struct tm));
-#endif
-
-  /* Check for datum wrap-around.
-   */
-  if      (aa.tm_year < bb.tm_year)
-    sign = (-1);
-  else if (aa.tm_mon  < bb.tm_mon)
-    sign = (-1);
-  else if (aa.tm_mday < bb.tm_mday)
-    sign = (-1);
-  else if (bb.tm_year < aa.tm_year)
-    sign = ( 1);
-  else if (bb.tm_mon  < aa.tm_mon)
-    sign = ( 1);
-  else if (bb.tm_mday < aa.tm_mday)
-    sign = ( 1);
-
-  diff = aa.tm_hour * 60 + aa.tm_min;
-  diff = (bb.tm_hour * 60 + bb.tm_min) - diff;
-  diff = diff - (sign * 24 * 60);   /* datum wrap-around correction */
-  hh = diff / 60;
-  mm = diff - (hh * 60);
-  sprintf (tz, _("%+03d%02d"), hh, mm);                /* known to fit  */
-
+  bptr = localtime(xx);
+  if (bptr) 
+    memcpy (&bb, bptr, sizeof(struct tm));
+#endif
+
+  if (bptr && aptr)
+    {
+      /* Check for datum wrap-around.
+       */
+      if      (aa.tm_year < bb.tm_year)
+        sign = (-1);
+      else if (aa.tm_mon  < bb.tm_mon)
+        sign = (-1);
+      else if (aa.tm_mday < bb.tm_mday)
+        sign = (-1);
+      else if (bb.tm_year < aa.tm_year)
+        sign = ( 1);
+      else if (bb.tm_mon  < aa.tm_mon)
+        sign = ( 1);
+      else if (bb.tm_mday < aa.tm_mday)
+        sign = ( 1);
+      
+      diff = aa.tm_hour * 60 + aa.tm_min;
+      diff = (bb.tm_hour * 60 + bb.tm_min) - diff;
+      diff = diff - (sign * 24 * 60);   /* datum wrap-around correction */
+      hh = diff / 60;
+      mm = diff - (hh * 60);
+      sprintf (tz, _("%+03d%02d"), hh, mm);                /* known to fit  */
+    }
+  else
+    {
+      sprintf (tz, _("%+03d%02d"), 0, 0);
+    }
   SL_RETURN(tz, _("t_zone"));
 }
@@ -2560 +2570 @@
 static int sh_unix_use_localtime = S_FALSE;
 
-/* whether to use localtime for file timesatams in logs
+/* whether to use localtime for file timestamps in logs
  */
 int sh_unix_uselocaltime (const char * c)
@@ -3485 +3495 @@
 
 int sh_unix_checksum_size (char * filename, off_t size, int is_max_size, 
-                           char * fileHash, int alert_timeout, SL_TICKET fd)
+                           char * fileHash, int alert_timeout, SL_TICKET fd, unsigned long mask)
 {
   file_type * tmpFile;
@@ -3517 +3527 @@
       char hashbuf[KEYBUF_SIZE];
       UINT64 local_length = (UINT64) (tmpFile->size < 0 ? 0 : tmpFile->size);
+      if (sh.flag.opts == S_TRUE) sh_tiger_set_hashtype_mask(mask);
       sl_strlcpy(fileHash,
                  sh_tiger_generic_hash (filename, fd, &(local_length), 
@@ -3541 +3552 @@
 
 int sh_check_rotated_log (const char * path,  
-                          UINT64 old_size, UINT64 old_inode, const char * old_hash)
+                          UINT64 old_size, UINT64 old_inode, const char * old_hash, unsigned long mask)
 {
   struct stat obuf;
@@ -3560 +3571 @@
           if (!SL_ISERROR(fd))
             {
-              sh_unix_checksum_size (rotated_file, old_size, S_FALSE, hashbuf, 120 /* alert_timeout */, fd);
+              sh_unix_checksum_size (rotated_file, old_size, S_FALSE, 
+                                     hashbuf, 120 /* alert_timeout */, fd, mask);
               
               sl_close(fd);
@@ -3814 +3826 @@
   SL_ENTER(_("sh_unix_getinfo"));
 
-  if (!MODI_INITIALIZED(theFile->check_mask))
+  if (!MODI_INITIALIZED(theFile->check_flags))
     {
       tmp2 = sh_util_safe_name (theFile->fullpath);
@@ -3823 +3835 @@
       SH_MUTEX_UNLOCK(mutex_thread_nolog);
       SH_FREE(tmp2);
+      SL_RETURN((-1),_("sh_unix_getinfo"));
     }
 
@@ -3989 +4002 @@
       if (fileHash != NULL)
         {
-          if ((theFile->check_mask & MODI_CHK) == 0 ||
+          if ((theFile->check_flags & MODI_CHK) == 0 ||
               sh_restrict_this(theFile->fullpath, (UINT64) fbuf.st_size, 
                                (UINT64) fbuf.st_mode, rval_open))
@@ -3995 +4008 @@
               sl_strlcpy(fileHash, SH_KEY_NULL, KEY_LEN+1);
             }
-          else if ((theFile->check_mask & MODI_PREL) != 0 &&
+          else if ((theFile->check_flags & MODI_PREL) != 0 &&
                    S_TRUE == sh_prelink_iself(rval_open, fbuf.st_size, 
                                               alert_timeout, theFile->fullpath))
             {
               if (0 != sh_prelink_run (theFile->fullpath, 
-                                       fileHash, alert_timeout))
+                                       fileHash, alert_timeout, theFile->check_flags))
                 sl_strlcpy(fileHash, SH_KEY_NULL, KEY_LEN+1);
             }
@@ -4008 +4021 @@
               UINT64 length_current = TIGER_NOLIM;
 
-              if (MODI_TXT_ENABLED(theFile->check_mask) && fbuf.st_size < (10 * SH_TXT_MAX))
+              if (MODI_TXT_ENABLED(theFile->check_flags) && fbuf.st_size < (10 * SH_TXT_MAX))
                 {
                   sl_init_content (rval_open, fbuf.st_size);
                 }
 
+              if (sh.flag.opts == S_TRUE) sh_tiger_set_hashtype_mask(theFile->check_flags);
               sl_strlcpy(fileHash,
                          sh_tiger_generic_hash (theFile->fullpath, 
@@ -4023 +4037 @@
               content = sh_string_copy(content);
 
-              if ((theFile->check_mask & MODI_SGROW) != 0)
+              if ((theFile->check_flags & MODI_SGROW) != 0)
                 {
                   /* Update size so it matches the one for which the checksum
@@ -4032 +4046 @@
                   sh_unix_checksum_size (theFile->fullpath, length_current, S_TRUE,
                                          &fileHash[KEY_LEN + 1], 
-                                         alert_timeout, rval_open);
+                                         alert_timeout, rval_open, theFile->check_flags);
                 }
             }
@@ -4046 +4060 @@
       if (fileHash != NULL)
         {
-          if ((theFile->check_mask & MODI_CHK) == 0 ||
+          if ((theFile->check_flags & MODI_CHK) == 0 ||
               sh_restrict_this(theFile->fullpath, (UINT64) fbuf.st_size, 
                                (UINT64) fbuf.st_mode, rval_open))
@@ -4057 +4071 @@
             {
               if (0 != sh_prelink_run (theFile->fullpath, 
-                                       fileHash, alert_timeout))
+                                       fileHash, alert_timeout, theFile->check_flags))
                 sl_strlcpy(fileHash, SH_KEY_NULL, KEY_LEN+1);
             }
@@ -4065 +4079 @@
               UINT64 length_current = TIGER_NOLIM;
 
-              if (MODI_TXT_ENABLED(theFile->check_mask) && fbuf.st_size < (10 * SH_TXT_MAX))
+              if (MODI_TXT_ENABLED(theFile->check_flags) && fbuf.st_size < (10 * SH_TXT_MAX))
                 {
                   sl_init_content (rval_open, fbuf.st_size);
                 }
 
+              if (sh.flag.opts == S_TRUE) sh_tiger_set_hashtype_mask(theFile->check_flags);
               sl_strlcpy(fileHash, 
                          sh_tiger_generic_hash (theFile->fullpath, rval_open, 
@@ -4080 +4095 @@
               content = sh_string_copy(content);
 
-              if ((theFile->check_mask & MODI_SGROW) != 0) 
+              if ((theFile->check_flags & MODI_SGROW) != 0) 
                 {
                   /* Update size so it matches the one for which the checksum
@@ -4089 +4104 @@
                   sh_unix_checksum_size (theFile->fullpath, length_current, S_TRUE,
                                          &fileHash[KEY_LEN + 1], 
-                                         alert_timeout, rval_open);
+                                         alert_timeout, rval_open, theFile->check_flags);
                 }
             }
@@ -4105 +4120 @@
         sl_strlcpy(fileHash, SH_KEY_NULL, KEY_LEN+1);
 
-      if ((theFile->check_mask & MODI_CHK) != 0)
+      if ((theFile->check_flags & MODI_CHK) != 0)
         {
           tmp2 = sh_util_safe_name (theFile->fullpath);
@@ -4276 +4291 @@
   /* --- Output the file. ---
    */
-  if (flag_err_debug == SL_TRUE)
+  if (flag_err_debug == S_TRUE)
     {
       tmp2 = sh_util_safe_name ((filename == NULL) ? 
@@ -5294 +5309 @@
 int sh_unix_count_mlock()
 {
-  int i = 0;
+  unsigned int i = 0;
   char str[32][64];
   sh_page_l * page_list;
@@ -5325 +5340 @@
 #ifdef WITH_TPT
   {
-    int j = 0;
+    unsigned int j = 0;
     while (j < i && j < 32)
       {
-        sh_error_handle(SH_ERR_INFO, FIL__, __LINE__, j, MSG_E_SUBGEN,
+        sh_error_handle(SH_ERR_ALL, FIL__, __LINE__, j, MSG_E_SUBGEN,
                         str[j], _("sh_unix_count_mlock"));
         ++j;
@@ -5336 +5351 @@
 
   sl_snprintf(str[0], 64, _("%d pages locked"), i);
-  sh_error_handle(SH_ERR_INFO, FIL__, __LINE__, i, MSG_E_SUBGEN,
+  sh_error_handle(SH_ERR_ALL, FIL__, __LINE__, i, MSG_E_SUBGEN,
                   str[0], _("sh_unix_count_mlock"));
   SL_RETURN((i), _("sh_unix_count_mlock"));
@@ -5515 +5530 @@
       this_line  = 0;
       c          = '\0';
-      while (c != '\n' && num > 0 && this_line < (sizeof(theline)-1))
+      while (c != '\n' && this_line < (sizeof(theline)-1))
         {
           do {