Changeset 171 for trunk/src/sh_tools.c

Timestamp:

Jul 8, 2008, 11:16:14 AM (16 years ago)

Author:

katerina

Message:

Include dnmalloc (ticket #108) and fix bugs #106 (EINPROGRESS) and #107 (compressBound).

File:

• trunk/src/sh_tools.c (modified) (4 diffs)

trunk/src/sh_tools.c

@@ -725 +725 @@
   struct  sigaction  new_act;
   struct  sigaction  old_act;
-#if defined(WITH_TPT) 
   char    errbuf[SH_ERRBUF_SIZE];
-#endif
 
   SL_ENTER(_("sh_write_select"));
@@ -762 +760 @@
                 continue;
               }
-            if ( errno == EINTR) /* try again */
+            if ( errno == EINTR || errno == EINPROGRESS ) /* try again */
               continue;
             *w_error = errno;
-            TPT(( 0, FIL__, __LINE__, _("msg=<select: %s>\n"), 
-                  sh_error_message(*w_error, errbuf, sizeof(errbuf))));
             sigaction (SIGPIPE, &old_act, NULL);
+            sh_error_message(*w_error, errbuf, sizeof(errbuf));
+            sh_error_handle (SH_ERR_INFO, FIL__, __LINE__, errno, MSG_E_SUBGEN,
+                             errbuf,
+                             _("sh_write_select (ws)") ); 
+            TPT(( 0, FIL__, __LINE__, _("msg=<select: %s>\n"), errbuf ));
             SL_RETURN( countbytes, _("sh_write_select"));
           }
@@ -780 +781 @@
                 continue;
               }
-            if ( errno == EINTR ) /* try again */
+            if ( errno == EINTR || errno == EINPROGRESS ) /* try again */
               continue;
             *w_error = errno;
-            TPT(( 0, FIL__, __LINE__, _("msg=<select: %s>\n"), 
-                  sh_error_message(*w_error, errbuf, sizeof(errbuf))));
             sigaction (SIGPIPE, &old_act, NULL);
+            sh_error_message(*w_error, errbuf, sizeof(errbuf));
+            sh_error_handle (SH_ERR_INFO, FIL__, __LINE__, errno, MSG_E_SUBGEN,
+                             errbuf,
+                             _("sh_write_select (rs)") ); 
+            TPT(( 0, FIL__, __LINE__, _("msg=<select: %s>\n"), errbuf ));
             SL_RETURN( countbytes, _("sh_write_select"));
           }
@@ -836 +840 @@
             *w_error = errno;
             sigaction (SIGPIPE, &old_act, NULL);
+            sh_error_message(*w_error, errbuf, sizeof(errbuf));
+            sh_error_handle (SH_ERR_INFO, FIL__, __LINE__, errno, MSG_E_SUBGEN,
+                             errbuf,
+                             (type == SH_DO_WRITE) ? 
+                             _("sh_write_select (w)") : _("sh_write_select (r)")); 
             TPT(( 0, FIL__, __LINE__, _("msg=<count < 0>\n")));
             SL_RETURN( countbytes, _("sh_write_select"));