37c37
< * $Id: nfsm_subs.h,v 1.23 1999/06/05 05:35:03 peter Exp $
---
> * $Id: nfsm_subs.h,v 1.24 1999/06/23 04:44:14 julian Exp $
422c422,423
< { int fhlen = NFSX_V3FH; \
---
> do { \
> int fhlen; \
426,428c427
< if (fhlen == 0) { \
< bzero((caddr_t)(f), NFSX_V3FH); \
< } else if (fhlen != NFSX_V3FH) { \
---
> if (fhlen != 0 && fhlen != NFSX_V3FH) { \
431a431,432
> } else { \
> fhlen = NFSX_V2FH; \
434,437c435,438
< nfsm_dissect(tl, u_int32_t *, NFSX_V3FH); \
< bcopy((caddr_t)tl, (caddr_t)(f), NFSX_V3FH); \
< if ((nfsd->nd_flag & ND_NFSV3) == 0) \
< nfsm_adv(NFSX_V2FH - NFSX_V3FH); \
---
> nfsm_dissect(tl, u_int32_t *, fhlen); \
> bcopy((caddr_t)tl, (caddr_t)(f), fhlen); \
> } else {\
> bzero((caddr_t)(f), NFSX_V3FH); \
439c440
< }
---
> } while (0)