X-Git-Url: https://git.distorted.org.uk/~mdw/adns/blobdiff_plain/36369543b62cd8922a096f7877036ec8497bc5a9..ac868fa87da18cdebb86103b35ce250bd171f700:/src/general.c

diff --git a/src/general.c b/src/general.c
index 45aec68..b701b9f 100644
--- a/src/general.c
+++ b/src/general.c
@@ -4,7 +4,7 @@
  * - vbuf handling
  */
 /*
- *  This file is part of adns, which is Copyright (C) 1997, 1998 Ian Jackson
+ *  This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -254,13 +254,15 @@ const char *adns_strerror(adns_status st) {
 }
 
 void adns__isort(void *array, int nobjs, int sz, void *tempbuf,
-		 int (*needswap)(const void *a, const void *b)) {
+		 int (*needswap)(void *context, const void *a, const void *b),
+		 void *context) {
   byte *data= array;
   int i, place;
 
   for (i=0; i<nobjs; i++) {
-    for (place= i; place>0 && needswap(data + (place-1)*sz, data + i*sz); place--);
-
+    for (place= i;
+	 place>0 && needswap(context, data + (place-1)*sz, data + i*sz);
+	 place--);
     if (place != i) {
       memcpy(tempbuf, data + i*sz, sz);
       memmove(data + (place+1)*sz, data + place*sz, (i-place)*sz);
@@ -268,3 +270,32 @@ void adns__isort(void *array, int nobjs, int sz, void *tempbuf,
     }
   }
 }
+
+/* SIGPIPE protection. */
+
+void adns__sigpipe_protect(adns_state ads) {
+  sigset_t toblock;
+  struct sigaction sa;
+  int r;
+
+  if (ads->iflags & adns_if_nosigpipe) return;
+
+  sigfillset(&toblock);
+  sigdelset(&toblock,SIGPIPE);
+
+  sa.sa_handler= SIG_IGN;
+  sigfillset(&sa.sa_mask);
+  sa.sa_flags= 0;
+  
+  r= sigprocmask(SIG_SETMASK,&toblock,&ads->stdsigmask); assert(!r);
+  r= sigaction(SIGPIPE,&sa,&ads->stdsigpipe); assert(!r);
+}
+
+void adns__sigpipe_unprotect(adns_state ads) {
+  int r;
+
+  if (ads->iflags & adns_if_nosigpipe) return;
+
+  r= sigaction(SIGPIPE,&ads->stdsigpipe,0); assert(!r);
+  r= sigprocmask(SIG_SETMASK,&ads->stdsigmask,0); assert(!r);
+}