Changeset 248 for trunk/src/sh_gpg.c

Timestamp:

Sep 21, 2009, 8:23:56 PM (15 years ago)

Author:

katerina

Message:

Code to track down originating site for ticket #163.

File:

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

trunk/src/sh_gpg.c

@@ -270 +270 @@
   char        pname[128];
   int         pfd;
+  int         val_return;
 #endif
 #endif
@@ -534 +535 @@
        */
 #if defined(WITH_PGP)
-      checkfd = sl_open_read(DEFAULT_PGP_PATH, SL_NOPRIV);
-#else
-      checkfd = sl_open_read(DEFAULT_GPG_PATH, SL_NOPRIV);
+      checkfd = sl_open_read(FIL__, __LINE__, DEFAULT_PGP_PATH, SL_NOPRIV);
+#else
+      checkfd = sl_open_read(FIL__, __LINE__, DEFAULT_GPG_PATH, SL_NOPRIV);
 #endif
 
       if (0 != sh_gpg_checksum(checkfd, 0))
-        aud__exit(FIL__, __LINE__, EXIT_FAILURE);
+        {
+          sl_close(checkfd);
+          aud__exit(FIL__, __LINE__, EXIT_FAILURE);
+        }
 
       pfd = get_the_fd(checkfd);
+      do {
+        val_return = dup (pfd);
+      } while (val_return < 0 && errno == EINTR);
+      pfd = val_return;
+      sl_close(checkfd);
+      checkfd = -1;
+
       sl_snprintf(pname, sizeof(pname), _("/proc/self/fd/%d"), pfd);
       if (0 == access(pname, R_OK|X_OK))               /* flawfinder: ignore */
@@ -559 +570 @@
       /* procfs not working, go ahead 
        */
-      sl_close(checkfd);
-      checkfd = -1;
 #endif
 
@@ -576 +585 @@
         {
 #if defined(WITH_PGP)
-          checkfd = sl_open_fastread(DEFAULT_PGP_PATH, SL_NOPRIV);
-#else
-          checkfd = sl_open_fastread(DEFAULT_GPG_PATH, SL_NOPRIV);
+          checkfd = sl_open_fastread(FIL__, __LINE__, DEFAULT_PGP_PATH, SL_NOPRIV);
+#else
+          checkfd = sl_open_fastread(FIL__, __LINE__, DEFAULT_GPG_PATH, SL_NOPRIV);
 #endif
           if (0 != sh_gpg_checksum(checkfd, 0)) {
@@ -685 +694 @@
 
 #ifdef HAVE_GPG_CHECKSUM
-  checkfd = sl_open_read(DEFAULT_GPG_PATH, SL_YESPRIV);
+  checkfd = sl_open_read(FIL__, __LINE__, DEFAULT_GPG_PATH, SL_YESPRIV);
 
   if (0 != sh_gpg_checksum(checkfd, 1))
@@ -716 +725 @@
 
 #ifdef HAVE_GPG_CHECKSUM
-  checkfd = sl_open_read(DEFAULT_PGP_PATH, SL_YESPRIV);
+  checkfd = sl_open_read(FIL__, __LINE__, DEFAULT_PGP_PATH, SL_YESPRIV);
 
   if (0 != sh_gpg_checksum(checkfd, 1))