Changeset 192 for trunk/src/sh_unix.c

Timestamp:

Nov 12, 2008, 12:37:00 AM (16 years ago)

Author:

katerina

Message:

Fixes for cygwin, and improved error diagnostics (tickets #126, #127, #128).

File:

• trunk/src/sh_unix.c (modified) (9 diffs)

trunk/src/sh_unix.c

@@ -3281 +3281 @@
   struct stat   fbuf;
   int           stat_return;
+  int           stat_errno = 0;
 
   ShFileType    type;
@@ -3293 +3294 @@
 
   SL_TICKET     rval_open;
+  int           err_open = 0;
+
   int           fd;
   int           fstat_return;
+  int           fstat_errno = 0;
+
   sh_string   * content = NULL;
       
@@ -3316 +3321 @@
                              path /* theFile->fullpath */, &buf);
 
+  if (stat_return)
+    stat_errno = errno;
+
   fd           = -1;
   fstat_return = -1;
@@ -3325 +3333 @@
     {
       rval_open = sl_open_fastread (path /* theFile->fullpath */, SL_YESPRIV);
+      if (SL_ISERROR(rval_open))
+        err_open = errno;
 
       alert_timeout = 120; /* this is per 8K block now ! */
@@ -3352 +3362 @@
 
   if (fd >= 0) 
-    fstat_return = retry_fstat (FIL__, __LINE__, fd, &fbuf);
+    {
+      fstat_return = retry_fstat (FIL__, __LINE__, fd, &fbuf);
+      if (fstat_return)
+        fstat_errno = errno;
+    }
   else
-    fd = -1;
+    {
+      fd = -1;
+    }
       
 
@@ -3370 +3386 @@
           if (S_FALSE == sh_ignore_chk_del(theFile->fullpath)) {
             char errbuf[SH_ERRBUF_SIZE];
+            uid_t euid;
+            (void) sl_get_euid(&euid);
             tmp2 = sh_util_safe_name (theFile->fullpath);
-            sh_error_handle (level, FIL__, __LINE__, stat_return, MSG_FI_LSTAT,
-                             sh_error_message (stat_return, errbuf, sizeof(errbuf)), 
+            sh_error_handle (level, FIL__, __LINE__, stat_return, MSG_FI_STAT,
+                             _("lstat"),
+                             sh_error_message (stat_errno, errbuf, sizeof(errbuf)),
+                             (long) euid,
                              tmp2);
             SH_FREE(tmp2);
@@ -3500 +3520 @@
    */
 
-  else    /* fstat_return != 0 or !S_ISREG(fbuf.st_mode) */
+  else    /* fstat_return != 0 or !S_ISREG(fbuf.st_mode) or open() failed */
     {
       uid_t   euid;
-      int fstat_errval = errno;
+
       if (fileHash != NULL)
         sl_strlcpy(fileHash, SH_KEY_NULL, KEY_LEN+1);
@@ -3513 +3533 @@
           if (fstat_return != 0)
             {
+              char errbuf[SH_ERRBUF_SIZE];
               (void) sl_get_euid(&euid);
-              sh_error_handle (level, FIL__, __LINE__, fstat_errval, 
-                               MSG_E_ACCESS, (long) euid, tmp2);
+
+              sh_error_handle (level, FIL__, __LINE__, stat_return, MSG_FI_STAT,
+                               _("fstat"),
+                               sh_error_message (fstat_errno, errbuf, sizeof(errbuf)),
+                               (long) euid,
+                               tmp2);
             }
           else if (!S_ISREG(fbuf.st_mode))
             {
-              sh_error_handle (level, FIL__, __LINE__, fstat_errval, 
+              sh_error_handle (level, FIL__, __LINE__, fstat_errno, 
                                MSG_E_NOTREG, tmp2);
             }
           else
             {
-              sh_error_handle (level, FIL__, __LINE__, fstat_errval, 
-                               MSG_E_READ, tmp2);
+              char errbuf[SH_ERRBUF_SIZE];
+              char errbuf2[SH_ERRBUF_SIZE];
+              sl_strlcpy(errbuf, sl_error_string(rval_open), sizeof(errbuf));
+              sh_error_message(err_open, errbuf2, sizeof(errbuf2));
+              sh_error_handle (level, FIL__, __LINE__, err_open, 
+                               MSG_E_READ, errbuf, errbuf2, tmp2);
             }
           SH_FREE(tmp2);
@@ -3737 +3766 @@
           if (stat_return != ENOENT)
             { 
+              uid_t euid;
               char errbuf[SH_ERRBUF_SIZE];
+
+              (void) sl_get_euid(&euid);
               sh_error_handle (level, FIL__, __LINE__, stat_return, 
-                               MSG_FI_LSTAT,
+                               MSG_FI_STAT,
+                               _("lstat"),
                                sh_error_message (stat_return,errbuf, sizeof(errbuf)), 
+                               (long) euid,
                                tmp2);
             }