Commit e64f91fe authored by Jeff King's avatar Jeff King Committed by Daniel Stenberg
Browse files

sigpipe: factor out sigpipe_reset from easy.c 



Commit 7d80ed64 introduced some helpers to handle
sigpipe in easy.c. However, that fix was incomplete, and we
need to add more callers in other files. The first step is
making the helpers globally accessible.

Since the functions are small and should generally end up
inlined anyway, we simply define them in the header as
static functions.

Signed-off-by: default avatarJeff King <peff@peff.net>
parent b2a55c81

lib/Makefile.inc

+1 −1
Original line number Diff line number Diff line
@@ -46,4 +46,4 @@ HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h \ 
  curl_ntlm_msgs.h curl_sasl.h curl_schannel.h curl_multibyte.h		\

  curl_darwinssl.h hostcheck.h bundles.h conncache.h curl_setup_once.h	\

  multihandle.h setup-vms.h pipeline.h dotdot.h x509asn1.h gskit.h	\

  http2.h
 
  http2.h sigpipe.h

lib/easy.c

+1 −55
Original line number Diff line number Diff line
@@ -50,11 +50,6 @@ 
#include <sys/param.h>

#endif



#if defined(HAVE_SIGNAL_H) && defined(HAVE_SIGACTION) && defined(USE_OPENSSL)

#define SIGPIPE_IGNORE 1

#include <signal.h>

#endif



#include "strequal.h"

#include "urldata.h"

#include <curl/curl.h>
@@ -78,6 +73,7 @@ 
#include "warnless.h"

#include "conncache.h"

#include "multiif.h"

#include "sigpipe.h"



#define _MPRINTF_REPLACE /* use our functions only */

#include <curl/mprintf.h>
@@ -85,56 +81,6 @@ 
/* The last #include file should be: */

#include "memdebug.h"



#ifdef SIGPIPE_IGNORE

struct sigpipe_ignore {

  struct sigaction old_pipe_act;

  bool no_signal;

};



#define SIGPIPE_VARIABLE(x) struct sigpipe_ignore x



/*

 * sigpipe_ignore() makes sure we ignore SIGPIPE while running libcurl

 * internals, and then sigpipe_restore() will restore the situation when we

 * return from libcurl again.

 */

static void sigpipe_ignore(struct SessionHandle *data,

                           struct sigpipe_ignore *ig)

{

  /* get a local copy of no_signal because the SessionHandle might not be

     around when we restore */

  ig->no_signal = data->set.no_signal;

  if(!data->set.no_signal) {

    struct sigaction action;

    /* first, extract the existing situation */

    memset(&ig->old_pipe_act, 0, sizeof(struct sigaction));

    sigaction(SIGPIPE, NULL, &ig->old_pipe_act);

    action = ig->old_pipe_act;

    /* ignore this signal */

    action.sa_handler = SIG_IGN;

    sigaction(SIGPIPE, &action, NULL);

  }

}



/*

 * sigpipe_restore() puts back the outside world's opinion of signal handler

 * and SIGPIPE handling. It MUST only be called after a corresponding

 * sigpipe_ignore() was used.

 */

static void sigpipe_restore(struct sigpipe_ignore *ig)

{

  if(!ig->no_signal)

    /* restore the outside state */

    sigaction(SIGPIPE, &ig->old_pipe_act, NULL);

}



#else

/* for systems without sigaction */

#define sigpipe_ignore(x,y) Curl_nop_stmt

#define sigpipe_restore(x)  Curl_nop_stmt

#define SIGPIPE_VARIABLE(x)

#endif



/* win32_cleanup() is for win32 socket cleanup functionality, the opposite

   of win32_init() */

static void win32_cleanup(void)

lib/sigpipe.h

0 → 100644
+78 −0
Original line number Diff line number Diff line 
#ifndef HEADER_CURL_SIGPIPE_H

#define HEADER_CURL_SIGPIPE_H

/***************************************************************************

 *                                  _   _ ____  _

 *  Project                     ___| | | |  _ \| |

 *                             / __| | | | |_) | |

 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms

 * are also available at http://curl.haxx.se/docs/copyright.html.

 *

 * You may opt to use, copy, modify, merge, publish, distribute and/or sell

 * copies of the Software, and permit persons to whom the Software is

 * furnished to do so, under the terms of the COPYING file.

 *

 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY

 * KIND, either express or implied.

 *

 ***************************************************************************/

#include "curl_setup.h"



#if defined(HAVE_SIGNAL_H) && defined(HAVE_SIGACTION) && defined(USE_OPENSSL)

#include <signal.h>



struct sigpipe_ignore {

  struct sigaction old_pipe_act;

  bool no_signal;

};



#define SIGPIPE_VARIABLE(x) struct sigpipe_ignore x



/*

 * sigpipe_ignore() makes sure we ignore SIGPIPE while running libcurl

 * internals, and then sigpipe_restore() will restore the situation when we

 * return from libcurl again.

 */

static void sigpipe_ignore(struct SessionHandle *data,

                           struct sigpipe_ignore *ig)

{

  /* get a local copy of no_signal because the SessionHandle might not be

     around when we restore */

  ig->no_signal = data->set.no_signal;

  if(!data->set.no_signal) {

    struct sigaction action;

    /* first, extract the existing situation */

    memset(&ig->old_pipe_act, 0, sizeof(struct sigaction));

    sigaction(SIGPIPE, NULL, &ig->old_pipe_act);

    action = ig->old_pipe_act;

    /* ignore this signal */

    action.sa_handler = SIG_IGN;

    sigaction(SIGPIPE, &action, NULL);

  }

}



/*

 * sigpipe_restore() puts back the outside world's opinion of signal handler

 * and SIGPIPE handling. It MUST only be called after a corresponding

 * sigpipe_ignore() was used.

 */

static void sigpipe_restore(struct sigpipe_ignore *ig)

{

  if(!ig->no_signal)

    /* restore the outside state */

    sigaction(SIGPIPE, &ig->old_pipe_act, NULL);

}



#else

/* for systems without sigaction */

#define sigpipe_ignore(x,y) Curl_nop_stmt

#define sigpipe_restore(x)  Curl_nop_stmt

#define SIGPIPE_VARIABLE(x)

#endif



#endif /* HEADER_CURL_SIGPIPE_H */