From 540cfa70e8e8b4db3cc2addccfcbeeb69fffa033 Mon Sep 17 00:00:00 2001 From: victor Date: Fri, 10 Sep 2004 00:49:47 +0000 Subject: merge back from branch victor.solaris git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@2189 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- innbbsd/connectsock.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'innbbsd/connectsock.c') diff --git a/innbbsd/connectsock.c b/innbbsd/connectsock.c index 1c401dbc..f61ff160 100644 --- a/innbbsd/connectsock.c +++ b/innbbsd/connectsock.c @@ -2,6 +2,7 @@ #include "daemon.h" #include #include +#include "osdep.h" static jmp_buf timebuf; @@ -112,12 +113,12 @@ initunixserver(path, protocol) return -1; } /* standalonesetup(s); */ - signal(SIGHUP, SIG_IGN); - signal(SIGUSR1, SIG_IGN); - signal(SIGCHLD, reapchild); + Signal(SIGHUP, SIG_IGN); + Signal(SIGUSR1, SIG_IGN); + Signal(SIGCHLD, reapchild); UNIX_SERVER_PATH = path; - signal(SIGINT, doremove); - signal(SIGTERM, doremove); + Signal(SIGINT, doremove); + Signal(SIGTERM, doremove); chdir("/"); if (bind(s, (struct sockaddr *) & s_un, sizeof(struct sockaddr_un)) < 0) { @@ -176,11 +177,11 @@ initinetserver(service, protocol) return -1; } standalonesetup(s); - signal(SIGHUP, SIG_IGN); - signal(SIGUSR1, SIG_IGN); - signal(SIGCHLD, reapchild); - signal(SIGINT, dokill); - signal(SIGTERM, dokill); + Signal(SIGHUP, SIG_IGN); + Signal(SIGUSR1, SIG_IGN); + Signal(SIGCHLD, reapchild); + Signal(SIGINT, dokill); + Signal(SIGTERM, dokill); chdir("/"); if (bind(s, (struct sockaddr *) & sin, sizeof(struct sockaddr_in)) < 0) { @@ -404,7 +405,7 @@ inetclient(server, service, protocol) return -1; } if (setjmp(timebuf) == 0) { - signal(SIGALRM, timeout); + Signal(SIGALRM, timeout); alarm(5); if (connect(s, (struct sockaddr *) & sin, sizeof(sin)) < 0) { alarm(0); -- cgit v1.2.3