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:[EMAIL PROTECTED]
SCC Internetworking & Databases           http://www.scc.nl/
The FreeBSD project                mailto:[EMAIL PROTECTED]


To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message

Reply via email to