Changeset 25 for trunk/src

Timestamp:

Mar 14, 2006, 10:27:38 PM (19 years ago)

Author:

rainer

Message:

More tests; fix for update+schedule issue.

Location:

trunk/src

Files:

• samhain.c (modified) (1 diff)
• sh_html.c (modified) (1 diff)
• sh_unix.c (modified) (2 diffs)
• sh_utils.c (modified) (2 diffs)
• slib.c (modified) (1 diff)

trunk/src/samhain.c

@@ -1795 +1795 @@
       /* see whether its time to check files
        */
-      if      (sh.flag.checkSum == SH_CHECK_INIT)
+      if      (sh.flag.checkSum == SH_CHECK_INIT ||
+               (sh.flag.checkSum == SH_CHECK_CHECK &&
+                (sh.flag.isdaemon == S_FALSE && sh.flag.loop == S_FALSE)))
         {
           flag_check_1 = 1;

trunk/src/sh_html.c

@@ -313 +313 @@
           sl_strlcat(&entry_orig[entry_size], line, line_size + 1);
           entry_size += add_size;
-          SH_VAL_EQ(entry_orig[entry_size], '\0');
+          SH_VALIDATE_EQ(entry_orig[entry_size], '\0');
         }
       sl_close(fd);

trunk/src/sh_unix.c

@@ -4024 +4024 @@
     {
 #ifdef WITH_TPT
-      sl_snprintf(str, 128, _("file: %s line: %d page: %d"), 
+      sl_snprintf(str, sizeof(str), _("file: %s line: %d page: %d"), 
                   page_list->file, page_list->line, i+1);
       sh_error_handle(SH_ERR_INFO, FIL__, __LINE__, i, MSG_E_SUBGEN,
@@ -4032 +4032 @@
       ++i;
     }
-  sl_snprintf(str, 128, _("%d pages locked"), i);
+  sl_snprintf(str, sizeof(str), _("%d pages locked"), i);
   sh_error_handle(SH_ERR_INFO, FIL__, __LINE__, i, MSG_E_SUBGEN,
                   str, _("sh_unix_count_mlock"));

trunk/src/sh_utils.c

@@ -205 +205 @@
   SL_ENTER(_("sh_util_strdup"));
 
-  if (str != NULL)
-    {
-      len = sl_strlen(str);
-      p   = SH_ALLOC (len + 1);
-      (void) sl_strlcpy (p, str, len+1);
-    }
+  SH_VALIDATE_NE(str, NULL);
+
+  len = sl_strlen(str);
+  p   = SH_ALLOC (len + 1);
+  (void) sl_strlcpy (p, str, len+1);
+
   SL_RETURN( p, _("sh_util_strdup"));
 }
@@ -224 +224 @@
   ret = *str;
 
-  if (ret == NULL) {
-    SL_RETURN(ret, _("sh_util_strsep"));
-  }
+  SH_VALIDATE_NE(ret, NULL);
 
   for (c = *str; *c != '\0'; c++) {

trunk/src/slib.c

@@ -577 +577 @@
 
 #if !defined(HOST_IS_I86SOLARIS)
-#if !defined (_GNU_SOURCE)
+#if !defined (_GNU_SOURCE) && !defined(__linux__)
 /* flawfinder: ignore */
 extern int vsnprintf ( char *str, size_t n,