Changeset 131 for trunk/src/sh_gpg.c

Timestamp:

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

Author:

rainer

Message:

Use thread-safe libc functions.

File:

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

trunk/src/sh_gpg.c

@@ -292 +292 @@
       struct stat lbuf;
       int         status_stat = 0;
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETPWNAM_R)
+      struct passwd    pwd;
+      char             buffer[SH_PWBUF_SIZE];
+      struct passwd *  tempres;
+      sh_getpwnam_r(DEFAULT_IDENT, &pwd, buffer, sizeof(buffer), &tempres);
+#else
       struct passwd * tempres = sh_getpwnam(DEFAULT_IDENT);
+#endif
 
       if (!tempres)
@@ -844 +851 @@
   while (NULL != fgets(line, sizeof(line), source.pipe))
     {
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_STRTOK_R)
+      char * saveptr = NULL;
+#endif
       if (line[strlen(line)-1] == '\n')
         line[strlen(line)-1] = ' ';
@@ -852 +862 @@
       if (sl_strlen(line) < 18) 
         continue;
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_STRTOK_R)
+      ptr = strtok_r (line, " ", &saveptr);
+#else
       ptr = strtok (line, " ");
+#endif
       while (ptr)
         {
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_STRTOK_R)
+          ptr = strtok_r (NULL, " ", &saveptr);
+#else
           ptr = strtok (NULL, " ");
+#endif
           if (ptr && 0 == sl_strncmp (ptr, _("fingerprint"), 11))
             {
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_STRTOK_R)
+              ptr = strtok_r (NULL, " ", &saveptr); /* to '=' */
+#else
               ptr = strtok (NULL, " "); /* to '=' */
+#endif
               sign_fp[0] = '\0';
               while (ptr)
                 {
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_STRTOK_R)
+                  ptr = strtok_r (NULL, " ", &saveptr); /* part of fingerprint */
+#else
                   ptr = strtok (NULL, " "); /* part of fingerprint */
+#endif
                   sl_strlcat (sign_fp, ptr, SH_MINIBUF+1);
                 }
@@ -923 +949 @@
 #if defined(SH_WITH_SERVER)
   struct passwd * tempres;
-#endif
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETPWNAM_R)
+  struct passwd    pwd;
+  char             buffer[SH_PWBUF_SIZE];
+#endif
+#endif
+
 #ifdef USE_FINGERPRINT
 #include "sh_gpg_fp.h"
@@ -952 +983 @@
       TPT(((0), FIL__, __LINE__, _("msg=<GPG_CHECK: FD1 = %d>\n"), fd1));
 #if defined(SH_WITH_SERVER)
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETPWNAM_R)
+      sh_getpwnam_r(DEFAULT_IDENT, &pwd, buffer, sizeof(buffer), &tempres);
+#else
       tempres = sh_getpwnam(DEFAULT_IDENT);
+#endif
 
       if ((tempres != NULL) && (0 == sl_ret_euid()))
@@ -969 +1004 @@
       TPT(((0), FIL__, __LINE__, _("msg=<GPG_CHECK: FD2 = %d>\n"), fd2));
 #if defined(SH_WITH_SERVER)
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETPWNAM_R)
+      sh_getpwnam_r(DEFAULT_IDENT, &pwd, buffer, sizeof(buffer), &tempres);
+#else
       tempres = sh_getpwnam(DEFAULT_IDENT);
+#endif
 
       if ((tempres != NULL) && (0 == sl_ret_euid()))
@@ -1077 +1116 @@
 
 #if defined(SH_WITH_SERVER)
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETPWNAM_R)
+      struct passwd    e_pwd;
+      char             e_buffer[SH_PWBUF_SIZE];
+      struct passwd *  e_tempres;
+      sh_getpwnam_r(DEFAULT_IDENT, &e_pwd, e_buffer, sizeof(e_buffer), &e_tempres);
+#else
       struct passwd * e_tempres = sh_getpwnam(DEFAULT_IDENT);
+#endif
 
       if ((e_tempres != NULL) && (0 == sl_ret_euid()))