Re: CVS commit: src (dist/ipf/ipsend/sock.c:1.15)

[Bernd Ernesti <netbsd%lists.veego.de@localhost>]

On Fri, May 29, 2009 at 10:10:08AM +1000, Geoff Wing wrote:
> On Monday 2009-05-25 00:15 +0200, Bernd Ernesti output:
> :On Sun, May 24, 2009 at 09:41:44PM +0000, Andrew Doran wrote:
> :> Committed By:      ad
> :> Date:              Sun May 24 21:41:44 UTC 2009
> :> Modified Files:
> :>    src/dist/ipf/ipsend: sock.c
> :>    src/usr.bin/fstat: fstat.c
> :> Log Message:
> :> More changes to improve kern_descrip.c.
> :
> :Hmm, is the __NetBSD__Version__ check correct in src/dist/ipf/ipsend/sock.c ?
> :It looks revered. You added some new code, but the check enables
> :the old code for -current.
> :IMHO the
> : __NetBSD__Version__ >= 599001200
> :should be changed to
> : __NetBSD__Version__ < 599001200
> 
> This one seems to have fallen through the cracks.  It works for current
> since the variable isn't spelt correctly.

Ah, I was wondering why that version check didn't cause more problems.

> Regards,
> Geoff
> 
> Index: dist/ipf/ipsend/sock.c
> ===================================================================
> RCS file: /cvsroot/src/dist/ipf/ipsend/sock.c,v
> retrieving revision 1.15
> diff -u -r1.15 sock.c
> --- dist/ipf/ipsend/sock.c    24 May 2009 21:41:44 -0000      1.15
> +++ dist/ipf/ipsend/sock.c    29 May 2009 00:05:45 -0000
> @@ -329,7 +329,7 @@
>       t = NULL;
>  
>       o = (struct file **)calloc(1, sizeof(*o) * (fd->fd_lastfile + 1));
> -#if defined(__NetBSD_Version__)  && __NetBSD__Version__ >= 599001200
> +#if defined(__NetBSD_Version__)  && __NetBSD_Version__ < 599001200
>       if (KMCPY(o, fd->fd_ofiles, (fd->fd_lastfile + 1) * sizeof(*o)) == -1)
>           {
>               fprintf(stderr, "read(%#lx,%#lx,%lu) - u_ofile - failed\n",

That looks correct, but I haven't updated my source tree so I can't test
it at the moment.

Bernd