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

trunk/src/slib.c

@@ -1559 +1559 @@
   SL_TICKET ticket;          /* The unique  ID.      */ 
   int fd;                    /* The file descriptor. */
+  FILE * stream;             /* The file descriptor. */
   char * path;               /* The file path.       */
   int flush;                 /* Whether we want to flush the cache */
@@ -1571 +1572 @@
 static int  stale_orig_line = -1;
 static char stale_orig_mesg[128];
+
+static char badfd_orig_file[64] = { '\0' };
+static int  badfd_orig_line = -1;
+static char badfd_orig_mesg[128];
 
 SH_MUTEX_STATIC(mutex_ticket, PTHREAD_MUTEX_INITIALIZER);
@@ -1587 +1592 @@
 }
 
+char * sl_check_badfd()
+{
+  if (badfd_orig_line == -1)
+    return NULL;
+  sl_snprintf(badfd_orig_mesg, sizeof(badfd_orig_mesg), 
+              _("close on file descriptor with allocated handle, %s, %d"), 
+              badfd_orig_file, badfd_orig_line);
+  badfd_orig_file[0] = '\0';
+  badfd_orig_line    = -1;
+  return badfd_orig_mesg;
+}
+
 static
 SL_TICKET sl_create_ticket (unsigned int myindex) 
@@ -1666 +1683 @@
 
 SL_TICKET sl_make_ticket (const char * ofile, int oline,
-                          int fd, const char * filename)
+                          int fd, const char * filename, FILE * stream)
 {
   size_t    len;
@@ -1721 +1738 @@
   ofiles[fd]->fd      = fd;
   ofiles[fd]->content = NULL;
+  ofiles[fd]->stream  = stream;
   ofiles[fd]->flush   = SL_FALSE;
 
@@ -1786 +1804 @@
    * the mask is returned." 
    */
-  (void) umask (0); 
+  (void) umask (0);
 
   if (mode == SL_OPEN_FOR_FASTREAD)
@@ -1927 +1945 @@
   if (stat_return < 0)
     {
-      close (fd);
+      sl_close_fd (FIL__, __LINE__, fd);
       errno = errval;
       SL_IRETURN(SL_EFSTAT, _("sl_open_file"));
@@ -1936 +1954 @@
   if (lstat_return != ENOENT && buf.st_ino != lbuf.st_ino)
     {
-      close (fd);
+      sl_close_fd (FIL__, __LINE__, fd);
       SL_IRETURN(SL_EBOGUS, _("sl_open_file"));
     }
@@ -1946 +1964 @@
   if (fd >= MAXFD)
      {
-        close(fd);
+        sl_close_fd(FIL__, __LINE__, fd);
         SL_IRETURN(SL_TOOMANY, _("sl_open_file"));
      }
@@ -1953 +1971 @@
     {
       /*
-      close(fd);
+      sl_close_fd(FIL__, __LINE__, fd);
       SL_IRETURN(SL_EINTERNAL09, _("sl_open_file"));
       */
@@ -1968 +1986 @@
   if ( (ofiles[fd] = (SL_OFILE *) malloc(sizeof(SL_OFILE))) == NULL)
     {
-      close(fd);
+      sl_close_fd(FIL__, __LINE__, fd);
       SL_IRETURN(SL_EMEM, _("sl_open_file"));
     }
@@ -1978 +1996 @@
       free (ofiles[fd]);
       ofiles[fd] = NULL;
-      close(fd);
+      sl_close_fd(FIL__, __LINE__, fd);
       SL_IRETURN(SL_EMEM, _("sl_open_file"));
     }
@@ -1991 +2009 @@
       (void) free (ofiles[fd]);
       ofiles[fd] = NULL;
-      close(fd);
+      sl_close_fd(FIL__, __LINE__, fd);
       SL_IRETURN(ticket, _("sl_open_file"));
     }
@@ -1999 +2017 @@
   ofiles[fd]->fd      = fd;
   ofiles[fd]->content = NULL;
+  ofiles[fd]->stream  = NULL;
   ofiles[fd]->flush   = SL_FALSE;
 
@@ -2005 +2024 @@
 
   SL_IRETURN(ticket, _("sl_open_file"));
+}
+
+FILE * sl_stream (SL_TICKET ticket, char * mode)
+{
+  int    fd;
+
+  if (SL_ISERROR(fd = sl_read_ticket(ticket)))
+    return (NULL);
+
+  if (ofiles[fd] == NULL || fd != ofiles[fd]->fd || 
+      ticket != ofiles[fd]->ticket || fd < 0)
+    return (NULL);
+
+  if (!ofiles[fd]->stream)
+    ofiles[fd]->stream = fdopen(fd, mode);
+
+  return ofiles[fd]->stream;
 }
 
@@ -2259 +2295 @@
 {
   register int fd;
+  FILE * fp = NULL;
 
   SL_ENTER(_("sl_close"));
@@ -2276 +2313 @@
         sh_string_destroy(&(ofiles[fd]->content));
       (void) free (ofiles[fd]->path);
+      fp = ofiles[fd]->stream;
       (void) free (ofiles[fd]);
       ofiles[fd] = NULL;
@@ -2282 +2320 @@
   /* This may fail, but what to do then ?
    */
-  if (0 != close(fd))
-    {
-      TPT((0, FIL__, __LINE__, 
-           _("msg=<Error closing file.>, fd=<%d>, err=<%s>\n"), 
-           fd, strerror(errno)));
+  if (fp)
+    {
+      if (0 != fclose (fp)) /* within sl_close */
+        {
+          TPT((0, FIL__, __LINE__, 
+               _("msg=<Error fclosing file.>, fd=<%d>, err=<%s>\n"), 
+               fd, strerror(errno)));
+        }
+    }
+  else
+    {
+      if (0 != close(fd)) /* within sl_close */
+        {
+          TPT((0, FIL__, __LINE__, 
+               _("msg=<Error closing file.>, fd=<%d>, err=<%s>\n"), 
+               fd, strerror(errno)));
+        }
     }
 
   SL_IRETURN(SL_ENONE, _("sl_close")); 
+}
+
+int sl_close_fd (const char * file, int line, int fd)
+{
+  int ret = -1;
+
+  SL_ENTER(_("sl_close_fd"));
+
+  if (fd >= 0 && fd < MAXFD && ofiles[fd] != NULL) /* stale ofiles[fd] handle */
+    {
+      sl_strlcpy(badfd_orig_file, file, sizeof(badfd_orig_file));
+      badfd_orig_line = line;
+    }
+
+  ret = close(fd); /* within sl_close_fd wrapper */
+
+  SL_IRETURN(ret, _("sl_close_fd")); 
+}
+
+int sl_fclose (const char * file, int line, FILE * fp)
+{
+  int ret = -1;
+  int fd;
+
+  SL_ENTER(_("sl_fclose"));
+
+  fd = fileno(fp);
+
+  if (fd >= 0 && fd < MAXFD && ofiles[fd] != NULL) /* stale ofiles[fd] handle */
+    {
+      sl_strlcpy(badfd_orig_file, file, sizeof(badfd_orig_file));
+      badfd_orig_line = line;
+    }
+
+  ret = fclose(fp); /* within sl_fclose wrapper */
+
+  SL_IRETURN(ret, _("sl_fclose")); 
 }