From owner-freebsd-current Wed Sep 29 12:19:28 1999 Delivered-To: freebsd-current@freebsd.org Received: from post.mail.nl.demon.net (post-10.mail.nl.demon.net [194.159.73.20]) by hub.freebsd.org (Postfix) with ESMTP id 3E95B158D2 for ; Wed, 29 Sep 1999 12:18:14 -0700 (PDT) (envelope-from marcel@scc.nl) Received: from [212.238.132.94] (helo=scones.sup.scc.nl) by post.mail.nl.demon.net with esmtp (Exim 2.02 #1) id 11WPEy-00079M-00; Wed, 29 Sep 1999 19:18:12 +0000 Received: from scc.nl (scones.sup.scc.nl [192.168.2.4]) by scones.sup.scc.nl (8.9.3/8.9.3) with ESMTP id VAA18507; Wed, 29 Sep 1999 21:18:04 +0200 (CEST) (envelope-from marcel@scc.nl) Message-ID: <37F265EC.715E5DD@scc.nl> Date: Wed, 29 Sep 1999 21:18:04 +0200 From: Marcel Moolenaar Organization: SCC vof X-Mailer: Mozilla 4.61 [en] (X11; I; Linux 2.2.5 i386) X-Accept-Language: en MIME-Version: 1.0 To: John Polstra Cc: current@freebsd.org Subject: Re: HEADS UP: sigset_t changes committed References: Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG John Polstra wrote: > > Marcel Moolenaar wrote: > > John Polstra wrote: > >> strip > >> # doscmd \ > >> .endif > > > > It doesn't give me any problems... > > Weird! It doesn't seem like the Alpha make should be different. As a first "guess": Either sendsig/sigreturn or setjmp/longjmp caused this... > Yes, I agree. The old code also assumed it wouldn't be 0. Ok, this should do it. If it looks good to you, I'll commit this... Index: nfs_socket.c =================================================================== RCS file: /home/ncvs/src/sys/nfs/nfs_socket.c,v retrieving revision 1.55 diff -u -r1.55 nfs_socket.c --- nfs_socket.c 1999/09/29 15:03:47 1.55 +++ nfs_socket.c 1999/09/29 18:58:13 @@ -1504,15 +1504,19 @@ { sigset_t tmpset; - tmpset = p->p_siglist; - SIGSETNAND(tmpset, p->p_sigmask); - SIGSETNAND(tmpset, p->p_sigignore); if (rep && (rep->r_flags & R_SOFTTERM)) return (EINTR); if (!(nmp->nm_flag & NFSMNT_INT)) + return (0); + if (p == NULL) return (0); - if (p && SIGNOTEMPTY(p->p_siglist) && NFSINT_SIGMASK(tmpset)) + + tmpset = p->p_siglist; + SIGSETNAND(tmpset, p->p_sigmask); + SIGSETNAND(tmpset, p->p_sigignore); + if (SIGNOTEMPTY(p->p_siglist) && NFSINT_SIGMASK(tmpset)) return (EINTR); + return (0); } -- Marcel Moolenaar mailto:marcel@scc.nl SCC Internetworking & Databases http://www.scc.nl/ The FreeBSD project mailto:marcel@FreeBSD.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message