Date: Wed, 29 Sep 1999 21:18:04 +0200 From: Marcel Moolenaar <marcel@scc.nl> To: John Polstra <jdp@polstra.com> Cc: current@freebsd.org Subject: Re: HEADS UP: sigset_t changes committed Message-ID: <37F265EC.715E5DD@scc.nl> References: <XFMail.990929115722.jdp@polstra.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?37F265EC.715E5DD>