Changeset 252 for trunk/src/sh_static.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_static.c (modified) (15 diffs)

trunk/src/sh_static.c

@@ -54 +54 @@
 #include "sh_pthread.h"
 
+extern  int sl_close_fd (const char * file, int line, int fd);
+extern  int sl_fclose (const char * file, int line, FILE * fp);
+
+
 #ifndef _PATH_PASSWD
 #define _PATH_PASSWD "/etc/passwd"
@@ -60 +64 @@
 #define _PATH_GROUP "/etc/group"
 #endif
+
+#undef  FIL__
+#define FIL__  _("sh_static.c")
 
 extern  int sl_strlcpy(char * dst, /*@null@*/const char * src, size_t siz);
@@ -123 +130 @@
       }
     } while (1);
-    fclose(stream);
+    sl_fclose(FIL__, __LINE__, stream);
   }
   
@@ -171 +178 @@
       }
     } while (1);
-    fclose(stream);
+    sl_fclose(FIL__, __LINE__, stream);
   }
   
@@ -219 +226 @@
       }
     } while (1);
-    fclose(stream);
+    sl_fclose(FIL__, __LINE__, stream);
   }
   
@@ -267 +274 @@
       }
     } while (1);
-    fclose(stream);
+    sl_fclose(FIL__, __LINE__, stream);
   }
   
@@ -341 +348 @@
         SH_MUTEX_LOCK(pwf_lock);
         if (pwf) {
-                fclose(pwf);
+                sl_fclose(FIL__, __LINE__, pwf);
                 pwf = NULL;
         }
@@ -395 +402 @@
         SH_MUTEX_LOCK(grf_lock);
         if (grf) {
-                fclose(grf);
+                sl_fclose(FIL__, __LINE__, grf);
                 grf = NULL;
         }
@@ -498 +505 @@
                 rv = setgroups(num_groups, group_list);
         DO_CLOSE:
-                fclose(grf);
+                sl_fclose(FIL__, __LINE__, grf);
         }
 
@@ -863 +870 @@
 #include <arpa/inet.h>
 
-/* close()
+/* sl_close_fd(FIL__, __LINE__, )
  */
 #include <unistd.h>
@@ -1185 +1192 @@
         while (retries++ < MAX_RETRIES) {
                 if (fd != -1)
-                        close(fd);
+                        sl_close_fd(FIL__, __LINE__, fd);
 
                 memset(packet, 0, PACKETSZ);
@@ -1344 +1351 @@
                 DPRINTF("Answer type = |%d|\n", a->atype);
 
-                close(fd);
+                sl_close_fd(FIL__, __LINE__, fd);
 
                 if (outpacket)
@@ -1390 +1397 @@
 fail:
         if (fd != -1)
-            close(fd);
+            sl_close_fd(FIL__, __LINE__, fd);
         if (lookup)
             free(lookup);
@@ -1546 +1553 @@
         
                 if (action!=GETHOSTENT) {
-                        fclose(fp);
+                        sl_fclose(FIL__, __LINE__, fp);
                 }
                 return ret;
         }
         if (action!=GETHOSTENT) {
-                fclose(fp);
+                sl_fclose(FIL__, __LINE__, fp);
         }
         return ret;
@@ -1619 +1626 @@
                         }
                 }
-                fclose(fp);
+                sl_fclose(FIL__, __LINE__, fp);
         } else {
             DPRINTF("failed to open %s\n", "resolv.conf");