Changeset 252 for trunk/src/sh_gpg.c

Timestamp:

Oct 12, 2009, 10:40:45 AM (15 years ago)

Author:

katerina

Message:

Add code to check for stale file records on close() and fclose(), fix sl_close() to handle open stream (ticket #163).

File:

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

trunk/src/sh_gpg.c

@@ -88 +88 @@
 FILE * pdbgc;
 #define PDBG_OPEN    pdbg = fopen(PDGBFILE"main",  "a")  
-#define PDBG_CLOSE   fclose (pdbg)
+#define PDBG_CLOSE   sl_fclose (FIL__, __LINE__, pdbg)
 #define PDBG(arg)    fprintf(pdbg,  "PDBG: step %d\n", arg); fflush(pdbg)
 #define PDBG_D(arg)  fprintf(pdbg,  "PDBG: %d\n", arg); fflush(pdbg)
@@ -94 +94 @@
 
 #define PDBGC_OPEN   pdbgc = fopen(PDGBFILE"child", "a")  
-#define PDBGC_CLOSE  fclose (pdbgc)
+#define PDBGC_CLOSE  sl_fclose (FIL__, __LINE__, pdbgc)
 #define PDBGC(arg)   fprintf(pdbgc, "PDBG: step %d\n", arg); fflush(pdbgc)
 #define PDBGC_D(arg) fprintf(pdbgc, "PDBG: %d\n", arg); fflush(pdbgc)
@@ -446 +446 @@
   if (source->pid == (pid_t) - 1) 
     {
-      close(pipedes[0]);
-      close(pipedes[1]);
+      sl_close_fd(FIL__, __LINE__, pipedes[0]);
+      sl_close_fd(FIL__, __LINE__, pipedes[1]);
       if (envp[0] != NULL) 
         free(envp[0]);
@@ -468 +468 @@
       /* close the pipe descriptors 
        */
-      close (pipedes[STDIN_FILENO]);
-      close (pipedes[STDOUT_FILENO]);
+      sl_close_fd (FIL__, __LINE__, pipedes[STDIN_FILENO]);
+      sl_close_fd (FIL__, __LINE__, pipedes[STDOUT_FILENO]);
       
 
@@ -618 +618 @@
     free(envp[0]);
 
-  close (pipedes[STDOUT_FILENO]);
+  sl_close_fd (FIL__, __LINE__, pipedes[STDOUT_FILENO]);
   retry_fcntl (FIL__, __LINE__, pipedes[STDIN_FILENO], F_SETFD, FD_CLOEXEC);
   retry_fcntl (FIL__, __LINE__, pipedes[STDIN_FILENO], F_SETFL,  O_NONBLOCK);
@@ -627 +627 @@
     {
       aud_kill (FIL__, __LINE__, source->pid, SIGKILL);
-      close (pipedes[STDOUT_FILENO]);
+      sl_close_fd (FIL__, __LINE__, pipedes[STDOUT_FILENO]);
       waitpid (source->pid, NULL, 0);
       source->pid = 0;
@@ -643 +643 @@
   SL_ENTER(_("sh_gpg_pclose"));
 
-  status = fclose(source->pipe);
+  status = sl_fclose(FIL__, __LINE__, source->pipe);
   if (status)
     SL_RETURN( (-1), _("sh_gpg_pclose"));