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

trunk/src/sh_unix.c

@@ -1293 +1293 @@
         fd++;
       else
-        close(fd++);
+        sl_close_fd(FIL__, __LINE__, fd++);
     }
 
@@ -1971 +1971 @@
       /* Close first tree file descriptors 
        */ 
-      close (0);  /* if running as daemon */
-      close (1);  /* if running as daemon */
-      close (2);  /* if running as daemon */
+      sl_close_fd (FIL__, __LINE__, 0);  /* if running as daemon */
+      sl_close_fd (FIL__, __LINE__, 1);  /* if running as daemon */
+      sl_close_fd (FIL__, __LINE__, 2);  /* if running as daemon */
 
       /* Enable full error logging
@@ -2306 +2306 @@
                                    _("time"), sh.srvtime.name);
                 }
-              close(fd);
+              sl_close_fd(FIL__, __LINE__, fd);
             }
           else
@@ -2910 +2910 @@
   
   r = ioctl (fd, EXT2_IOC_GETFLAGS, &f);
-  /* close (fd); */
+  /* sl_close_fd (FIL__, __LINE__, fd); */
 
   if (r == -1)
@@ -3439 +3439 @@
   int           fstat_return;
   int           fstat_errno = 0;
+  int           try         = 0;
 
   sh_string   * content = NULL;
@@ -3464 +3465 @@
     stat_errno = errno;
 
+  theFile->link_path = NULL;
+
+ try_again:
+
   fd           = -1;
   fstat_return = -1;
   rval_open    = -1;
 
-  theFile->link_path = NULL;
-
   if (stat_return == 0 && S_ISREG(buf.st_mode)) 
     {
@@ -3475 +3478 @@
                                     path /* theFile->fullpath */, SL_YESPRIV);
       if (SL_ISERROR(rval_open))
-        err_open = errno;
-
-      {
-        char * stale = sl_check_stale();
-
-        if (stale)
-          {
-            sh_error_handle(SH_ERR_ERR, FIL__, __LINE__, err_open, MSG_E_SUBGEN,
-                            stale, _("sh_unix_getinfo_open"));
-          }
-      }
+        {
+          char * stale = sl_check_stale();
+          
+          if (stale)
+            {
+              sh_error_handle(SH_ERR_ERR, FIL__, __LINE__, err_open, MSG_E_SUBGEN,
+                              stale, _("sh_unix_getinfo_open"));
+            }
+
+          if (errno == EBADF && try == 0) /* obsolete, but we keep this, just in case */
+            {
+              ++try;
+              goto try_again;
+            }
+          err_open = errno;
+        }
 
       alert_timeout = 120; /* this is per 8K block now ! */
@@ -3529 +3537 @@
                               MSG_E_SUBGEN,
                               stale, _("sh_unix_getinfo_fstat"));
+            }
+
+          if (try == 0) /* obsolete, but we keep this, just in case */
+            {
+              ++try;
+              sl_close(rval_open);
+              goto try_again;
             }
         }