Changeset 131 for trunk/src/sh_prelude.c

Timestamp:

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

Author:

rainer

Message:

Use thread-safe libc functions.

File:

• trunk/src/sh_prelude.c (modified) (5 diffs)

trunk/src/sh_prelude.c

@@ -83 +83 @@
 #include "sh_error_min.h"
 #include "sh_prelude.h"
+#define SH_NEED_PWD_GRP 1
+#include "sh_static.h"
 
 /*
@@ -138 +140 @@
         char * p;
         char * dup = strdup (str);
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_STRTOK_R)
+        char * saveptr;
+#endif
 
         if (!dup) 
                 return -1;
 
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_STRTOK_R)
+        p = strtok_r (dup, ", \t", &saveptr);
+#else
         p = strtok (dup, ", \t");
+#endif
         if (p) {
                 do {
@@ -165 +174 @@
                                 return -1;
                         }
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_STRTOK_R)
+                        p = strtok_r (NULL, ", \t", &saveptr);
+#else
                         p = strtok (NULL, ", \t");
+#endif
                 } while (p);
         }
@@ -679 +692 @@
         idmef_node_t *node;
         struct passwd *pw;
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETPWNAM_R)
+        struct passwd pwd;
+        char buffer[SH_PWBUF_SIZE];
+#endif
         prelude_string_t *str;
         idmef_user_id_t *user_id;
@@ -763 +780 @@
                 idmef_user_id_set_type(user_id, IDMEF_USER_ID_TYPE_TARGET_USER);
                 
-                pw = getpwnam(ptr);
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETPWNAM_R)
+                sh_getpwnam_r(ptr, &pwd, buffer, sizeof(buffer), &pw);
+#else
+                pw = sh_getpwnam(ptr);
+#endif
                 if ( pw )
                         idmef_user_id_set_number(user_id, pw->pw_uid);