CVS commit: src
Module Name:src Committed By: njoly Date: Tue Feb 4 08:08:59 UTC 2014 Modified Files: src/distrib/sets/lists/tests: mi src/tests/usr.bin/xlint/lint1: Makefile t_integration.sh src/usr.bin/xlint/lint1: cgram.y Added Files: src/tests/usr.bin/xlint/lint1: d_c99_decls_after_stmt3.c Log Message: Handle another declaration after statement case for lint in c99 mode. Add the corresponding testcase. To generate a diff of this commit: cvs rdiff -u -r1.561 -r1.562 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/Makefile \ src/tests/usr.bin/xlint/lint1/t_integration.sh cvs rdiff -u -r0 -r1.1 \ src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt3.c cvs rdiff -u -r1.56 -r1.57 src/usr.bin/xlint/lint1/cgram.y Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.561 src/distrib/sets/lists/tests/mi:1.562 --- src/distrib/sets/lists/tests/mi:1.561 Sat Feb 1 20:49:11 2014 +++ src/distrib/sets/lists/tests/mi Tue Feb 4 08:08:59 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.561 2014/02/01 20:49:11 jmmv Exp $ +# $NetBSD: mi,v 1.562 2014/02/04 08:08:59 njoly Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -3101,6 +3101,7 @@ ./usr/tests/usr.bin/xlint/lint1/d_c99_complex_num.c tests-usr.bin-tests atf ./usr/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt.c tests-usr.bin-tests atf ./usr/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt2.c tests-usr.bin-tests atf +./usr/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt3.c tests-usr.bin-tests atf ./usr/tests/usr.bin/xlint/lint1/d_c99_for_loops.c tests-usr.bin-tests atf ./usr/tests/usr.bin/xlint/lint1/d_c99_func.c tests-usr.bin-tests atf ./usr/tests/usr.bin/xlint/lint1/d_c99_recursive_init.c tests-usr.bin-tests atf Index: src/tests/usr.bin/xlint/lint1/Makefile diff -u src/tests/usr.bin/xlint/lint1/Makefile:1.1 src/tests/usr.bin/xlint/lint1/Makefile:1.2 --- src/tests/usr.bin/xlint/lint1/Makefile:1.1 Sat Mar 17 16:33:15 2012 +++ src/tests/usr.bin/xlint/lint1/Makefile Tue Feb 4 08:08:59 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:15 jruoho Exp $ +# $NetBSD: Makefile,v 1.2 2014/02/04 08:08:59 njoly Exp $ NOMAN= # defined @@ -13,6 +13,7 @@ FILES+= d_alignof.c FILES+= d_c99_complex_num.c FILES+= d_c99_decls_after_stmt.c FILES+= d_c99_decls_after_stmt2.c +FILES+= d_c99_decls_after_stmt3.c FILES+= d_c99_for_loops.c FILES+= d_c99_func.c FILES+= d_c99_recursive_init.c Index: src/tests/usr.bin/xlint/lint1/t_integration.sh diff -u src/tests/usr.bin/xlint/lint1/t_integration.sh:1.1 src/tests/usr.bin/xlint/lint1/t_integration.sh:1.2 --- src/tests/usr.bin/xlint/lint1/t_integration.sh:1.1 Sat Mar 17 16:33:16 2012 +++ src/tests/usr.bin/xlint/lint1/t_integration.sh Tue Feb 4 08:08:59 2014 @@ -1,4 +1,4 @@ -# $NetBSD: t_integration.sh,v 1.1 2012/03/17 16:33:16 jruoho Exp $ +# $NetBSD: t_integration.sh,v 1.2 2014/02/04 08:08:59 njoly Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -82,6 +82,7 @@ test_case check_valid gcc_variable_array initializers test_case check_valid c9x_array_init Checks C9X array initializers test_case check_valid c99_decls_after_stmt Checks C99 decls after statements +test_case check_valid c99_decls_after_stmt3 Checks C99 decls after statements test_case check_valid nolimit_init Checks no limit initializers test_case check_valid zero_sized_arrays Checks zero sized arrays Index: src/usr.bin/xlint/lint1/cgram.y diff -u src/usr.bin/xlint/lint1/cgram.y:1.56 src/usr.bin/xlint/lint1/cgram.y:1.57 --- src/usr.bin/xlint/lint1/cgram.y:1.56 Thu Jan 16 00:43:43 2014 +++ src/usr.bin/xlint/lint1/cgram.y Tue Feb 4 08:08:59 2014 @@ -1,5 +1,5 @@ %{ -/* $NetBSD: cgram.y,v 1.56 2014/01/16 00:43:43 christos Exp $ */ +/* $NetBSD: cgram.y,v 1.57 2014/02/04 08:08:59 njoly Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved. @@ -35,7 +35,7 @@ #include sys/cdefs.h #if defined(__RCSID) !defined(lint) -__RCSID($NetBSD: cgram.y,v 1.56 2014/01/16 00:43:43 christos Exp $); +__RCSID($NetBSD: cgram.y,v 1.57 2014/02/04 08:08:59 njoly Exp $); #endif #include stdlib.h @@ -1340,7 +1340,7 @@ stmnt_d_list: comp_stmnt: comp_stmnt_lbrace comp_stmnt_rbrace - | comp_stmnt_lbrace stmnt_list comp_stmnt_rbrace + | comp_stmnt_lbrace stmnt_d_list comp_stmnt_rbrace | comp_stmnt_lbrace declaration_list comp_stmnt_rbrace | comp_stmnt_lbrace declaration_list stmnt_d_list comp_stmnt_rbrace ; Added files: Index: src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt3.c diff -u /dev/null src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt3.c:1.1 --- /dev/null Tue Feb 4 08:08:59 2014 +++ src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt3.c Tue Feb 4 08:08:59 2014 @@ -0,0 +1,5 @@
CVS commit: xsrc/external/mit/xf86-video-siliconmotion/dist/src
Module Name:xsrc Committed By: macallan Date: Tue Feb 4 09:56:25 UTC 2014 Modified Files: xsrc/external/mit/xf86-video-siliconmotion/dist/src: smi.h Log Message: #define __BYTE_ORDER BYTE_ORDER etc. now endianness detection actually works and colours look right on my Gdium To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi.h diff -u xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi.h:1.3 xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi.h:1.4 --- xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi.h:1.3 Mon Jun 3 08:50:48 2013 +++ xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi.h Tue Feb 4 09:56:25 2014 @@ -68,6 +68,12 @@ authorization from the XFree86 Project a /* D E F I N I T I O N S */ /**/ +#ifdef __NetBSD__ +#define __BYTE_ORDER BYTE_ORDER +#define __LITTLE_ENDIAN LITTLE_ENDIAN +#define __BIG_ENDIAN BIG_ENDIAN +#endif + #ifndef SMI_DEBUG #define SMI_DEBUG 0 #endif
CVS commit: src/sys/arch
Module Name:src Committed By: matt Date: Tue Feb 4 18:51:16 UTC 2014 Modified Files: src/sys/arch/arm/at91: at91intr.h src/sys/arch/arm/footbridge: footbridge_intr.h src/sys/arch/arm/include/arm32: psl.h src/sys/arch/arm/ixp12x0: ixp12x0_intr.h src/sys/arch/arm/omap: omap_intr.c omap_intr.h src/sys/arch/arm/xscale: becc_intr.h i80321_intr.h pxa2x0_intr.h src/sys/arch/evbarm/include: intr.h src/sys/arch/hpcarm/include: intr.h Log Message: _setsoftintr is long dead. reap any leftovers from arm. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/at91/at91intr.h cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/footbridge/footbridge_intr.h cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/include/arm32/psl.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/ixp12x0/ixp12x0_intr.h cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/omap/omap_intr.c \ src/sys/arch/arm/omap/omap_intr.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/xscale/becc_intr.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/xscale/i80321_intr.h cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/xscale/pxa2x0_intr.h cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbarm/include/intr.h cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hpcarm/include/intr.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/at91/at91intr.h diff -u src/sys/arch/arm/at91/at91intr.h:1.3 src/sys/arch/arm/at91/at91intr.h:1.4 --- src/sys/arch/arm/at91/at91intr.h:1.3 Fri Oct 23 06:53:13 2009 +++ src/sys/arch/arm/at91/at91intr.h Tue Feb 4 18:51:16 2014 @@ -1,5 +1,5 @@ -/* $Id: at91intr.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */ -/* $NetBSD: at91intr.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */ +/* $Id: at91intr.h,v 1.4 2014/02/04 18:51:16 matt Exp $ */ +/* $NetBSD: at91intr.h,v 1.4 2014/02/04 18:51:16 matt Exp $ */ /* * Copyright (c) 2007 Embedtronics Oy. @@ -41,7 +41,6 @@ int _splraise(int); int _spllower(int); void splx(int); -void _setsoftintr(int); #endif /* ! _LOCORE */ Index: src/sys/arch/arm/footbridge/footbridge_intr.h diff -u src/sys/arch/arm/footbridge/footbridge_intr.h:1.15 src/sys/arch/arm/footbridge/footbridge_intr.h:1.16 --- src/sys/arch/arm/footbridge/footbridge_intr.h:1.15 Sun Jun 10 13:15:24 2012 +++ src/sys/arch/arm/footbridge/footbridge_intr.h Tue Feb 4 18:51:16 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: footbridge_intr.h,v 1.15 2012/06/10 13:15:24 skrll Exp $ */ +/* $NetBSD: footbridge_intr.h,v 1.16 2014/02/04 18:51:16 matt Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -141,14 +141,12 @@ footbridge_spllower(int ipl) #define splx(newspl) footbridge_splx(newspl) #define _spllower(ipl) footbridge_spllower(ipl) #define _splraise(ipl) footbridge_splraise(ipl) -void _setsoftintr(int); #else int _splraise(int); int _spllower(int); void splx(int); -void _setsoftintr(int); #endif /* ! ARM_SPL_NOINLINE */ Index: src/sys/arch/arm/include/arm32/psl.h diff -u src/sys/arch/arm/include/arm32/psl.h:1.19 src/sys/arch/arm/include/arm32/psl.h:1.20 --- src/sys/arch/arm/include/arm32/psl.h:1.19 Fri Jul 27 05:36:09 2012 +++ src/sys/arch/arm/include/arm32/psl.h Tue Feb 4 18:51:16 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: psl.h,v 1.19 2012/07/27 05:36:09 matt Exp $ */ +/* $NetBSD: psl.h,v 1.20 2014/02/04 18:51:16 matt Exp $ */ /* * Copyright (c) 1995 Mark Brinicombe. @@ -70,10 +70,6 @@ int raisespl (int); int lowerspl (int); void splx (int); -#ifdef __HAVE_FAST_SOFTINTS -void _setsoftintr (int si); -#endif - typedef uint8_t ipl_t; typedef struct { uint8_t _ipl; Index: src/sys/arch/arm/ixp12x0/ixp12x0_intr.h diff -u src/sys/arch/arm/ixp12x0/ixp12x0_intr.h:1.2 src/sys/arch/arm/ixp12x0/ixp12x0_intr.h:1.3 --- src/sys/arch/arm/ixp12x0/ixp12x0_intr.h:1.2 Tue Jan 8 02:07:51 2008 +++ src/sys/arch/arm/ixp12x0/ixp12x0_intr.h Tue Feb 4 18:51:16 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ixp12x0_intr.h,v 1.2 2008/01/08 02:07:51 matt Exp $ */ +/* $NetBSD: ixp12x0_intr.h,v 1.3 2014/02/04 18:51:16 matt Exp $ */ /* * Copyright (c) 2002, 2003 Wasabi Systems, Inc. @@ -45,9 +45,6 @@ int _splraise(int); int _spllower(int); void splx(int); -#ifdef __HAVE_FAST_SOFTINTS -void _setsoftintr(int); -#endif #endif /* ! _LOCORE */ Index: src/sys/arch/arm/omap/omap_intr.c diff -u src/sys/arch/arm/omap/omap_intr.c:1.9 src/sys/arch/arm/omap/omap_intr.c:1.10 --- src/sys/arch/arm/omap/omap_intr.c:1.9 Fri Jul 1 20:30:21 2011 +++ src/sys/arch/arm/omap/omap_intr.c Tue Feb 4 18:51:16 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: omap_intr.c,v 1.9 2011/07/01 20:30:21 dyoung Exp $ */ +/* $NetBSD: omap_intr.c,v 1.10 2014/02/04 18:51:16 matt Exp $ */ /* * Based on arch/arm/xscale/pxa2x0_intr.c @@ -42,7 +42,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: omap_intr.c,v 1.9 2011/07/01 20:30:21 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: omap_intr.c,v 1.10 2014/02/04 18:51:16 matt Exp $);
CVS commit: src/usr.bin/csplit
Module Name:src Committed By: wiz Date: Tue Feb 4 19:48:48 UTC 2014 Modified Files: src/usr.bin/csplit: csplit.1 Log Message: Correct number of output files in example. From Jason McIntyre jmc@OpenBSD. While here, also explain about the extra file in the example and put .Ex into its own section in the correct place. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.bin/csplit/csplit.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/csplit/csplit.1 diff -u src/usr.bin/csplit/csplit.1:1.4 src/usr.bin/csplit/csplit.1:1.5 --- src/usr.bin/csplit/csplit.1:1.4 Thu Mar 12 12:35:51 2009 +++ src/usr.bin/csplit/csplit.1 Tue Feb 4 19:48:48 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: csplit.1,v 1.4 2009/03/12 12:35:51 joerg Exp $ +.\ $NetBSD: csplit.1,v 1.5 2014/02/04 19:48:48 wiz Exp $ .\ .\ Copyright (c) 2002 Tim J. Robbins. .\ All rights reserved. @@ -26,7 +26,7 @@ .\ .\ $FreeBSD: src/usr.bin/csplit/csplit.1,v 1.11 2005/01/25 22:29:51 tjr Exp $ .\ -.Dd January 4, 2009 +.Dd February 4, 2014 .Dt CSPLIT 1 .Os .Sh NAME @@ -121,8 +121,6 @@ After all the patterns have been process .Pp Requesting to split at a line before the current line number or past the end of the file will result in an error. -.Pp -.Ex -std .Sh ENVIRONMENT The .Ev LANG , LC_ALL , LC_COLLATE , @@ -132,12 +130,14 @@ environment variables affect the executi .Nm as described in .Xr environ 7 . +.Sh EXIT STATUS +.Ex -std .Sh EXAMPLES Split the .Xr mdoc 7 file .Pa foo.1 -into one file for each section (up to 20): +into one file for each section (up to 21 plus one for the rest, if any): .Pp .Dl $ csplit -k foo.1 '%^\e.Sh%' '/^\e.Sh/' '{20}' .Pp
CVS commit: src/sys/arch
Module Name:src Committed By: dsl Date: Tue Feb 4 21:09:24 UTC 2014 Modified Files: src/sys/arch/amd64/amd64: fpu.c src/sys/arch/i386/i386: i386_trap.S src/sys/arch/i386/isa: npx.c src/sys/arch/x86/include: cpu.h Log Message: There is no need to check for recursive calls into fpudna(). Rename the associated ci_fpsaving field to 'unused'. I'm not sure they could ever happen, you could get unwanted calls into the fpu trap code while saving state when using INT13 - but these are different. The return value from the i386 fpudna() was always 1 - possibly a historic relic of the kernel fp emulation. Remove and don't check in trap.S. The amd64 and i386 fpudna() code is now almost identical. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/arch/amd64/amd64/fpu.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/i386/i386/i386_trap.S cvs rdiff -u -r1.151 -r1.152 src/sys/arch/i386/isa/npx.c cvs rdiff -u -r1.59 -r1.60 src/sys/arch/x86/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/amd64/fpu.c diff -u src/sys/arch/amd64/amd64/fpu.c:1.44 src/sys/arch/amd64/amd64/fpu.c:1.45 --- src/sys/arch/amd64/amd64/fpu.c:1.44 Wed Dec 11 22:06:51 2013 +++ src/sys/arch/amd64/amd64/fpu.c Tue Feb 4 21:09:23 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: fpu.c,v 1.44 2013/12/11 22:06:51 dsl Exp $ */ +/* $NetBSD: fpu.c,v 1.45 2014/02/04 21:09:23 dsl Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. All @@ -100,7 +100,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: fpu.c,v 1.44 2013/12/11 22:06:51 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD: fpu.c,v 1.45 2014/02/04 21:09:23 dsl Exp $); #include opt_multiprocessor.h @@ -256,12 +256,6 @@ fpudna(struct cpu_info *ci) struct pcb *pcb; int s; - if (ci-ci_fpsaving) { - /* Recursive trap. */ - x86_enable_intr(); - return; - } - /* Lock out IPIs and disable preemption. */ s = splhigh(); x86_enable_intr(); @@ -361,16 +355,8 @@ fpusave_cpu(bool save) pcb = lwp_getpcb(l); if (save) { - /* - * Set ci-ci_fpsaving, so that any pending exception will - * be thrown away. It will be caught again if/when the - * FPU state is restored. - */ - KASSERT(ci-ci_fpsaving == 0); clts(); - ci-ci_fpsaving = 1; fxsave(pcb-pcb_savefpu); - ci-ci_fpsaving = 0; } stts(); Index: src/sys/arch/i386/i386/i386_trap.S diff -u src/sys/arch/i386/i386/i386_trap.S:1.3 src/sys/arch/i386/i386/i386_trap.S:1.4 --- src/sys/arch/i386/i386/i386_trap.S:1.3 Sun Feb 2 22:41:20 2014 +++ src/sys/arch/i386/i386/i386_trap.S Tue Feb 4 21:09:23 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: i386_trap.S,v 1.3 2014/02/02 22:41:20 dsl Exp $ */ +/* $NetBSD: i386_trap.S,v 1.4 2014/02/04 21:09:23 dsl Exp $ */ /* * Copyright 2002 (c) Wasabi Systems, Inc. @@ -66,7 +66,7 @@ #if 0 #include machine/asm.h -__KERNEL_RCSID(0, $NetBSD: i386_trap.S,v 1.3 2014/02/02 22:41:20 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD: i386_trap.S,v 1.4 2014/02/04 21:09:23 dsl Exp $); #endif /* @@ -165,8 +165,6 @@ IDTVEC(trap07) pushl CPUVAR(SELF) call _C_LABEL(fpudna) addl $4,%esp - testl %eax,%eax - jz calltrap jmp _C_LABEL(trapreturn) IDTVEC_END(trap07) IDTVEC(trap08) Index: src/sys/arch/i386/isa/npx.c diff -u src/sys/arch/i386/isa/npx.c:1.151 src/sys/arch/i386/isa/npx.c:1.152 --- src/sys/arch/i386/isa/npx.c:1.151 Mon Feb 3 23:00:32 2014 +++ src/sys/arch/i386/isa/npx.c Tue Feb 4 21:09:23 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: npx.c,v 1.151 2014/02/03 23:00:32 dsl Exp $ */ +/* $NetBSD: npx.c,v 1.152 2014/02/04 21:09:23 dsl Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -96,7 +96,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: npx.c,v 1.151 2014/02/03 23:00:32 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD: npx.c,v 1.152 2014/02/04 21:09:23 dsl Exp $); #if 0 #define IPRINTF(x) printf x @@ -151,7 +151,7 @@ __KERNEL_RCSID(0, $NetBSD: npx.c,v 1.15 static int x86fpflags_to_ksiginfo(uint32_t flags); /* Called directly from i386_trap.S */ -int fpudna(struct cpu_info *); +void fpudna(struct cpu_info *); #ifdef XEN #define clts() HYPERVISOR_fpu_taskswitch(0) @@ -358,22 +358,19 @@ x86fpflags_to_ksiginfo(uint32_t flags) /* * Implement device not available (DNA) exception * + * Called directly from i386_trap.S with interrupts still disabled + * * If we were the last lwp to use the FPU, we can simply return. * Otherwise, we save the previous state, if necessary, and restore * our last saved state. */ -int +void fpudna(struct cpu_info *ci) { struct lwp *l, *fl; struct pcb *pcb; int s; - if (ci-ci_fpsaving) { - /* Recursive trap. */ - return 1; - } - /* Lock out IPIs and disable preemption. */ s = splhigh(); #ifndef XEN @@ -394,7 +391,7 @@ fpudna(struct cpu_info *ci) ci-ci_fpused = 1; clts(); splx(s); - return 1; + return; } KASSERT(fl !=
CVS commit: src/external/bsd/dhcp/dist/client
Module Name:src Committed By: christos Date: Tue Feb 4 22:34:39 UTC 2014 Modified Files: src/external/bsd/dhcp/dist/client: dhclient.c Log Message: Wait for all the interfaces specified on the command line to be configured before daemonizing, not just the first one. Perhaps we should introduce a separate flag for this behavior? To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/bsd/dhcp/dist/client/dhclient.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/dhcp/dist/client/dhclient.c diff -u src/external/bsd/dhcp/dist/client/dhclient.c:1.7 src/external/bsd/dhcp/dist/client/dhclient.c:1.8 --- src/external/bsd/dhcp/dist/client/dhclient.c:1.7 Thu Jun 20 11:14:03 2013 +++ src/external/bsd/dhcp/dist/client/dhclient.c Tue Feb 4 17:34:39 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: dhclient.c,v 1.7 2013/06/20 15:14:03 christos Exp $ */ +/* $NetBSD: dhclient.c,v 1.8 2014/02/04 22:34:39 christos Exp $ */ /* dhclient.c @@ -33,7 +33,7 @@ */ #include sys/cdefs.h -__RCSID($NetBSD: dhclient.c,v 1.7 2013/06/20 15:14:03 christos Exp $); +__RCSID($NetBSD: dhclient.c,v 1.8 2014/02/04 22:34:39 christos Exp $); #include dhcpd.h #include syslog.h @@ -60,6 +60,7 @@ isc_boolean_t hw_mismatch_drop = ISC_TRU int dhcp_max_agent_option_packet_length = 0; int interfaces_requested = 0; +int interfaces_left = 0; struct iaddr iaddr_broadcast = { 4, { 255, 255, 255, 255 } }; struct iaddr iaddr_any = { 4, { 0, 0, 0, 0 } }; @@ -367,8 +368,10 @@ main(int argc, char **argv) { */ go_daemon(); setup(); - if (interfaces_requested 0) + if (interfaces_requested 0) { add_interfaces(ifaces, interfaces_requested); + interfaces_left = interfaces_requested; + } free(ifaces); if (wanted_ia_na 0) { wanted_ia_na = 1; @@ -894,7 +897,7 @@ int find_subnet (struct subnet **sp, */ #include sys/cdefs.h -__RCSID($NetBSD: dhclient.c,v 1.7 2013/06/20 15:14:03 christos Exp $); +__RCSID($NetBSD: dhclient.c,v 1.8 2014/02/04 22:34:39 christos Exp $); void state_reboot (cpp) void *cpp; @@ -3486,6 +3489,9 @@ void finish_daemon (void) if (no_daemon) return; + if (interfaces_left --interfaces_left) + return; + /* Only do it once. */ if (state) return;
CVS commit: src/sys/arch/i386/i386
Module Name:src Committed By: dsl Date: Tue Feb 4 22:48:26 UTC 2014 Modified Files: src/sys/arch/i386/i386: machdep.c process_machdep.c Log Message: Now that the sv_xmm and sv_87 fields in the pcb are the same size as the hardware ones, and those in the mcontext, ptrace and core files we can really safely cast and copy between the types. Remove a couple of temporary buffers and add CTASSERT()s that the sizes do actually match. To generate a diff of this commit: cvs rdiff -u -r1.745 -r1.746 src/sys/arch/i386/i386/machdep.c cvs rdiff -u -r1.80 -r1.81 src/sys/arch/i386/i386/process_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/i386/machdep.c diff -u src/sys/arch/i386/i386/machdep.c:1.745 src/sys/arch/i386/i386/machdep.c:1.746 --- src/sys/arch/i386/i386/machdep.c:1.745 Sun Feb 2 22:41:20 2014 +++ src/sys/arch/i386/i386/machdep.c Tue Feb 4 22:48:26 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.745 2014/02/02 22:41:20 dsl Exp $ */ +/* $NetBSD: machdep.c,v 1.746 2014/02/04 22:48:26 dsl Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009 @@ -67,7 +67,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.745 2014/02/02 22:41:20 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.746 2014/02/04 22:48:26 dsl Exp $); #include opt_beep.h #include opt_compat_ibcs2.h @@ -1644,14 +1644,18 @@ cpu_getmcontext(struct lwp *l, mcontext_ if (pcb-pcb_fpcpu) fpusave_lwp(l, true); if (i386_use_fxsave) { - memcpy(mcp-__fpregs.__fp_reg_set.__fp_xmm_state.__fp_xmm, + __CTASSERT(sizeof pcb-pcb_savefpu.sv_xmm == + sizeof mcp-__fpregs.__fp_reg_set.__fp_xmm_state); + memcpy(mcp-__fpregs.__fp_reg_set.__fp_xmm_state, pcb-pcb_savefpu.sv_xmm, - sizeof (mcp-__fpregs.__fp_reg_set.__fp_xmm_state.__fp_xmm)); + sizeof (mcp-__fpregs.__fp_reg_set.__fp_xmm_state)); *flags |= _UC_FXSAVE; } else { - memcpy(mcp-__fpregs.__fp_reg_set.__fpchip_state.__fp_state, + __CTASSERT(sizeof pcb-pcb_savefpu.sv_87 == + sizeof mcp-__fpregs.__fp_reg_set.__fpchip_state); + memcpy(mcp-__fpregs.__fp_reg_set.__fpchip_state, pcb-pcb_savefpu.sv_87, - sizeof (mcp-__fpregs.__fp_reg_set.__fpchip_state.__fp_state)); + sizeof (mcp-__fpregs.__fp_reg_set.__fpchip_state)); } #if 0 /* Apparently nothing ever touches this. */ @@ -1742,26 +1746,30 @@ cpu_setmcontext(struct lwp *l, const mco /* Restore floating point register context, if any. */ if ((flags _UC_FPU) != 0) { + __CTASSERT(sizeof pcb-pcb_savefpu.sv_xmm == + sizeof mcp-__fpregs.__fp_reg_set.__fp_xmm_state); + __CTASSERT(sizeof pcb-pcb_savefpu.sv_87 == + sizeof mcp-__fpregs.__fp_reg_set.__fpchip_state); + if (flags _UC_FXSAVE) { if (i386_use_fxsave) { -memcpy( - pcb-pcb_savefpu.sv_xmm, - mcp-__fpregs.__fp_reg_set.__fp_xmm_state.__fp_xmm, - sizeof (pcb-pcb_savefpu.sv_xmm)); +memcpy(pcb-pcb_savefpu.sv_xmm, +mcp-__fpregs.__fp_reg_set.__fp_xmm_state, +sizeof (pcb-pcb_savefpu.sv_xmm)); } else { /* This is a weird corner case */ -process_xmm_to_s87((struct fxsave *) -mcp-__fpregs.__fp_reg_set.__fp_xmm_state.__fp_xmm, +process_xmm_to_s87((const struct fxsave *) +mcp-__fpregs.__fp_reg_set.__fp_xmm_state, pcb-pcb_savefpu.sv_87); } } else { if (i386_use_fxsave) { -process_s87_to_xmm((struct save87 *) -mcp-__fpregs.__fp_reg_set.__fpchip_state.__fp_state, +process_s87_to_xmm((const struct save87 *) +mcp-__fpregs.__fp_reg_set.__fpchip_state, pcb-pcb_savefpu.sv_xmm); } else { memcpy(pcb-pcb_savefpu.sv_87, -mcp-__fpregs.__fp_reg_set.__fpchip_state.__fp_state, +mcp-__fpregs.__fp_reg_set.__fpchip_state, sizeof (pcb-pcb_savefpu.sv_87)); } } Index: src/sys/arch/i386/i386/process_machdep.c diff -u src/sys/arch/i386/i386/process_machdep.c:1.80 src/sys/arch/i386/i386/process_machdep.c:1.81 --- src/sys/arch/i386/i386/process_machdep.c:1.80 Sun Jan 26 19:16:17 2014 +++ src/sys/arch/i386/i386/process_machdep.c Tue Feb 4 22:48:26 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: process_machdep.c,v 1.80 2014/01/26 19:16:17 dsl Exp $ */ +/* $NetBSD: process_machdep.c,v 1.81 2014/02/04 22:48:26 dsl Exp $ */ /*- * Copyright (c) 1998, 2000, 2001, 2008 The NetBSD Foundation, Inc. @@ -52,7 +52,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: process_machdep.c,v 1.80 2014/01/26 19:16:17 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD: process_machdep.c,v 1.81 2014/02/04 22:48:26 dsl Exp $); #include opt_vm86.h #include opt_ptrace.h @@ -277,12 +277,9 @@ process_read_fpregs(struct lwp *l, struc l-l_md.md_flags |= MDL_USEDFPU; } + __CTASSERT(sizeof *regs == sizeof (struct save87)); if (i386_use_fxsave) { - struct save87 s87; - - /* XXX Yuck */ -
CVS commit: src/sys/sys
Module Name:src Committed By: matt Date: Wed Feb 5 00:18:09 UTC 2014 Modified Files: src/sys/sys: cdefs.h Log Message: mask the shift by __n with NBBY*sizeof(uintmax-t)-1 to suppress the following diagnostic from clang: error: shift count = width of type [-Werror,-Wshift-count-overflow] PAR_ATTR= __BITS(63,56),// F=0 memory attributes ^ src/sys/sys/cdefs.h:554:4: note: expanded from macro '__BITS' ((__BIT(MAX((__m), (__n)) + 1) - 1) ^ (__BIT(MIN((__m), (__n))) - 1)) ^~~~ src/sys/sys/cdefs.h:550:73: note: expanded from macro '__BIT' (((uintmax_t)(__n) = NBBY * sizeof(uintmax_t)) ? 0 : ((uintmax_t)1 (uintmax_t)(__n))) ^ To generate a diff of this commit: cvs rdiff -u -r1.116 -r1.117 src/sys/sys/cdefs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/cdefs.h diff -u src/sys/sys/cdefs.h:1.116 src/sys/sys/cdefs.h:1.117 --- src/sys/sys/cdefs.h:1.116 Fri Oct 25 14:54:25 2013 +++ src/sys/sys/cdefs.h Wed Feb 5 00:18:09 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: cdefs.h,v 1.116 2013/10/25 14:54:25 apb Exp $ */ +/* $NetBSD: cdefs.h,v 1.117 2014/02/05 00:18:09 matt Exp $ */ /* * Copyright (c) 1991, 1993 @@ -547,7 +547,7 @@ #ifndef __ASSEMBLER__ /* __BIT(n): nth bit, where __BIT(0) == 0x1. */ #define __BIT(__n) \ -(((uintmax_t)(__n) = NBBY * sizeof(uintmax_t)) ? 0 : ((uintmax_t)1 (uintmax_t)(__n))) +(((uintmax_t)(__n) = NBBY * sizeof(uintmax_t)) ? 0 : ((uintmax_t)1 (uintmax_t)(__n (NBBY * sizeof(uintmax_t) - 1 /* __BITS(m, n): bits m through n, m n. */ #define __BITS(__m, __n) \
CVS commit: src/sys/sys
Module Name:src Committed By: matt Date: Wed Feb 5 01:59:58 UTC 2014 Modified Files: src/sys/sys: cdefs.h Log Message: Add another set of parens To generate a diff of this commit: cvs rdiff -u -r1.117 -r1.118 src/sys/sys/cdefs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/cdefs.h diff -u src/sys/sys/cdefs.h:1.117 src/sys/sys/cdefs.h:1.118 --- src/sys/sys/cdefs.h:1.117 Wed Feb 5 00:18:09 2014 +++ src/sys/sys/cdefs.h Wed Feb 5 01:59:58 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: cdefs.h,v 1.117 2014/02/05 00:18:09 matt Exp $ */ +/* $NetBSD: cdefs.h,v 1.118 2014/02/05 01:59:58 matt Exp $ */ /* * Copyright (c) 1991, 1993 @@ -547,7 +547,7 @@ #ifndef __ASSEMBLER__ /* __BIT(n): nth bit, where __BIT(0) == 0x1. */ #define __BIT(__n) \ -(((uintmax_t)(__n) = NBBY * sizeof(uintmax_t)) ? 0 : ((uintmax_t)1 (uintmax_t)(__n (NBBY * sizeof(uintmax_t) - 1 +(((uintmax_t)(__n) = NBBY * sizeof(uintmax_t)) ? 0 : ((uintmax_t)1 (uintmax_t)((__n) (NBBY * sizeof(uintmax_t) - 1 /* __BITS(m, n): bits m through n, m n. */ #define __BITS(__m, __n) \
CVS commit: src
Module Name:src Committed By: njoly Date: Tue Feb 4 08:08:59 UTC 2014 Modified Files: src/distrib/sets/lists/tests: mi src/tests/usr.bin/xlint/lint1: Makefile t_integration.sh src/usr.bin/xlint/lint1: cgram.y Added Files: src/tests/usr.bin/xlint/lint1: d_c99_decls_after_stmt3.c Log Message: Handle another declaration after statement case for lint in c99 mode. Add the corresponding testcase. To generate a diff of this commit: cvs rdiff -u -r1.561 -r1.562 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/Makefile \ src/tests/usr.bin/xlint/lint1/t_integration.sh cvs rdiff -u -r0 -r1.1 \ src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt3.c cvs rdiff -u -r1.56 -r1.57 src/usr.bin/xlint/lint1/cgram.y Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-video-siliconmotion/dist/src
Module Name:xsrc Committed By: macallan Date: Tue Feb 4 09:56:25 UTC 2014 Modified Files: xsrc/external/mit/xf86-video-siliconmotion/dist/src: smi.h Log Message: #define __BYTE_ORDER BYTE_ORDER etc. now endianness detection actually works and colours look right on my Gdium To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: matt Date: Tue Feb 4 18:51:16 UTC 2014 Modified Files: src/sys/arch/arm/at91: at91intr.h src/sys/arch/arm/footbridge: footbridge_intr.h src/sys/arch/arm/include/arm32: psl.h src/sys/arch/arm/ixp12x0: ixp12x0_intr.h src/sys/arch/arm/omap: omap_intr.c omap_intr.h src/sys/arch/arm/xscale: becc_intr.h i80321_intr.h pxa2x0_intr.h src/sys/arch/evbarm/include: intr.h src/sys/arch/hpcarm/include: intr.h Log Message: _setsoftintr is long dead. reap any leftovers from arm. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/at91/at91intr.h cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/footbridge/footbridge_intr.h cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/include/arm32/psl.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/ixp12x0/ixp12x0_intr.h cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/omap/omap_intr.c \ src/sys/arch/arm/omap/omap_intr.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/xscale/becc_intr.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/xscale/i80321_intr.h cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/xscale/pxa2x0_intr.h cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbarm/include/intr.h cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hpcarm/include/intr.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/csplit
Module Name:src Committed By: wiz Date: Tue Feb 4 19:48:48 UTC 2014 Modified Files: src/usr.bin/csplit: csplit.1 Log Message: Correct number of output files in example. From Jason McIntyre jmc@OpenBSD. While here, also explain about the extra file in the example and put .Ex into its own section in the correct place. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.bin/csplit/csplit.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: dsl Date: Tue Feb 4 21:09:24 UTC 2014 Modified Files: src/sys/arch/amd64/amd64: fpu.c src/sys/arch/i386/i386: i386_trap.S src/sys/arch/i386/isa: npx.c src/sys/arch/x86/include: cpu.h Log Message: There is no need to check for recursive calls into fpudna(). Rename the associated ci_fpsaving field to 'unused'. I'm not sure they could ever happen, you could get unwanted calls into the fpu trap code while saving state when using INT13 - but these are different. The return value from the i386 fpudna() was always 1 - possibly a historic relic of the kernel fp emulation. Remove and don't check in trap.S. The amd64 and i386 fpudna() code is now almost identical. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/arch/amd64/amd64/fpu.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/i386/i386/i386_trap.S cvs rdiff -u -r1.151 -r1.152 src/sys/arch/i386/isa/npx.c cvs rdiff -u -r1.59 -r1.60 src/sys/arch/x86/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/i386/include
Module Name:src Committed By: dsl Date: Tue Feb 4 22:21:35 UTC 2014 Modified Files: src/sys/arch/i386/include: mcontext.h npx.h Log Message: Remove the fields from 'struct save87' and 'struct fxsave' that were used to save the control word and tag word on fp faults. Nothing I could find looked at them before I removed the code that wrote them. It might appear that these fields got exported to userspace (via mcontext), but that code carefully avoided those fields. I've also deleted some very historic fields from the union inside __fpregset_t this doesn't affect its size. The __fpregset_t fields are now the same size as the ones in the pcb. Which is good because they get cast to each other in a few places. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/i386/include/mcontext.h cvs rdiff -u -r1.32 -r1.33 src/sys/arch/i386/include/npx.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/dhcp/dist/client
Module Name:src Committed By: christos Date: Tue Feb 4 22:34:39 UTC 2014 Modified Files: src/external/bsd/dhcp/dist/client: dhclient.c Log Message: Wait for all the interfaces specified on the command line to be configured before daemonizing, not just the first one. Perhaps we should introduce a separate flag for this behavior? To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/bsd/dhcp/dist/client/dhclient.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/i386/i386
Module Name:src Committed By: dsl Date: Tue Feb 4 22:48:26 UTC 2014 Modified Files: src/sys/arch/i386/i386: machdep.c process_machdep.c Log Message: Now that the sv_xmm and sv_87 fields in the pcb are the same size as the hardware ones, and those in the mcontext, ptrace and core files we can really safely cast and copy between the types. Remove a couple of temporary buffers and add CTASSERT()s that the sizes do actually match. To generate a diff of this commit: cvs rdiff -u -r1.745 -r1.746 src/sys/arch/i386/i386/machdep.c cvs rdiff -u -r1.80 -r1.81 src/sys/arch/i386/i386/process_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: matt Date: Wed Feb 5 00:18:09 UTC 2014 Modified Files: src/sys/sys: cdefs.h Log Message: mask the shift by __n with NBBY*sizeof(uintmax-t)-1 to suppress the following diagnostic from clang: error: shift count = width of type [-Werror,-Wshift-count-overflow] PAR_ATTR= __BITS(63,56),// F=0 memory attributes ^ src/sys/sys/cdefs.h:554:4: note: expanded from macro '__BITS' ((__BIT(MAX((__m), (__n)) + 1) - 1) ^ (__BIT(MIN((__m), (__n))) - 1)) ^~~~ src/sys/sys/cdefs.h:550:73: note: expanded from macro '__BIT' (((uintmax_t)(__n) = NBBY * sizeof(uintmax_t)) ? 0 : ((uintmax_t)1 (uintmax_t)(__n))) ^ To generate a diff of this commit: cvs rdiff -u -r1.116 -r1.117 src/sys/sys/cdefs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: matt Date: Wed Feb 5 01:59:58 UTC 2014 Modified Files: src/sys/sys: cdefs.h Log Message: Add another set of parens To generate a diff of this commit: cvs rdiff -u -r1.117 -r1.118 src/sys/sys/cdefs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/npf/npftest
Module Name:src Committed By: rmind Date: Wed Feb 5 03:30:13 UTC 2014 Modified Files: src/usr.sbin/npf/npftest: npftest.c src/usr.sbin/npf/npftest/libnpftest: npf_nat_test.c npf_test_subr.c Log Message: npftest: fix the failure of NAT test -- adjust for RUMP's conversion to the in-kernel CPRNG (hi pooka!). To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/npf/npftest/npftest.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/npf/npftest/libnpftest/npf_nat_test.c cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/npf/npftest/libnpftest/npf_test_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/npf/npftest
Module Name:src Committed By: rmind Date: Wed Feb 5 03:49:48 UTC 2014 Modified Files: src/usr.sbin/npf/npftest: npftest.c npftest.h src/usr.sbin/npf/npftest/libnpftest: npf_nat_test.c npf_test.h npf_test_subr.c Log Message: npftest: fix previous harder - pass and use libc's random(3). To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/npf/npftest/npftest.c cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/npf/npftest/npftest.h cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/npf/npftest/libnpftest/npf_nat_test.c cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/npf/npftest/libnpftest/npf_test.h cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/npf/npftest/libnpftest/npf_test_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.