Return-Path: Delivered-To: apmail-jakarta-commons-dev-archive@www.apache.org Received: (qmail 19194 invoked from network); 31 Dec 2003 05:03:30 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 31 Dec 2003 05:03:30 -0000 Received: (qmail 52298 invoked by uid 500); 31 Dec 2003 05:03:08 -0000 Delivered-To: apmail-jakarta-commons-dev-archive@jakarta.apache.org Received: (qmail 52243 invoked by uid 500); 31 Dec 2003 05:03:06 -0000 Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Jakarta Commons Developers List" Reply-To: "Jakarta Commons Developers List" Delivered-To: mailing list commons-dev@jakarta.apache.org Received: (qmail 52230 invoked by uid 500); 31 Dec 2003 05:03:06 -0000 Received: (qmail 52227 invoked from network); 31 Dec 2003 05:03:06 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 31 Dec 2003 05:03:06 -0000 Received: (qmail 19175 invoked by uid 1385); 31 Dec 2003 05:03:26 -0000 Date: 31 Dec 2003 05:03:26 -0000 Message-ID: <20031231050326.19174.qmail@minotaur.apache.org> From: billbarker@apache.org To: jakarta-commons-cvs@apache.org Subject: cvs commit: jakarta-commons/daemon/src/native/unix/native jsvc-unix.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N billbarker 2003/12/30 21:03:26 Modified: daemon/src/native/unix/native jsvc-unix.c Log: Fix problems with signal handling on Solaris (possibly others). Fix for Bug #24247 Reported By: Peter Poloha peter.poloha@nextra.sk Revision Changes Path 1.8 +4 -4 jakarta-commons/daemon/src/native/unix/native/jsvc-unix.c Index: jsvc-unix.c =================================================================== RCS file: /home/cvs/jakarta-commons/daemon/src/native/unix/native/jsvc-unix.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- jsvc-unix.c 27 Sep 2003 16:49:13 -0000 1.7 +++ jsvc-unix.c 31 Dec 2003 05:03:25 -0000 1.8 @@ -271,10 +271,10 @@ /* * Return the address of the current signal handler and set the new one. */ -static void * signal_set(int sig, void * handler) { +static void * signal_set(int sig, void * newHandler) { void *hand; - hand=signal(sig,handler); + hand=signal(sig,newHandler); #ifdef SIG_ERR if (hand==SIG_ERR) hand=NULL; @@ -350,7 +350,7 @@ /* Install signal handlers */ handler_hup=signal_set(SIGHUP,handler); handler_trm=signal_set(SIGTERM,handler); - handler_trm=signal_set(SIGINT,handler); + handler_int=signal_set(SIGINT,handler); controlled = getpid(); log_debug("Waiting for a signal to be delivered"); while (!stopping) sleep(60); /* pause() not threadsafe */ --------------------------------------------------------------------- To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: commons-dev-help@jakarta.apache.org