Changeset 379 for trunk/src/sh_tools.c

Timestamp:

Nov 28, 2011, 9:56:30 PM (13 years ago)

Author:

katerina

Message:

Fix for ticket #277 (sigpipe).

File:

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

trunk/src/sh_tools.c

@@ -1046 +1046 @@
   int    num_sel;
   
-  struct  sigaction  new_act;
-  struct  sigaction  old_act;
   char    errbuf[SH_ERRBUF_SIZE];
 
   SL_ENTER(_("sh_write_select"));
 
-  /* ignore SIGPIPE (instead get EPIPE if connection is closed)
-   */
-  new_act.sa_handler = SIG_IGN;
-  sigemptyset( &new_act.sa_mask );         /* set an empty mask       */
-  new_act.sa_flags = 0;                    /* init sa_flags           */
-  sigaction (SIGPIPE, &new_act, &old_act);
-  
   FD_ZERO(&fds);
   FD_SET(sockfd, &fds);
@@ -1086 +1077 @@
               continue;
             *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,
@@ -1107 +1098 @@
               continue;
             *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,
@@ -1136 +1127 @@
             *w_error = 0;
 #endif
-            sigaction (SIGPIPE, &old_act, NULL);
+
             TPT(( 0, FIL__, __LINE__, _("msg=<Timeout>\n")));
             SL_RETURN( countbytes, _("sh_write_select"));
@@ -1162 +1153 @@
           {
             *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,
@@ -1174 +1165 @@
           {
             *w_error = errno;
-            sigaction (SIGPIPE, &old_act, NULL);
+
             TPT(( 0, FIL__, __LINE__, _("msg=<count == 0>\n")));
             SL_RETURN( countbytes, _("sh_write_select"));
@@ -1180 +1171 @@
       }
   }
-
-
-  /* restore signal handler
-   */
-  sigaction (SIGPIPE, &old_act, NULL);
 
   *w_error = 0;