Changeset 131 for trunk/src/samhain.c

Timestamp:

Oct 22, 2007, 11:19:15 PM (17 years ago)

Author:

rainer

Message:

Use thread-safe libc functions.

File:

• trunk/src/samhain.c (modified) (7 diffs)

trunk/src/samhain.c

@@ -63 +63 @@
 
 #include "samhain.h"
+#include "sh_pthread.h"
 #include "sh_files.h"
 #include "sh_utils.h"
@@ -450 +451 @@
   if (0 == strcmp (DEFAULT_MAILADDRESS, _("NULL")))
     {
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_STRTOK_R)
+      char * saveptr;
+      (void) sl_strncpy(q, DEFAULT_MAILADDRESS, SH_PATHBUF);
+      p = strtok_r (q, ", \t", &saveptr);
+      if (p)
+        {
+          (void) sh_mail_setaddress_int (p);
+          while (NULL != (p = strtok_r (NULL, ", \t", &saveptr)))
+            (void) sh_mail_setaddress_int (p);
+        }
+#else
       (void) sl_strncpy(q, DEFAULT_MAILADDRESS, SH_PATHBUF);
       p = strtok (q, ", \t");
@@ -458 +470 @@
             (void) sh_mail_setaddress_int (p);
         }
+#endif
     }
 #endif
@@ -747 +760 @@
       return NULL;
     }
+
+  SH_MUTEX_LOCK(readdir_lock);
+
   while (NULL != (d = readdir(dp)) && i < 65535)
     {
@@ -767 +783 @@
         }
     }
+
+  SH_MUTEX_UNLOCK(readdir_lock);
+
   closedir(dp);
   return pidlist;
@@ -1294 +1313 @@
       if ( 0 == strcmp(argv[1], NOCL_CODE) )
         {
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_STRTOK_R)
+          char * saveptr;
+#endif
           my_argv[0] = argv[0]; ++my_argc;  
           command_line[0] = '\0';
@@ -1299 +1321 @@
           command_line[sizeof(command_line)-1] = '\0';
           do {
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_STRTOK_R)
             my_argv[my_argc] = 
-              strtok( (my_argc == 1) ? command_line : NULL, " \n"); 
+              strtok_r( (my_argc == 1) ? command_line : NULL, " \n", &saveptr);
+#else
+            my_argv[my_argc] = 
+              strtok( (my_argc == 1) ? command_line : NULL, " \n");
+#endif 
             if (my_argv[my_argc] != NULL) {
               ++my_argc;