Changeset 192 for trunk/src/sh_tiger0.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_tiger0.c (modified) (6 diffs)

trunk/src/sh_tiger0.c

@@ -223 +223 @@
         if (SL_ISERROR (count)) 
           {
+            int error = errno;
+
             if (sig_termfast == 1) {
               sh_unix_munlock((char *)buffer, (PRIV_MAX)*sizeof(sh_byte));
@@ -239 +241 @@
               }
             else
-              sh_error_handle (ShDFLevel[SH_ERR_T_FILE], FIL__, __LINE__, 
-                               count, MSG_E_READ, tmp);
+              {
+                char errbuf[SH_ERRBUF_SIZE];
+                char errbuf2[SH_ERRBUF_SIZE];
+                sl_strlcpy(errbuf, sl_error_string(count), sizeof(errbuf));
+                sh_error_message(error, errbuf2, sizeof(errbuf2));
+                sh_error_handle (ShDFLevel[SH_ERR_T_FILE], FIL__, __LINE__, 
+                                 count, MSG_E_READ, errbuf, errbuf2, tmp);
+              }
             SH_FREE(tmp);
             memset (bbuf,   0, 64);
@@ -894 +902 @@
       if (SL_ISERROR (n))
         {
+          int error = errno;
+
           if (sig_termfast == 1)
             {
@@ -909 +919 @@
             }
           else
-            sh_error_handle (ShDFLevel[SH_ERR_T_FILE], FIL__, __LINE__, n,
-                             MSG_E_READ, tmp);
+            {
+              char errbuf[SH_ERRBUF_SIZE];
+              char errbuf2[SH_ERRBUF_SIZE];
+              sl_strlcpy(errbuf, sl_error_string(n), sizeof(errbuf));
+              sh_error_message(error, errbuf2, sizeof(errbuf2));
+              sh_error_handle (ShDFLevel[SH_ERR_T_FILE], FIL__, __LINE__, n,
+                               MSG_E_READ, errbuf, errbuf2, tmp);
+            }
           SH_FREE(tmp);
           *Length = 0;
@@ -1424 +1440 @@
       if (SL_ISERROR (n))
         {
+          int error = errno;
+
           if (sig_termfast == 1)
             {
@@ -1441 +1459 @@
           else 
             {
+              char errbuf[SH_ERRBUF_SIZE];
+              char errbuf2[SH_ERRBUF_SIZE];
+              sl_strlcpy(errbuf, sl_error_string(n), sizeof(errbuf));
+              sh_error_message(error, errbuf2, sizeof(errbuf2));
               sh_error_handle (ShDFLevel[SH_ERR_T_FILE], FIL__, __LINE__, n,
-                               MSG_E_READ, tmp);
+                               MSG_E_READ, errbuf, errbuf2, tmp);
             }
           SH_FREE(tmp);