CVS commit: src/tests/lib/libcurses/check_files
Module Name:src Committed By: blymn Date: Fri Sep 16 08:05:28 UTC 2011 Modified Files: src/tests/lib/libcurses/check_files: background3.chk background4.chk background5.chk box_standout.chk clear10.chk clear6.chk clear7.chk clear8.chk clear9.chk copywin1.chk copywin10.chk copywin11.chk copywin12.chk copywin13.chk copywin14.chk copywin2.chk copywin3.chk copywin4.chk copywin5.chk copywin6.chk copywin7.chk copywin8.chk copywin9.chk wborder.chk wgetstr_refresh.chk window.chk wscrl1.chk wscrl2.chk Log Message: - Update the check files due to a bug fix in the slave code To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/check_files/background3.chk \ src/tests/lib/libcurses/check_files/background4.chk \ src/tests/lib/libcurses/check_files/background5.chk \ src/tests/lib/libcurses/check_files/box_standout.chk \ src/tests/lib/libcurses/check_files/clear10.chk \ src/tests/lib/libcurses/check_files/clear6.chk \ src/tests/lib/libcurses/check_files/clear7.chk \ src/tests/lib/libcurses/check_files/clear8.chk \ src/tests/lib/libcurses/check_files/clear9.chk \ src/tests/lib/libcurses/check_files/copywin1.chk \ src/tests/lib/libcurses/check_files/copywin10.chk \ src/tests/lib/libcurses/check_files/copywin11.chk \ src/tests/lib/libcurses/check_files/copywin12.chk \ src/tests/lib/libcurses/check_files/copywin13.chk \ src/tests/lib/libcurses/check_files/copywin14.chk \ src/tests/lib/libcurses/check_files/copywin2.chk \ src/tests/lib/libcurses/check_files/copywin3.chk \ src/tests/lib/libcurses/check_files/copywin4.chk \ src/tests/lib/libcurses/check_files/copywin5.chk \ src/tests/lib/libcurses/check_files/copywin6.chk \ src/tests/lib/libcurses/check_files/copywin7.chk \ src/tests/lib/libcurses/check_files/copywin8.chk \ src/tests/lib/libcurses/check_files/copywin9.chk \ src/tests/lib/libcurses/check_files/wborder.chk \ src/tests/lib/libcurses/check_files/wgetstr_refresh.chk \ src/tests/lib/libcurses/check_files/window.chk \ src/tests/lib/libcurses/check_files/wscrl1.chk \ src/tests/lib/libcurses/check_files/wscrl2.chk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/libcurses/check_files/background3.chk diff -u src/tests/lib/libcurses/check_files/background3.chk:1.1 src/tests/lib/libcurses/check_files/background3.chk:1.2 --- src/tests/lib/libcurses/check_files/background3.chk:1.1 Sun Apr 10 09:55:09 2011 +++ src/tests/lib/libcurses/check_files/background3.chk Fri Sep 16 08:05:28 2011 @@ -1 +1 @@ -cup7;7X \ No newline at end of file +cup3;6X \ No newline at end of file Index: src/tests/lib/libcurses/check_files/background4.chk diff -u src/tests/lib/libcurses/check_files/background4.chk:1.1 src/tests/lib/libcurses/check_files/background4.chk:1.2 --- src/tests/lib/libcurses/check_files/background4.chk:1.1 Sun Apr 10 09:55:09 2011 +++ src/tests/lib/libcurses/check_files/background4.chk Fri Sep 16 08:05:28 2011 @@ -1,4 +1,6 @@ -cup1;14Xcup7;7Xrevwindowcup8;7XB1cup9;7XBB -BB -BB -BBcup8;9Xsgr0 \ No newline at end of file +cup1;14Xcup3;6Xrevwindow +B1 +BB +BB +BB +BBcup4;8Xsgr0 \ No newline at end of file Index: src/tests/lib/libcurses/check_files/background5.chk diff -u src/tests/lib/libcurses/check_files/background5.chk:1.1 src/tests/lib/libcurses/check_files/background5.chk:1.2 --- src/tests/lib/libcurses/check_files/background5.chk:1.1 Sun Apr 10 09:55:09 2011 +++ src/tests/lib/libcurses/check_files/background5.chk Fri Sep 16 08:05:28 2011 @@ -1,2 +1,3 @@ -cup1;14Xcup8;9Xrevhellcup9;7Xo worl -dsgr0 \ No newline at end of file +cup1;14Xcup4;8Xrevhell +o worl +dsgr0 \ No newline at end of file Index: src/tests/lib/libcurses/check_files/box_standout.chk diff -u src/tests/lib/libcurses/check_files/box_standout.chk:1.1 src/tests/lib/libcurses/check_files/box_standout.chk:1.2 --- src/tests/lib/libcurses/check_files/box_standout.chk:1.1 Sun Apr 10 09:55:09 2011 +++ src/tests/lib/libcurses/check_files/box_standout.chk Fri Sep 16 08:05:28 2011 @@ -1,3 +1,5 @@ -revsmacsrmacscup8;7Xsgr0smsosmacsxrmacssmacsxrmacscup9;7Xsmacsxrmacssmacsxrmacs -smacsxrmacssmacsxrmacs -smacsxrmacssmacsxrmacscup12;8Xrmsorevsmacsrmacscup7;7Xsgr0 \ No newline at end of file +revsmacsrmacs +sgr0smsosmacsxrmacssmacsxrmacs +smacsxrmacssmacsxrmacs +smacsxrmacssmacsxrmacs +smacsxrmacssmacsxrmacscup8;7Xrmsorevsmacsrmacscup3;6Xsgr0 \ No newline at end of file Index: src/tests/lib/libcurses/check_files/clear10.chk diff -u src/tests/lib/libcurses/check_files/clear10.chk:1.1 src/tests/lib/libcurses/check_files/clear10.chk:1.2 ---
CVS commit: src/sys/arch/amiga/amiga
Module Name:src Committed By: rkujawa Date: Fri Sep 16 10:23:01 UTC 2011 Modified Files: src/sys/arch/amiga/amiga: amiga_bus_simple_1word.c amiga_bus_simple_4.c Log Message: Fix typos (make this compile again...) To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amiga/amiga/amiga_bus_simple_1word.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amiga/amiga/amiga_bus_simple_4.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/amiga/amiga/amiga_bus_simple_1word.c diff -u src/sys/arch/amiga/amiga/amiga_bus_simple_1word.c:1.5 src/sys/arch/amiga/amiga/amiga_bus_simple_1word.c:1.6 --- src/sys/arch/amiga/amiga/amiga_bus_simple_1word.c:1.5 Thu Sep 15 12:50:00 2011 +++ src/sys/arch/amiga/amiga/amiga_bus_simple_1word.c Fri Sep 16 10:23:01 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: amiga_bus_simple_1word.c,v 1.5 2011/09/15 12:50:00 christos Exp $ */ +/* $NetBSD: amiga_bus_simple_1word.c,v 1.6 2011/09/16 10:23:01 rkujawa Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ #include machine/pte.h #include sys/cdefs.h -__KERNEL_RCSID(1, $NetBSD: amiga_bus_simple_1word.c,v 1.5 2011/09/15 12:50:00 christos Exp $); +__KERNEL_RCSID(1, $NetBSD: amiga_bus_simple_1word.c,v 1.6 2011/09/16 10:23:01 rkujawa Exp $); #define AMIGA_SIMPLE_BUS_STRIDE 1 /* 1 byte per byte */ #define AMIGA_SIMPLE_BUS_WORD_METHODS @@ -190,7 +190,7 @@ .bsrm1 = oabs(bsrm1_), .bswm1 = oabs(bswm1_), .bsrr1 = oabs(bsrr1_), - .bsrw1 = oabs(bswr1_), + .bswr1 = oabs(bswr1_), .bssr1 = oabs(bssr1_), .bscr1 = oabs(bscr1_), @@ -207,7 +207,7 @@ .bsrrs2 = oabs(bsrr2_), .bswrs2 = oabs(bswr2_), .bssr2 = oabs(bssr2_), /* XXX swap? */ - .bsce2 = oabs(bscr2_), /* XXX swap? */ + .bscr2 = oabs(bscr2_), /* XXX swap? */ .bsr4 = oabs(bsr4_swap_), .bsw4 = oabs(bsw4_swap_), Index: src/sys/arch/amiga/amiga/amiga_bus_simple_4.c diff -u src/sys/arch/amiga/amiga/amiga_bus_simple_4.c:1.7 src/sys/arch/amiga/amiga/amiga_bus_simple_4.c:1.8 --- src/sys/arch/amiga/amiga/amiga_bus_simple_4.c:1.7 Thu Sep 15 12:50:00 2011 +++ src/sys/arch/amiga/amiga/amiga_bus_simple_4.c Fri Sep 16 10:23:01 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: amiga_bus_simple_4.c,v 1.7 2011/09/15 12:50:00 christos Exp $ */ +/* $NetBSD: amiga_bus_simple_4.c,v 1.8 2011/09/16 10:23:01 rkujawa Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(1, $NetBSD: amiga_bus_simple_4.c,v 1.7 2011/09/15 12:50:00 christos Exp $); +__KERNEL_RCSID(1, $NetBSD: amiga_bus_simple_4.c,v 1.8 2011/09/16 10:23:01 rkujawa Exp $); #define AMIGA_SIMPLE_BUS_STRIDE 4 /* 1 byte per long */ #define AMIGA_SIMPLE_BUS_WORD_METHODS @@ -92,7 +92,7 @@ .bswm1 = oabs(bswm1_), .bsrr1 = oabs(bsrr1_), .bswr1 = oabs(bswr1_), - .bsrr1 = oabs(bssr1_), + .bssr1 = oabs(bssr1_), .bscr1 = oabs(bscr1_), .bsr2 = oabs(bsr2_), /* XXX swap? */
CVS commit: src/sys/arch/usermode/conf
Module Name:src Committed By: reinoud Date: Fri Sep 16 11:05:42 UTC 2011 Modified Files: src/sys/arch/usermode/conf: GENERIC Makefile.usermode Log Message: Reduce the amount of memory needed to run by default To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/usermode/conf/GENERIC cvs rdiff -u -r1.22 -r1.23 src/sys/arch/usermode/conf/Makefile.usermode 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/usermode/conf/GENERIC diff -u src/sys/arch/usermode/conf/GENERIC:1.17 src/sys/arch/usermode/conf/GENERIC:1.18 --- src/sys/arch/usermode/conf/GENERIC:1.17 Thu Sep 15 12:28:24 2011 +++ src/sys/arch/usermode/conf/GENERIC Fri Sep 16 11:05:42 2011 @@ -1,15 +1,15 @@ -# $NetBSD: GENERIC,v 1.17 2011/09/15 12:28:24 reinoud Exp $ +# $NetBSD: GENERIC,v 1.18 2011/09/16 11:05:42 reinoud Exp $ include arch/usermode/conf/std.usermode options INCLUDE_CONFIG_FILE -#ident GENERIC-$Revision: 1.17 $ +#ident GENERIC-$Revision: 1.18 $ maxusers 32 makeoptions DEBUG=-O1 -g3 -options TEXTADDR=0x6000 # 1.5 Gb? -options KVMSIZE=0x01000 +options TEXTADDR=0x1000 # 1.5 Gb? +options KVMSIZE=0x00800 options RTC_OFFSET=0 options KTRACE Index: src/sys/arch/usermode/conf/Makefile.usermode diff -u src/sys/arch/usermode/conf/Makefile.usermode:1.22 src/sys/arch/usermode/conf/Makefile.usermode:1.23 --- src/sys/arch/usermode/conf/Makefile.usermode:1.22 Thu Sep 15 12:28:24 2011 +++ src/sys/arch/usermode/conf/Makefile.usermode Fri Sep 16 11:05:42 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.usermode,v 1.22 2011/09/15 12:28:24 reinoud Exp $ +# $NetBSD: Makefile.usermode,v 1.23 2011/09/16 11:05:42 reinoud Exp $ OPT_CPU_HOST= %CPU_HOST% .if !empty(OPT_CPU_HOST) @@ -77,8 +77,7 @@ ## (5) link settings ## # XXX fixme: TEXTADDR is not imported yet?? -TEXTADDR?= 6000 -#KVMSIZE?= 1000 +TEXTADDR?= 0x1000 LINKFLAGS_NORMAL= -X KERN_LDSCRIPT?= kern.ldscript
CVS commit: src/usr.bin/stat
Module Name:src Committed By: apb Date: Fri Sep 16 11:06:27 UTC 2011 Modified Files: src/usr.bin/stat: stat.1 Log Message: Anothe difference in output format: stat -f %Z does not add any space in major,minor for device nodes, whereas both ls -l and find -ls add at least one space. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/usr.bin/stat/stat.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/stat/stat.1 diff -u src/usr.bin/stat/stat.1:1.30 src/usr.bin/stat/stat.1:1.31 --- src/usr.bin/stat/stat.1:1.30 Thu Sep 15 19:56:35 2011 +++ src/usr.bin/stat/stat.1 Fri Sep 16 11:06:27 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: stat.1,v 1.30 2011/09/15 19:56:35 apb Exp $ +.\ $NetBSD: stat.1,v 1.31 2011/09/16 11:06:27 apb Exp $ .\ .\ Copyright (c) 2002-2005 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd September 15, 2011 +.Dd September 16, 2011 .Dt STAT 1 .Os .Sh NAME @@ -435,7 +435,7 @@ The target of a symbolic link. .It Cm Z Expands to -.Dq major,minor +.Dq Ar major Ns , Ns Ar minor from the rdev field for character or block special devices and gives size output for all others. .El @@ -477,7 +477,11 @@ .Ic find ... -ls (except that .Xr find 1 -displays the time in a different format): +displays the time in a different format, and +.Xr find 1 +adds at least one space after the comma in +.Dq Ar major Ns , Ns Ar minor +for device nodes): .Bd -literal -offset indent \*[Gt] stat -f %7i %6b %-11Sp %3l %-17Su %-17Sg %9Z %Sm %N%SY /tmp/bar 78852 0 -rw-r--r--1 root wheel 0 Jul 8 10:26:03 2004 /tmp/bar @@ -490,7 +494,12 @@ .Ic ls -lTd (except that .Xr ls 1 -adjusts the column spacing differently when listing multiple files): +adjusts the column spacing differently when listing multiple files, +and +.Xr ls 1 +adds at least one space after the comma in +.Dq Ar major Ns , Ns Ar minor +for device nodes): .Bd -literal -offset indent \*[Gt] stat -f %-11Sp %l %Su %Sg %5Z %Sm %N%SY /tmp/bar -rw-r--r-- 1 root wheel 0 Jul 8 10:26:03 2004 /tmp/bar
CVS commit: src/sys/arch/usermode/conf
Module Name:src
Committed By: jmcneill
Date: Fri Sep 16 11:28:36 UTC 2011
Modified Files:
src/sys/arch/usermode/conf: Makefile.usermode files.usermode
Log Message:
push TEXTADDR option into kernel makefile
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/usermode/conf/Makefile.usermode
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/usermode/conf/files.usermode
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/usermode/conf/Makefile.usermode
diff -u src/sys/arch/usermode/conf/Makefile.usermode:1.23 src/sys/arch/usermode/conf/Makefile.usermode:1.24
--- src/sys/arch/usermode/conf/Makefile.usermode:1.23 Fri Sep 16 11:05:42 2011
+++ src/sys/arch/usermode/conf/Makefile.usermode Fri Sep 16 11:28:36 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.usermode,v 1.23 2011/09/16 11:05:42 reinoud Exp $
+# $NetBSD: Makefile.usermode,v 1.24 2011/09/16 11:28:36 jmcneill Exp $
OPT_CPU_HOST= %CPU_HOST%
.if !empty(OPT_CPU_HOST)
@@ -76,8 +76,7 @@
##
## (5) link settings
##
-# XXX fixme: TEXTADDR is not imported yet??
-TEXTADDR?= 0x1000
+TEXTADDR?= %TEXTADDR%
LINKFLAGS_NORMAL= -X
KERN_LDSCRIPT?= kern.ldscript
Index: src/sys/arch/usermode/conf/files.usermode
diff -u src/sys/arch/usermode/conf/files.usermode:1.10 src/sys/arch/usermode/conf/files.usermode:1.11
--- src/sys/arch/usermode/conf/files.usermode:1.10 Sun Sep 4 21:08:18 2011
+++ src/sys/arch/usermode/conf/files.usermode Fri Sep 16 11:28:36 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.usermode,v 1.10 2011/09/04 21:08:18 jmcneill Exp $
+# $NetBSD: files.usermode,v 1.11 2011/09/16 11:28:36 jmcneill Exp $
maxpartitions 8
maxusers 8 16 64
@@ -7,6 +7,7 @@
defflag opt_sdl.hSDL
defflag opt_cpu.hCPU_DEBUG
defparam opt_cpu.hCPU_HOST
+defparam opt_misc.hTEXTADDR
defflag opt_urkelvisor.h URKELVISOR
define thunkbus { }
CVS commit: src/usr.bin/stat
Module Name:src Committed By: wiz Date: Fri Sep 16 13:33:13 UTC 2011 Modified Files: src/usr.bin/stat: stat.1 Log Message: Remove unnecessary Ns. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/usr.bin/stat/stat.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/stat/stat.1 diff -u src/usr.bin/stat/stat.1:1.31 src/usr.bin/stat/stat.1:1.32 --- src/usr.bin/stat/stat.1:1.31 Fri Sep 16 11:06:27 2011 +++ src/usr.bin/stat/stat.1 Fri Sep 16 13:33:13 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: stat.1,v 1.31 2011/09/16 11:06:27 apb Exp $ +.\ $NetBSD: stat.1,v 1.32 2011/09/16 13:33:13 wiz Exp $ .\ .\ Copyright (c) 2002-2005 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -435,7 +435,7 @@ The target of a symbolic link. .It Cm Z Expands to -.Dq Ar major Ns , Ns Ar minor +.Dq Ar major , Ns Ar minor from the rdev field for character or block special devices and gives size output for all others. .El @@ -480,7 +480,7 @@ displays the time in a different format, and .Xr find 1 adds at least one space after the comma in -.Dq Ar major Ns , Ns Ar minor +.Dq Ar major , Ns Ar minor for device nodes): .Bd -literal -offset indent \*[Gt] stat -f %7i %6b %-11Sp %3l %-17Su %-17Sg %9Z %Sm %N%SY /tmp/bar @@ -498,7 +498,7 @@ and .Xr ls 1 adds at least one space after the comma in -.Dq Ar major Ns , Ns Ar minor +.Dq Ar major , Ns Ar minor for device nodes): .Bd -literal -offset indent \*[Gt] stat -f %-11Sp %l %Su %Sg %5Z %Sm %N%SY /tmp/bar
CVS commit: src/usr.bin/stat
Module Name:src Committed By: apb Date: Fri Sep 16 14:32:53 UTC 2011 Modified Files: src/usr.bin/stat: stat.1 Log Message: More corrections to format compatibility between stat(1), find(1) -ls, and ls(1) -lT. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/usr.bin/stat/stat.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/stat/stat.1 diff -u src/usr.bin/stat/stat.1:1.32 src/usr.bin/stat/stat.1:1.33 --- src/usr.bin/stat/stat.1:1.32 Fri Sep 16 13:33:13 2011 +++ src/usr.bin/stat/stat.1 Fri Sep 16 14:32:53 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: stat.1,v 1.32 2011/09/16 13:33:13 wiz Exp $ +.\ $NetBSD: stat.1,v 1.33 2011/09/16 14:32:53 apb Exp $ .\ .\ Copyright (c) 2002-2005 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -479,7 +479,7 @@ .Xr find 1 displays the time in a different format, and .Xr find 1 -adds at least one space after the comma in +sometimes adds one or more spaces after the comma in .Dq Ar major , Ns Ar minor for device nodes): .Bd -literal -offset indent @@ -501,7 +501,7 @@ .Dq Ar major , Ns Ar minor for device nodes): .Bd -literal -offset indent -\*[Gt] stat -f %-11Sp %l %Su %Sg %5Z %Sm %N%SY /tmp/bar +\*[Gt] stat -f %-11Sp %l %Su %Sg %Z %Sm %N%SY /tmp/bar -rw-r--r-- 1 root wheel 0 Jul 8 10:26:03 2004 /tmp/bar \*[Gt] ls -lTd /tmp/bar
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src
Committed By: joerg
Date: Fri Sep 16 15:36:01 UTC 2011
Modified Files:
src/crypto/external/bsd/openssh/dist: log.c
Log Message:
Reapply formatting cleanup
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/dist/log.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/log.c
diff -u src/crypto/external/bsd/openssh/dist/log.c:1.5 src/crypto/external/bsd/openssh/dist/log.c:1.6
--- src/crypto/external/bsd/openssh/dist/log.c:1.5 Wed Sep 7 17:49:19 2011
+++ src/crypto/external/bsd/openssh/dist/log.c Fri Sep 16 15:36:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: log.c,v 1.5 2011/09/07 17:49:19 christos Exp $ */
+/* $NetBSD: log.c,v 1.6 2011/09/16 15:36:00 joerg Exp $ */
/* $OpenBSD: log.c,v 1.42 2011/06/17 21:44:30 djm Exp $ */
/*
* Author: Tatu Ylonen y...@cs.hut.fi
@@ -36,7 +36,7 @@
*/
#include includes.h
-__RCSID($NetBSD: log.c,v 1.5 2011/09/07 17:49:19 christos Exp $);
+__RCSID($NetBSD: log.c,v 1.6 2011/09/16 15:36:00 joerg Exp $);
#include sys/types.h
#include sys/uio.h
@@ -325,8 +325,10 @@
#ifdef SYSLOG_DATA_INIT
struct syslog_data sdata = SYSLOG_DATA_INIT;
#endif
- char msgbuf[MSGBUFSIZ];
+ char msgbuf[MSGBUFSIZ], *msgbufp;
char visbuf[MSGBUFSIZ * 4 + 1];
+ size_t len, len2;
+ int len3;
const char *txt = NULL;
int pri = LOG_INFO;
int saved_errno = errno;
@@ -369,13 +371,19 @@
pri = LOG_ERR;
break;
}
+ len = sizeof(msgbuf);
+ msgbufp = msgbuf;
if (txt != NULL log_handler == NULL) {
- snprintf(visbuf, sizeof(visbuf), %s: %s, txt, fmt);
- vsnprintf(msgbuf, sizeof(msgbuf), visbuf, args);
- } else {
- vsnprintf(msgbuf, sizeof(msgbuf), fmt, args);
+ len2 = strlen(txt);
+ if (len2 = len)
+ len2 = len - 1;
+ memcpy(msgbufp, txt, len2);
+ msgbufp += len2;
+ *msgbufp++ = '\0';
+ len -= len2 + 1;
}
- strnvis(visbuf, sizeof(visbuf), msgbuf, VIS_SAFE|VIS_OCTAL);
+ vsnprintf(msgbufp, len, fmt, args);
+ len3 = strnvis(visbuf, sizeof(visbuf), msgbuf, VIS_SAFE|VIS_OCTAL);
if (log_handler != NULL) {
/* Avoid recursion */
tmp_handler = log_handler;
@@ -383,8 +391,11 @@
tmp_handler(level, visbuf, log_handler_ctx);
log_handler = tmp_handler;
} else if (log_on_stderr) {
- snprintf(msgbuf, sizeof msgbuf, %s\r\n, visbuf);
- write(STDERR_FILENO, msgbuf, strlen(msgbuf));
+ struct iovec iov[] = {
+ { visbuf, len3 },
+ { __UNCONST(\r\n), 2 },
+ };
+ writev(STDERR_FILENO, iov, __arraycount(iov));
} else {
#ifdef SYSLOG_DATA_INIT
openlog_r(argv0 ? argv0 : __progname, LOG_PID, log_facility, sdata);
CVS commit: src/usr.bin/make
Module Name:src
Committed By: joerg
Date: Fri Sep 16 15:38:04 UTC 2011
Modified Files:
src/usr.bin/make: compat.c job.c main.c make.c make.h nonints.h
Log Message:
Use __dead consistently. If it doesn't exist, define it away.
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/usr.bin/make/compat.c src/usr.bin/make/make.c
cvs rdiff -u -r1.159 -r1.160 src/usr.bin/make/job.c
cvs rdiff -u -r1.197 -r1.198 src/usr.bin/make/main.c
cvs rdiff -u -r1.86 -r1.87 src/usr.bin/make/make.h
cvs rdiff -u -r1.62 -r1.63 src/usr.bin/make/nonints.h
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/make/compat.c
diff -u src/usr.bin/make/compat.c:1.83 src/usr.bin/make/compat.c:1.84
--- src/usr.bin/make/compat.c:1.83 Sun Aug 14 13:06:09 2011
+++ src/usr.bin/make/compat.c Fri Sep 16 15:38:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: compat.c,v 1.83 2011/08/14 13:06:09 christos Exp $ */
+/* $NetBSD: compat.c,v 1.84 2011/09/16 15:38:03 joerg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: compat.c,v 1.83 2011/08/14 13:06:09 christos Exp $;
+static char rcsid[] = $NetBSD: compat.c,v 1.84 2011/09/16 15:38:03 joerg Exp $;
#else
#include sys/cdefs.h
#ifndef lint
#if 0
static char sccsid[] = @(#)compat.c 8.2 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: compat.c,v 1.83 2011/08/14 13:06:09 christos Exp $);
+__RCSID($NetBSD: compat.c,v 1.84 2011/09/16 15:38:03 joerg Exp $);
#endif
#endif /* not lint */
#endif
@@ -121,7 +121,7 @@
static GNode *curTarg = NULL;
static GNode *ENDNode;
-static void CompatInterrupt(int);
+static void CompatInterrupt(int) __dead;
static void
Compat_Init(void)
Index: src/usr.bin/make/make.c
diff -u src/usr.bin/make/make.c:1.83 src/usr.bin/make/make.c:1.84
--- src/usr.bin/make/make.c:1.83 Thu Nov 25 21:31:09 2010
+++ src/usr.bin/make/make.c Fri Sep 16 15:38:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: make.c,v 1.83 2010/11/25 21:31:09 christos Exp $ */
+/* $NetBSD: make.c,v 1.84 2011/09/16 15:38:04 joerg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: make.c,v 1.83 2010/11/25 21:31:09 christos Exp $;
+static char rcsid[] = $NetBSD: make.c,v 1.84 2011/09/16 15:38:04 joerg Exp $;
#else
#include sys/cdefs.h
#ifndef lint
#if 0
static char sccsid[] = @(#)make.c 8.1 (Berkeley) 6/6/93;
#else
-__RCSID($NetBSD: make.c,v 1.83 2010/11/25 21:31:09 christos Exp $);
+__RCSID($NetBSD: make.c,v 1.84 2011/09/16 15:38:04 joerg Exp $);
#endif
#endif /* not lint */
#endif
@@ -139,7 +139,7 @@
static int MakeBuildChild(void *, void *);
static int MakeBuildParent(void *, void *);
-static void
+__dead static void
make_abort(GNode *gn, int line)
{
static int two = 2;
Index: src/usr.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.159 src/usr.bin/make/job.c:1.160
--- src/usr.bin/make/job.c:1.159 Sun Aug 28 03:54:07 2011
+++ src/usr.bin/make/job.c Fri Sep 16 15:38:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.159 2011/08/28 03:54:07 sjg Exp $ */
+/* $NetBSD: job.c,v 1.160 2011/09/16 15:38:03 joerg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: job.c,v 1.159 2011/08/28 03:54:07 sjg Exp $;
+static char rcsid[] = $NetBSD: job.c,v 1.160 2011/09/16 15:38:03 joerg Exp $;
#else
#include sys/cdefs.h
#ifndef lint
#if 0
static char sccsid[] = @(#)job.c 8.2 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: job.c,v 1.159 2011/08/28 03:54:07 sjg Exp $);
+__RCSID($NetBSD: job.c,v 1.160 2011/09/16 15:38:03 joerg Exp $);
#endif
#endif /* not lint */
#endif
@@ -352,7 +352,7 @@
static char *JobOutput(Job *, char *, char *, int);
static void JobDoOutput(Job *, Boolean);
static Shell *JobMatchShell(const char *);
-static void JobInterrupt(int, int);
+static void JobInterrupt(int, int) __dead;
static void JobRestartJobs(void);
static void JobTokenAdd(void);
static void JobSigLock(sigset_t *);
@@ -523,14 +523,14 @@
*
*---
*/
-static void
+__dead static void
JobPassSig_int(int signo)
{
/* Run .INTERRUPT target then exit */
JobInterrupt(TRUE, signo);
}
-static void
+__dead static void
JobPassSig_term(int signo)
{
/* Dont run .INTERRUPT target then exit */
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.197 src/usr.bin/make/main.c:1.198
--- src/usr.bin/make/main.c:1.197 Wed May 4 20:38:31 2011
+++ src/usr.bin/make/main.c Fri Sep 16 15:38:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.197 2011/05/04 20:38:31 sjg Exp $ */
+/* $NetBSD: main.c,v 1.198 2011/09/16 15:38:04 joerg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7
CVS commit: src/usr.sbin/faithd
Module Name:src Committed By: joerg Date: Fri Sep 16 15:39:37 UTC 2011 Modified Files: src/usr.sbin/faithd: faithd.c faithd.h Log Message: Use __dead To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/usr.sbin/faithd/faithd.c cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/faithd/faithd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/faithd/faithd.c diff -u src/usr.sbin/faithd/faithd.c:1.34 src/usr.sbin/faithd/faithd.c:1.35 --- src/usr.sbin/faithd/faithd.c:1.34 Tue Aug 30 21:14:06 2011 +++ src/usr.sbin/faithd/faithd.c Fri Sep 16 15:39:37 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: faithd.c,v 1.34 2011/08/30 21:14:06 joerg Exp $ */ +/* $NetBSD: faithd.c,v 1.35 2011/09/16 15:39:37 joerg Exp $ */ /* $KAME: faithd.c,v 1.62 2003/08/19 21:20:33 itojun Exp $ */ /* @@ -96,7 +96,7 @@ static int inetd_main(int, char **); static int daemon_main(int, char **); static void play_service(int) __dead; -static void play_child(int, struct sockaddr *); +static void play_child(int, struct sockaddr *) __dead; static int faith_prefix(struct sockaddr *); static int map6to4(struct sockaddr_in6 *, struct sockaddr_in *); static void sig_child(int); Index: src/usr.sbin/faithd/faithd.h diff -u src/usr.sbin/faithd/faithd.h:1.11 src/usr.sbin/faithd/faithd.h:1.12 --- src/usr.sbin/faithd/faithd.h:1.11 Tue Aug 30 21:14:06 2011 +++ src/usr.sbin/faithd/faithd.h Fri Sep 16 15:39:37 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: faithd.h,v 1.11 2011/08/30 21:14:06 joerg Exp $ */ +/* $NetBSD: faithd.h,v 1.12 2011/09/16 15:39:37 joerg Exp $ */ /* $KAME: faithd.h,v 1.9 2002/05/09 09:41:24 itojun Exp $ */ /* @@ -34,7 +34,7 @@ extern int dflag; extern void tcp_relay(int, int, const char *) __dead; -extern void ftp_relay(int, int); +extern void ftp_relay(int, int) __dead; extern int ftp_active(int, int, int *, int *); extern int ftp_passive(int, int, int *, int *); extern void exit_success(const char *, ...) __dead __printflike(1, 2);
CVS commit: src/usr.bin
Module Name:src Committed By: joerg Date: Fri Sep 16 15:39:31 UTC 2011 Modified Files: src/usr.bin/dirname: dirname.c src/usr.bin/extattr: getextattr.c src/usr.bin/find: main.c src/usr.bin/fsplit: fsplit.c src/usr.bin/ftp: cmds.c extern.h fetch.c ftp.c main.c src/usr.bin/grep: grep.c src/usr.bin/iconv: iconv.c src/usr.bin/id: id.c src/usr.bin/ktrace: ktrace.c src/usr.bin/last: last.c want.c src/usr.bin/leave: leave.c src/usr.bin/mail: cmd1.c collect.c lex.c tty.c src/usr.bin/mkcsmapper: yacc.y src/usr.bin/mkesdb: yacc.y src/usr.bin/netstat: if.c main.c src/usr.bin/newgrp: newgrp.c src/usr.bin/passwd: extern.h yp_passwd.c src/usr.bin/pathchk: pathchk.c src/usr.bin/progress: progress.c src/usr.bin/pwhash: pwhash.c src/usr.bin/rev: rev.c src/usr.bin/rpcinfo: rpcinfo.c src/usr.bin/rump_allserver: rump_allserver.c src/usr.bin/rump_dhcpclient: main.c src/usr.bin/rump_halt: rump.halt.c src/usr.bin/sdpquery: sdpquery.c src/usr.bin/shmif_dumpbus: shmif_dumpbus.c src/usr.bin/shuffle: shuffle.c src/usr.bin/skey: skey.c src/usr.bin/sort: sort.c sort.h src/usr.bin/split: split.c src/usr.bin/tabs: tabs.c src/usr.bin/tftp: main.c tftp.c src/usr.bin/unifdef: unifdef.c src/usr.bin/usbhidctl: usbhid.c src/usr.bin/uuencode: uuencode.c src/usr.bin/uuidgen: uuidgen.c src/usr.bin/videoctl: videoctl.c src/usr.bin/w: w.c src/usr.bin/wc: wc.c src/usr.bin/xstr: xstr.c Log Message: Use __dead To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/usr.bin/dirname/dirname.c cvs rdiff -u -r1.8 -r1.9 src/usr.bin/extattr/getextattr.c cvs rdiff -u -r1.29 -r1.30 src/usr.bin/find/main.c cvs rdiff -u -r1.27 -r1.28 src/usr.bin/fsplit/fsplit.c cvs rdiff -u -r1.131 -r1.132 src/usr.bin/ftp/cmds.c cvs rdiff -u -r1.78 -r1.79 src/usr.bin/ftp/extern.h cvs rdiff -u -r1.193 -r1.194 src/usr.bin/ftp/fetch.c cvs rdiff -u -r1.161 -r1.162 src/usr.bin/ftp/ftp.c cvs rdiff -u -r1.118 -r1.119 src/usr.bin/ftp/main.c cvs rdiff -u -r1.9 -r1.10 src/usr.bin/grep/grep.c cvs rdiff -u -r1.16 -r1.17 src/usr.bin/iconv/iconv.c cvs rdiff -u -r1.31 -r1.32 src/usr.bin/id/id.c cvs rdiff -u -r1.44 -r1.45 src/usr.bin/ktrace/ktrace.c cvs rdiff -u -r1.34 -r1.35 src/usr.bin/last/last.c cvs rdiff -u -r1.13 -r1.14 src/usr.bin/last/want.c cvs rdiff -u -r1.14 -r1.15 src/usr.bin/leave/leave.c cvs rdiff -u -r1.30 -r1.31 src/usr.bin/mail/cmd1.c cvs rdiff -u -r1.43 -r1.44 src/usr.bin/mail/collect.c cvs rdiff -u -r1.39 -r1.40 src/usr.bin/mail/lex.c cvs rdiff -u -r1.28 -r1.29 src/usr.bin/mail/tty.c cvs rdiff -u -r1.8 -r1.9 src/usr.bin/mkcsmapper/yacc.y cvs rdiff -u -r1.5 -r1.6 src/usr.bin/mkesdb/yacc.y cvs rdiff -u -r1.71 -r1.72 src/usr.bin/netstat/if.c cvs rdiff -u -r1.80 -r1.81 src/usr.bin/netstat/main.c cvs rdiff -u -r1.6 -r1.7 src/usr.bin/newgrp/newgrp.c cvs rdiff -u -r1.13 -r1.14 src/usr.bin/passwd/extern.h cvs rdiff -u -r1.35 -r1.36 src/usr.bin/passwd/yp_passwd.c cvs rdiff -u -r1.1 -r1.2 src/usr.bin/pathchk/pathchk.c cvs rdiff -u -r1.18 -r1.19 src/usr.bin/progress/progress.c cvs rdiff -u -r1.14 -r1.15 src/usr.bin/pwhash/pwhash.c cvs rdiff -u -r1.11 -r1.12 src/usr.bin/rev/rev.c cvs rdiff -u -r1.33 -r1.34 src/usr.bin/rpcinfo/rpcinfo.c cvs rdiff -u -r1.21 -r1.22 src/usr.bin/rump_allserver/rump_allserver.c cvs rdiff -u -r1.2 -r1.3 src/usr.bin/rump_dhcpclient/main.c cvs rdiff -u -r1.2 -r1.3 src/usr.bin/rump_halt/rump.halt.c cvs rdiff -u -r1.6 -r1.7 src/usr.bin/sdpquery/sdpquery.c cvs rdiff -u -r1.7 -r1.8 src/usr.bin/shmif_dumpbus/shmif_dumpbus.c cvs rdiff -u -r1.20 -r1.21 src/usr.bin/shuffle/shuffle.c cvs rdiff -u -r1.17 -r1.18 src/usr.bin/skey/skey.c cvs rdiff -u -r1.60 -r1.61 src/usr.bin/sort/sort.c cvs rdiff -u -r1.33 -r1.34 src/usr.bin/sort/sort.h cvs rdiff -u -r1.25 -r1.26 src/usr.bin/split/split.c cvs rdiff -u -r1.3 -r1.4 src/usr.bin/tabs/tabs.c cvs rdiff -u -r1.26 -r1.27 src/usr.bin/tftp/main.c cvs rdiff -u -r1.30 -r1.31 src/usr.bin/tftp/tftp.c cvs rdiff -u -r1.19 -r1.20 src/usr.bin/unifdef/unifdef.c cvs rdiff -u -r1.35 -r1.36 src/usr.bin/usbhidctl/usbhid.c cvs rdiff -u -r1.14 -r1.15 src/usr.bin/uuencode/uuencode.c cvs rdiff -u -r1.3 -r1.4 src/usr.bin/uuidgen/uuidgen.c cvs rdiff -u -r1.1 -r1.2 src/usr.bin/videoctl/videoctl.c cvs rdiff -u -r1.74 -r1.75 src/usr.bin/w/w.c cvs rdiff -u -r1.34 -r1.35 src/usr.bin/wc/wc.c cvs rdiff -u -r1.24 -r1.25 src/usr.bin/xstr/xstr.c 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/dirname/dirname.c diff -u src/usr.bin/dirname/dirname.c:1.11 src/usr.bin/dirname/dirname.c:1.12 --- src/usr.bin/dirname/dirname.c:1.11 Mon Jul 21 14:19:22 2008 +++ src/usr.bin/dirname/dirname.c Fri Sep 16 15:39:25 2011 @@
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: joerg
Date: Fri Sep 16 15:42:28 UTC 2011
Modified Files:
src/distrib/utils/sysinst: aout2elf.c main.c
Log Message:
Use __dead
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/utils/sysinst/aout2elf.c
cvs rdiff -u -r1.60 -r1.61 src/distrib/utils/sysinst/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/aout2elf.c
diff -u src/distrib/utils/sysinst/aout2elf.c:1.16 src/distrib/utils/sysinst/aout2elf.c:1.17
--- src/distrib/utils/sysinst/aout2elf.c:1.16 Mon Apr 4 08:30:12 2011
+++ src/distrib/utils/sysinst/aout2elf.c Fri Sep 16 15:42:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: aout2elf.c,v 1.16 2011/04/04 08:30:12 mbalmer Exp $
+/* $NetBSD: aout2elf.c,v 1.17 2011/09/16 15:42:28 joerg Exp $
*
* Copyright 1997 Piermont Information Systems Inc.
* All rights reserved.
@@ -192,7 +192,7 @@
return n;
}
-static void
+__dead static void
abort_libupdate(void)
{
msg_display(MSG_aoutfail);
Index: src/distrib/utils/sysinst/main.c
diff -u src/distrib/utils/sysinst/main.c:1.60 src/distrib/utils/sysinst/main.c:1.61
--- src/distrib/utils/sysinst/main.c:1.60 Mon May 30 14:20:48 2011
+++ src/distrib/utils/sysinst/main.c Fri Sep 16 15:42:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.60 2011/05/30 14:20:48 joerg Exp $ */
+/* $NetBSD: main.c,v 1.61 2011/09/16 15:42:28 joerg Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -53,8 +53,8 @@
int main(int, char **);
static void select_language(void);
-static void usage(void);
-static void miscsighandler(int);
+__dead static void usage(void);
+__dead static void miscsighandler(int);
static void ttysighandler(int);
static void cleanup(void);
static void process_f_flag(char *);
CVS commit: src/sbin/devpubd
Module Name:src
Committed By: joerg
Date: Fri Sep 16 15:42:56 UTC 2011
Modified Files:
src/sbin/devpubd: devpubd.c
Log Message:
Use __dead. Save a pointer.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sbin/devpubd/devpubd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/devpubd/devpubd.c
diff -u src/sbin/devpubd/devpubd.c:1.1 src/sbin/devpubd/devpubd.c:1.2
--- src/sbin/devpubd/devpubd.c:1.1 Mon Aug 29 11:38:48 2011
+++ src/sbin/devpubd/devpubd.c Fri Sep 16 15:42:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: devpubd.c,v 1.1 2011/08/29 11:38:48 mrg Exp $ */
+/* $NetBSD: devpubd.c,v 1.2 2011/09/16 15:42:56 joerg Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca
@@ -36,7 +36,7 @@
#include sys/cdefs.h
__COPYRIGHT(@(#) Copyright (c) 2011\
Jared D. McNeill jmcne...@invisible.ca. All rights reserved.);
-__RCSID($NetBSD: devpubd.c,v 1.1 2011/08/29 11:38:48 mrg Exp $);
+__RCSID($NetBSD: devpubd.c,v 1.2 2011/09/16 15:42:56 joerg Exp $);
#include sys/types.h
#include sys/ioctl.h
@@ -55,12 +55,12 @@
#include unistd.h
static int drvctl_fd = -1;
-static const char *devpubd_script = DEVPUBD_RUN_HOOKS;
+static const char devpubd_script[] = DEVPUBD_RUN_HOOKS;
#define DEVPUBD_ATTACH_EVENT device-attach
#define DEVPUBD_DETACH_EVENT device-detach
-static void
+__dead static void
devpubd_exec(const char *path, const char *event, const char *device)
{
int error;
@@ -107,7 +107,7 @@
}
}
-static void
+__dead static void
devpubd_eventloop(void)
{
const char *event, *device;
@@ -195,7 +195,7 @@
return;
}
-static void
+__dead static void
usage(void)
{
fprintf(stderr, usage: %s [-f]\n, getprogname());
CVS commit: src/lib
Module Name:src
Committed By: joerg
Date: Fri Sep 16 16:05:59 UTC 2011
Modified Files:
src/lib/libc/isc: assertions.c
src/lib/libc/misc: stack_protector.c
src/lib/libc/thread-stub: thread-stub.c
src/lib/libc/time: zdump.c
src/lib/libpthread: pthread.c pthread_int.h
Log Message:
Use __dead
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/isc/assertions.c
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/misc/stack_protector.c
cvs rdiff -u -r1.21 -r1.22 src/lib/libc/thread-stub/thread-stub.c
cvs rdiff -u -r1.23 -r1.24 src/lib/libc/time/zdump.c
cvs rdiff -u -r1.123 -r1.124 src/lib/libpthread/pthread.c
cvs rdiff -u -r1.79 -r1.80 src/lib/libpthread/pthread_int.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/isc/assertions.c
diff -u src/lib/libc/isc/assertions.c:1.6 src/lib/libc/isc/assertions.c:1.7
--- src/lib/libc/isc/assertions.c:1.6 Sun Apr 12 17:07:17 2009
+++ src/lib/libc/isc/assertions.c Fri Sep 16 16:05:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: assertions.c,v 1.6 2009/04/12 17:07:17 christos Exp $ */
+/* $NetBSD: assertions.c,v 1.7 2011/09/16 16:05:58 joerg Exp $ */
/*
* Copyright (C) 2004, 2005, 2008 Internet Systems Consortium, Inc. (ISC)
@@ -22,7 +22,7 @@
#ifdef notdef
static const char rcsid[] = Id: assertions.c,v 1.5 2008/11/14 02:36:51 marka Exp;
#else
-__RCSID($NetBSD: assertions.c,v 1.6 2009/04/12 17:07:17 christos Exp $);
+__RCSID($NetBSD: assertions.c,v 1.7 2011/09/16 16:05:58 joerg Exp $);
#endif
#endif
@@ -41,7 +41,7 @@
* Forward.
*/
-static void default_assertion_failed(const char *, int, assertion_type,
+__dead static void default_assertion_failed(const char *, int, assertion_type,
const char *, int);
/*
Index: src/lib/libc/misc/stack_protector.c
diff -u src/lib/libc/misc/stack_protector.c:1.5 src/lib/libc/misc/stack_protector.c:1.6
--- src/lib/libc/misc/stack_protector.c:1.5 Tue Dec 7 20:10:53 2010
+++ src/lib/libc/misc/stack_protector.c Fri Sep 16 16:05:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: stack_protector.c,v 1.5 2010/12/07 20:10:53 joerg Exp $ */
+/* $NetBSD: stack_protector.c,v 1.6 2011/09/16 16:05:59 joerg Exp $ */
/* $OpenBSD: stack_protector.c,v 1.10 2006/03/31 05:34:44 deraadt Exp $ */
/*
@@ -28,7 +28,7 @@
*
*/
#include sys/cdefs.h
-__RCSID($NetBSD: stack_protector.c,v 1.5 2010/12/07 20:10:53 joerg Exp $);
+__RCSID($NetBSD: stack_protector.c,v 1.6 2011/09/16 16:05:59 joerg Exp $);
#ifdef _LIBC
#include namespace.h
@@ -50,7 +50,7 @@
long __stack_chk_guard[8] = {0, 0, 0, 0, 0, 0, 0, 0};
static void __fail(const char *) __attribute__((__noreturn__));
-void __stack_chk_fail_local(void);
+__dead void __stack_chk_fail_local(void);
void __guard_setup(void);
void
Index: src/lib/libc/thread-stub/thread-stub.c
diff -u src/lib/libc/thread-stub/thread-stub.c:1.21 src/lib/libc/thread-stub/thread-stub.c:1.22
--- src/lib/libc/thread-stub/thread-stub.c:1.21 Fri Jan 30 23:21:03 2009
+++ src/lib/libc/thread-stub/thread-stub.c Fri Sep 16 16:05:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: thread-stub.c,v 1.21 2009/01/30 23:21:03 ad Exp $ */
+/* $NetBSD: thread-stub.c,v 1.22 2011/09/16 16:05:59 joerg Exp $ */
/*-
* Copyright (c) 2003, 2009 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: thread-stub.c,v 1.21 2009/01/30 23:21:03 ad Exp $);
+__RCSID($NetBSD: thread-stub.c,v 1.22 2011/09/16 16:05:59 joerg Exp $);
#endif /* LIBC_SCCS and not lint */
/*
@@ -343,7 +343,7 @@
int __libc_thr_yield_stub(void);
int __libc_thr_create_stub(thr_t *, const thrattr_t *,
void *(*)(void *), void *);
-void __libc_thr_exit_stub(void *);
+__dead void __libc_thr_exit_stub(void *);
int *__libc_thr_errno_stub(void);
int __libc_thr_setcancelstate_stub(int, int *);
int __libc_thr_equal_stub(pthread_t, pthread_t);
Index: src/lib/libc/time/zdump.c
diff -u src/lib/libc/time/zdump.c:1.23 src/lib/libc/time/zdump.c:1.24
--- src/lib/libc/time/zdump.c:1.23 Sun Sep 4 13:25:22 2011
+++ src/lib/libc/time/zdump.c Fri Sep 16 16:05:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: zdump.c,v 1.23 2011/09/04 13:25:22 christos Exp $ */
+/* $NetBSD: zdump.c,v 1.24 2011/09/16 16:05:59 joerg Exp $ */
/*
** This file is in the public domain, so clarified as of
** 2009-05-17 by Arthur David Olson.
@@ -7,7 +7,7 @@
#include sys/cdefs.h
#ifndef lint
#ifndef NOID
-__RCSID($NetBSD: zdump.c,v 1.23 2011/09/04 13:25:22 christos Exp $);
+__RCSID($NetBSD: zdump.c,v 1.24 2011/09/16 16:05:59 joerg Exp $);
#endif /* !defined NOID */
#endif /* !defined lint */
@@ -244,7 +244,7 @@
warned = TRUE;
}
-static void
+__dead static void
usage(FILE *stream, int status)
{
(void) fprintf(stream,
Index: src/lib/libpthread/pthread.c
diff -u src/lib/libpthread/pthread.c:1.123 src/lib/libpthread/pthread.c:1.124
--- src/lib/libpthread/pthread.c:1.123 Wed Mar
CVS commit: src/bin/dd
Module Name:src Committed By: joerg Date: Fri Sep 16 16:06:23 UTC 2011 Modified Files: src/bin/dd: args.c extern.h Log Message: Use __dead for the small build too To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/bin/dd/args.c cvs rdiff -u -r1.19 -r1.20 src/bin/dd/extern.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/dd/args.c diff -u src/bin/dd/args.c:1.34 src/bin/dd/args.c:1.35 --- src/bin/dd/args.c:1.34 Fri Feb 4 19:42:12 2011 +++ src/bin/dd/args.c Fri Sep 16 16:06:23 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: args.c,v 1.34 2011/02/04 19:42:12 pooka Exp $ */ +/* $NetBSD: args.c,v 1.35 2011/09/16 16:06:23 joerg Exp $ */ /*- * Copyright (c) 1991, 1993, 1994 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = @(#)args.c 8.3 (Berkeley) 4/2/94; #else -__RCSID($NetBSD: args.c,v 1.34 2011/02/04 19:42:12 pooka Exp $); +__RCSID($NetBSD: args.c,v 1.35 2011/09/16 16:06:23 joerg Exp $); #endif #endif /* not lint */ @@ -61,6 +61,9 @@ #endif static void f_bs(char *); static void f_cbs(char *); +#ifdef NO_CONV +__dead +#endif static void f_conv(char *); static void f_count(char *); static void f_files(char *); Index: src/bin/dd/extern.h diff -u src/bin/dd/extern.h:1.19 src/bin/dd/extern.h:1.20 --- src/bin/dd/extern.h:1.19 Mon Aug 29 14:51:18 2011 +++ src/bin/dd/extern.h Fri Sep 16 16:06:23 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: extern.h,v 1.19 2011/08/29 14:51:18 joerg Exp $ */ +/* $NetBSD: extern.h,v 1.20 2011/09/16 16:06:23 joerg Exp $ */ /*- * Copyright (c) 1991, 1993, 1994 @@ -37,8 +37,17 @@ #include sys/cdefs.h +#ifdef NO_CONV +__dead void block(void); +__dead void block_close(void); +__dead void unblock(void); +__dead void unblock_close(void); +#else void block(void); void block_close(void); +void unblock(void); +void unblock_close(void); +#endif void dd_out(int); void def(void); void def_close(void);
CVS commit: src/external/bsd/libevent/dist
Module Name:src Committed By: joerg Date: Fri Sep 16 16:09:03 UTC 2011 Modified Files: src/external/bsd/libevent/dist: log.h Log Message: Use __dead To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/libevent/dist/log.h 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/libevent/dist/log.h diff -u src/external/bsd/libevent/dist/log.h:1.1.1.1 src/external/bsd/libevent/dist/log.h:1.2 --- src/external/bsd/libevent/dist/log.h:1.1.1.1 Mon Nov 2 10:01:01 2009 +++ src/external/bsd/libevent/dist/log.h Fri Sep 16 16:09:03 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: log.h,v 1.1.1.1 2009/11/02 10:01:01 plunky Exp $ */ +/* $NetBSD: log.h,v 1.2 2011/09/16 16:09:03 joerg Exp $ */ /* * Copyright (c) 2000-2004 Niels Provos pro...@citi.umich.edu * All rights reserved. @@ -34,9 +34,9 @@ #define EV_CHECK_FMT(a,b) #endif -void event_err(int eval, const char *fmt, ...) EV_CHECK_FMT(2,3); +__dead void event_err(int eval, const char *fmt, ...) EV_CHECK_FMT(2,3); void event_warn(const char *fmt, ...) EV_CHECK_FMT(1,2); -void event_errx(int eval, const char *fmt, ...) EV_CHECK_FMT(2,3); +__dead void event_errx(int eval, const char *fmt, ...) EV_CHECK_FMT(2,3); void event_warnx(const char *fmt, ...) EV_CHECK_FMT(1,2); void event_msgx(const char *fmt, ...) EV_CHECK_FMT(1,2); void _event_debugx(const char *fmt, ...) EV_CHECK_FMT(1,2);
CVS commit: src/external/bsd/libpcap/dist
Module Name:src
Committed By: joerg
Date: Fri Sep 16 16:09:25 UTC 2011
Modified Files:
src/external/bsd/libpcap/dist: gencode.c grammar.y
Log Message:
Use __dead
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libpcap/dist/gencode.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/libpcap/dist/grammar.y
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/libpcap/dist/gencode.c
diff -u src/external/bsd/libpcap/dist/gencode.c:1.2 src/external/bsd/libpcap/dist/gencode.c:1.3
--- src/external/bsd/libpcap/dist/gencode.c:1.2 Sun Dec 5 01:45:46 2010
+++ src/external/bsd/libpcap/dist/gencode.c Fri Sep 16 16:09:25 2011
@@ -378,8 +378,8 @@
return b;
}
-static inline void
-syntax()
+__dead static inline void
+syntax(void)
{
bpf_error(syntax error in filter expression);
}
Index: src/external/bsd/libpcap/dist/grammar.y
diff -u src/external/bsd/libpcap/dist/grammar.y:1.1.1.2 src/external/bsd/libpcap/dist/grammar.y:1.2
--- src/external/bsd/libpcap/dist/grammar.y:1.1.1.2 Sun Dec 5 01:27:06 2010
+++ src/external/bsd/libpcap/dist/grammar.y Fri Sep 16 16:09:25 2011
@@ -159,7 +159,7 @@
static struct qual qerr = { Q_UNDEF, Q_UNDEF, Q_UNDEF, Q_UNDEF };
-static void
+__dead static void
yyerror(const char *msg)
{
++n_errors;
CVS commit: src/external/historical/nawk/dist
Module Name:src Committed By: joerg Date: Fri Sep 16 16:09:47 UTC 2011 Modified Files: src/external/historical/nawk/dist: main.c proto.h Log Message: Use __dead To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/historical/nawk/dist/main.c cvs rdiff -u -r1.4 -r1.5 src/external/historical/nawk/dist/proto.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/historical/nawk/dist/main.c diff -u src/external/historical/nawk/dist/main.c:1.5 src/external/historical/nawk/dist/main.c:1.6 --- src/external/historical/nawk/dist/main.c:1.5 Mon Apr 18 15:23:28 2011 +++ src/external/historical/nawk/dist/main.c Fri Sep 16 16:09:46 2011 @@ -71,7 +71,7 @@ return NULL; } -static void fpecatch(int n +__dead static void fpecatch(int n #ifdef SA_SIGINFO , siginfo_t *si, void *uc #endif Index: src/external/historical/nawk/dist/proto.h diff -u src/external/historical/nawk/dist/proto.h:1.4 src/external/historical/nawk/dist/proto.h:1.5 --- src/external/historical/nawk/dist/proto.h:1.4 Sat May 28 15:13:04 2011 +++ src/external/historical/nawk/dist/proto.h Fri Sep 16 16:09:46 2011 @@ -46,7 +46,7 @@ extern int hexstr(const uschar **); extern int quoted(const uschar **); extern char *cclenter(const char *); -extern void overflo(const char *); +extern void overflo(const char *) __dead; extern void cfoll(fa *, Node *); extern int first(Node *); extern void follow(Node *); @@ -137,7 +137,7 @@ extern void bcheck2(int, int, int); extern void SYNTAX(const char *, ...) __attribute__((__format__(__printf__, 1, 2))); -extern void FATAL(const char *, ...) +extern void FATAL(const char *, ...) __dead __attribute__((__format__(__printf__, 1, 2))); extern void WARNING(const char *, ...) __attribute__((__format__(__printf__, 1, 2)));
CVS commit: src
Module Name:src Committed By: plunky Date: Fri Sep 16 16:13:18 UTC 2011 Modified Files: src/lib/libedit: filecomplete.c src/lib/libutil: login_tty.c src/libexec/atrun: atrun.c src/libexec/ftpd: ftpcmd.y ftpd.c logutmp.c src/libexec/rlogind: rlogind.c src/libexec/rpc.rquotad: rquotad.c src/libexec/rpc.rstatd: rstat_proc.c src/libexec/rpc.rwalld: rwalld.c src/libexec/rpc.sprayd: sprayd.c src/sbin/dump: tape.c src/sbin/fsck_ext2fs: setup.c src/sbin/ping6: ping6.c src/sbin/restore: symtab.c src/tests/fs/nfs/nfsservice/rpcbind: rpcb_svc.c rpcb_svc_4.c rpcb_svc_com.c rpcbind.c src/tests/lib/libc/regex: main.c Log Message: NULL does not need a cast, here To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/lib/libedit/filecomplete.c cvs rdiff -u -r1.12 -r1.13 src/lib/libutil/login_tty.c cvs rdiff -u -r1.20 -r1.21 src/libexec/atrun/atrun.c cvs rdiff -u -r1.92 -r1.93 src/libexec/ftpd/ftpcmd.y cvs rdiff -u -r1.196 -r1.197 src/libexec/ftpd/ftpd.c cvs rdiff -u -r1.11 -r1.12 src/libexec/ftpd/logutmp.c cvs rdiff -u -r1.40 -r1.41 src/libexec/rlogind/rlogind.c cvs rdiff -u -r1.29 -r1.30 src/libexec/rpc.rquotad/rquotad.c cvs rdiff -u -r1.45 -r1.46 src/libexec/rpc.rstatd/rstat_proc.c cvs rdiff -u -r1.22 -r1.23 src/libexec/rpc.rwalld/rwalld.c cvs rdiff -u -r1.17 -r1.18 src/libexec/rpc.sprayd/sprayd.c cvs rdiff -u -r1.49 -r1.50 src/sbin/dump/tape.c cvs rdiff -u -r1.27 -r1.28 src/sbin/fsck_ext2fs/setup.c cvs rdiff -u -r1.77 -r1.78 src/sbin/ping6/ping6.c cvs rdiff -u -r1.27 -r1.28 src/sbin/restore/symtab.c cvs rdiff -u -r1.1 -r1.2 src/tests/fs/nfs/nfsservice/rpcbind/rpcb_svc.c \ src/tests/fs/nfs/nfsservice/rpcbind/rpcb_svc_4.c \ src/tests/fs/nfs/nfsservice/rpcbind/rpcb_svc_com.c cvs rdiff -u -r1.2 -r1.3 src/tests/fs/nfs/nfsservice/rpcbind/rpcbind.c cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/regex/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libedit/filecomplete.c diff -u src/lib/libedit/filecomplete.c:1.30 src/lib/libedit/filecomplete.c:1.31 --- src/lib/libedit/filecomplete.c:1.30 Tue Aug 16 16:25:15 2011 +++ src/lib/libedit/filecomplete.c Fri Sep 16 16:13:16 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: filecomplete.c,v 1.30 2011/08/16 16:25:15 christos Exp $ */ +/* $NetBSD: filecomplete.c,v 1.31 2011/09/16 16:13:16 plunky Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include config.h #if !defined(lint) !defined(SCCSID) -__RCSID($NetBSD: filecomplete.c,v 1.30 2011/08/16 16:25:15 christos Exp $); +__RCSID($NetBSD: filecomplete.c,v 1.31 2011/09/16 16:13:16 plunky Exp $); #endif /* not lint not SCCSID */ #include sys/types.h @@ -333,7 +333,7 @@ match_list[0] = retstr; /* add NULL as last pointer to the array */ - match_list[matches + 1] = (char *) NULL; + match_list[matches + 1] = NULL; return match_list; } Index: src/lib/libutil/login_tty.c diff -u src/lib/libutil/login_tty.c:1.12 src/lib/libutil/login_tty.c:1.13 --- src/lib/libutil/login_tty.c:1.12 Sat Feb 9 05:07:26 2008 +++ src/lib/libutil/login_tty.c Fri Sep 16 16:13:16 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: login_tty.c,v 1.12 2008/02/09 05:07:26 dholland Exp $ */ +/* $NetBSD: login_tty.c,v 1.13 2011/09/16 16:13:16 plunky Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = @(#)login_tty.c 8.1 (Berkeley) 6/4/93; #else -__RCSID($NetBSD: login_tty.c,v 1.12 2008/02/09 05:07:26 dholland Exp $); +__RCSID($NetBSD: login_tty.c,v 1.13 2011/09/16 16:13:16 plunky Exp $); #endif #endif /* LIBC_SCCS and not lint */ @@ -53,7 +53,7 @@ _DIAGASSERT(fd != -1); (void) setsid(); - if (ioctl(fd, TIOCSCTTY, (char *)NULL) == -1) + if (ioctl(fd, TIOCSCTTY, NULL) == -1) return (-1); (void) dup2(fd, STDIN_FILENO); (void) dup2(fd, STDOUT_FILENO); Index: src/libexec/atrun/atrun.c diff -u src/libexec/atrun/atrun.c:1.20 src/libexec/atrun/atrun.c:1.21 --- src/libexec/atrun/atrun.c:1.20 Mon Aug 1 12:28:54 2011 +++ src/libexec/atrun/atrun.c Fri Sep 16 16:13:17 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: atrun.c,v 1.20 2011/08/01 12:28:54 mbalmer Exp $ */ +/* $NetBSD: atrun.c,v 1.21 2011/09/16 16:13:17 plunky Exp $ */ /* * atrun.c - run jobs queued by at; run with root privileges. @@ -59,7 +59,7 @@ #if 0 static char rcsid[] = $OpenBSD: atrun.c,v 1.7 1997/09/08 22:12:10 millert Exp $; #else -__RCSID($NetBSD: atrun.c,v 1.20 2011/08/01 12:28:54 mbalmer Exp $); +__RCSID($NetBSD: atrun.c,v 1.21 2011/09/16 16:13:17 plunky Exp $); #endif static int debug = 0; @@ -327,7 +327,7 @@ /* We're the parent. Let's wait. */ (void)close(fd_in); (void)close(fd_out); - (void)waitpid(pid, (int *)NULL, 0); + (void)waitpid(pid, NULL, 0); /* * Send mail. Unlink the output file first, so it is deleted Index:
CVS commit: src/dist/nvi
Module Name:src Committed By: joerg Date: Fri Sep 16 16:13:41 UTC 2011 Modified Files: src/dist/nvi/cl: cl_main.c src/dist/nvi/common: gs.c Log Message: Use __dead To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/dist/nvi/cl/cl_main.c cvs rdiff -u -r1.1.1.2 -r1.2 src/dist/nvi/common/gs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/dist/nvi/cl/cl_main.c diff -u src/dist/nvi/cl/cl_main.c:1.3 src/dist/nvi/cl/cl_main.c:1.4 --- src/dist/nvi/cl/cl_main.c:1.3 Tue Oct 20 16:17:07 2009 +++ src/dist/nvi/cl/cl_main.c Fri Sep 16 16:13:41 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cl_main.c,v 1.3 2009/10/20 16:17:07 tnn Exp $ */ +/* $NetBSD: cl_main.c,v 1.4 2011/09/16 16:13:41 joerg Exp $ */ /*- * Copyright (c) 1993, 1994 @@ -41,7 +41,7 @@ static void cl_end __P((CL_PRIVATE *)); #endif static CL_PRIVATE *cl_init __P((WIN *)); -static void perr __P((const char *, const char *)); +__dead static void perr __P((const char *, const char *)); static int setsig __P((int, struct sigaction *, void (*)(int))); static void sig_end __P((GS *)); static void term_init __P((const char *, const char *)); Index: src/dist/nvi/common/gs.c diff -u src/dist/nvi/common/gs.c:1.1.1.2 src/dist/nvi/common/gs.c:1.2 --- src/dist/nvi/common/gs.c:1.1.1.2 Sun May 18 14:29:45 2008 +++ src/dist/nvi/common/gs.c Fri Sep 16 16:13:41 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: gs.c,v 1.1.1.2 2008/05/18 14:29:45 aymeric Exp $ */ +/* $NetBSD: gs.c,v 1.2 2011/09/16 16:13:41 joerg Exp $ */ /*- * Copyright (c) 2000 @@ -23,7 +23,7 @@ #include ../common/common.h #include ../perl_api/extern.h -static void perr __P((char *, char *)); +__dead static void perr __P((char *, char *)); /* * gs_init --
CVS commit: src/sys/arch/usermode/usermode
Module Name:src Committed By: reinoud Date: Fri Sep 16 16:25:44 UTC 2011 Modified Files: src/sys/arch/usermode/usermode: intr.c Log Message: Allthough in normal practice at most two are queued, with all the debug info spounting outi, a lot can get queued in the first phase of kernel startup. especially the clock. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/usermode/usermode/intr.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/usermode/usermode/intr.c diff -u src/sys/arch/usermode/usermode/intr.c:1.7 src/sys/arch/usermode/usermode/intr.c:1.8 --- src/sys/arch/usermode/usermode/intr.c:1.7 Thu Sep 15 12:25:25 2011 +++ src/sys/arch/usermode/usermode/intr.c Fri Sep 16 16:25:44 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: intr.c,v 1.7 2011/09/15 12:25:25 reinoud Exp $ */ +/* $NetBSD: intr.c,v 1.8 2011/09/16 16:25:44 reinoud Exp $ */ /*- * Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.7 2011/09/15 12:25:25 reinoud Exp $); +__KERNEL_RCSID(0, $NetBSD: intr.c,v 1.8 2011/09/16 16:25:44 reinoud Exp $); #include sys/types.h @@ -36,7 +36,7 @@ //#define INTR_USE_SIGPROCMASK -#define MAX_QUEUED_EVENTS 64 +#define MAX_QUEUED_EVENTS 128 static int usermode_x = IPL_NONE;
CVS commit: src/sys/arch/usermode/usermode
Module Name:src
Committed By: reinoud
Date: Fri Sep 16 16:26:19 UTC 2011
Modified Files:
src/sys/arch/usermode/usermode: machdep.c
Log Message:
Split the two debug sections
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/usermode/usermode/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/usermode/usermode/machdep.c
diff -u src/sys/arch/usermode/usermode/machdep.c:1.31 src/sys/arch/usermode/usermode/machdep.c:1.32
--- src/sys/arch/usermode/usermode/machdep.c:1.31 Wed Sep 14 18:28:36 2011
+++ src/sys/arch/usermode/usermode/machdep.c Fri Sep 16 16:26:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.31 2011/09/14 18:28:36 reinoud Exp $ */
+/* $NetBSD: machdep.c,v 1.32 2011/09/16 16:26:19 reinoud Exp $ */
/*-
* Copyright (c) 2011 Reinoud Zandijk rein...@netbsd.org
@@ -32,7 +32,7 @@
#include opt_urkelvisor.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.31 2011/09/14 18:28:36 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.32 2011/09/16 16:26:19 reinoud Exp $);
#include sys/types.h
#include sys/param.h
@@ -144,6 +144,7 @@
void
sendsig_siginfo(const ksiginfo_t *ksi, const sigset_t *mask)
{
+ panic(%s not implemented, __func__);
}
int
@@ -241,12 +242,12 @@
ret = copyin(sp + 1, args, argsize);
#if 0
- int i;
for (i = 0; i nargs+4; i++)
printf(stack[%02d] = %PRIx32\n, i, (uint) sp[i]);
-
- for (i = 0; i nargs; i++)
- printf(arg[%02d] = %PRIx32\n, i, (uint) args[i]);
+#endif
+#if 0
+ for (int i = 0; i nargs; i++)
+ printf(arg[%02d] = %PRIx32, , i, (uint) args[i]);
printf(\n);
#endif
CVS commit: src/external/bsd/libarchive/dist/libarchive
Module Name:src
Committed By: joerg
Date: Fri Sep 16 16:27:36 UTC 2011
Modified Files:
src/external/bsd/libarchive/dist/libarchive: archive_check_magic.c
Log Message:
Use __dead
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/bsd/libarchive/dist/libarchive/archive_check_magic.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/libarchive/dist/libarchive/archive_check_magic.c
diff -u src/external/bsd/libarchive/dist/libarchive/archive_check_magic.c:1.1.1.2 src/external/bsd/libarchive/dist/libarchive/archive_check_magic.c:1.2
--- src/external/bsd/libarchive/dist/libarchive/archive_check_magic.c:1.1.1.2 Sat Feb 20 02:48:26 2010
+++ src/external/bsd/libarchive/dist/libarchive/archive_check_magic.c Fri Sep 16 16:27:36 2011
@@ -62,7 +62,7 @@
}
}
-static void
+__dead static void
diediedie(void)
{
#if defined(_WIN32) !defined(__CYGWIN__) defined(_DEBUG)
CVS commit: src/sys/arch/usermode/usermode
Module Name:src
Committed By: reinoud
Date: Fri Sep 16 16:27:39 UTC 2011
Modified Files:
src/sys/arch/usermode/usermode: pmap.c
Log Message:
Print out the memory information on verbose booting too, its too handy to have
around without all the goo of debug printouts
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/usermode/usermode/pmap.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/usermode/usermode/pmap.c
diff -u src/sys/arch/usermode/usermode/pmap.c:1.71 src/sys/arch/usermode/usermode/pmap.c:1.72
--- src/sys/arch/usermode/usermode/pmap.c:1.71 Thu Sep 15 17:44:13 2011
+++ src/sys/arch/usermode/usermode/pmap.c Fri Sep 16 16:27:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.71 2011/09/15 17:44:13 reinoud Exp $ */
+/* $NetBSD: pmap.c,v 1.72 2011/09/16 16:27:39 reinoud Exp $ */
/*-
* Copyright (c) 2011 Reinoud Zandijk rein...@netbsd.org
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.71 2011/09/15 17:44:13 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.72 2011/09/16 16:27:39 reinoud Exp $);
#include opt_memsize.h
#include opt_kmempages.h
@@ -105,6 +105,7 @@
/* amount of physical memory */
int physmem;
+int num_pv_entries = 0;
#define SPARSE_MEMFILE
@@ -173,19 +174,19 @@
kmem_ext_end = mpos;
/* print summary */
- dprintf_debug(\nMemory summary\n);
- dprintf_debug(\tkmem_k_start\t%p\n,(void *) kmem_k_start);
- dprintf_debug(\tkmem_k_end\t%p\n, (void *) kmem_k_end);
- dprintf_debug(\tkmem_ext_start\t%p\n, (void *) kmem_ext_start);
- dprintf_debug(\tkmem_ext_end\t%p\n,(void *) kmem_ext_end);
- dprintf_debug(\tkmem_user_start\t%p\n, (void *) kmem_user_start);
- dprintf_debug(\tkmem_user_end\t%p\n, (void *) kmem_user_end);
-
- dprintf_debug(\ttotmem_len\t%10d\n, (int) totmem_len);
- dprintf_debug(\tkvmsize\t\t%10d\n, (int) KVMSIZE);
- dprintf_debug(\tuser_len\t%10d\n, (int) user_len);
+ aprint_verbose(\nMemory summary\n);
+ aprint_verbose(\tkmem_k_start\t%p\n,(void *) kmem_k_start);
+ aprint_verbose(\tkmem_k_end\t%p\n, (void *) kmem_k_end);
+ aprint_verbose(\tkmem_ext_start\t%p\n, (void *) kmem_ext_start);
+ aprint_verbose(\tkmem_ext_end\t%p\n,(void *) kmem_ext_end);
+ aprint_verbose(\tkmem_user_start\t%p\n, (void *) kmem_user_start);
+ aprint_verbose(\tkmem_user_end\t%p\n, (void *) kmem_user_end);
+
+ aprint_verbose(\ttotmem_len\t%10d\n, (int) totmem_len);
+ aprint_verbose(\tkvmsize\t\t%10d\n, (int) KVMSIZE);
+ aprint_verbose(\tuser_len\t%10d\n, (int) user_len);
- dprintf_debug(\n\n);
+ aprint_verbose(\n\n);
#if 1
/* protect user memory UVM area (---) */
@@ -340,10 +341,10 @@
atop(free_end),
VM_FREELIST_DEFAULT);
- dprintf_debug(leaving pmap_bootstrap:\n);
- dprintf_debug(\t%PRIu64 MB of physical pages left\n,
+ aprint_verbose(leaving pmap_bootstrap:\n);
+ aprint_verbose(\t%PRIu64 MB of physical pages left\n,
(uint64_t) (free_end - (free_start + fpos))/1024/1024);
- dprintf_debug(\t%PRIu64 MB of kmem left\n,
+ aprint_verbose(\t%PRIu64 MB of kmem left\n,
(uint64_t) (kmem_ext_end - kmem_ext_cur_end)/1024/1024);
setup_signal_handlers();
@@ -443,12 +444,14 @@
static struct pv_entry *
pv_alloc(void)
{
+ num_pv_entries++;
return malloc(sizeof(struct pv_entry), M_VMPMAP, M_NOWAIT | M_ZERO);
}
static void
pv_free(struct pv_entry *pv)
{
+ num_pv_entries--;
free(pv, M_VMPMAP);
}
@@ -1017,6 +1020,9 @@
dprintf_debug(pmap_zero_page: pa %p\n, (void *) pa);
+ if (pa (PAGE_SIZE-1))
+ panic(%s: unaligned address passed : %p\n, __func__, (void *) pa);
+
blob = thunk_mmap(NULL, PAGE_SIZE,
THUNK_PROT_READ | THUNK_PROT_WRITE,
THUNK_MAP_FILE | THUNK_MAP_SHARED,
@@ -1034,6 +1040,11 @@
{
char *sblob, *dblob;
+ if (src_pa (PAGE_SIZE-1))
+ panic(%s: unaligned address passed : %p\n, __func__, (void *) src_pa);
+ if (dst_pa (PAGE_SIZE-1))
+ panic(%s: unaligned address passed : %p\n, __func__, (void *) dst_pa);
+
dprintf_debug(pmap_copy_page: pa src %p, pa dst %p\n,
(void *) src_pa, (void *) dst_pa);
CVS commit: src/sys/arch/usermode/usermode
Module Name:src
Committed By: reinoud
Date: Fri Sep 16 16:29:11 UTC 2011
Modified Files:
src/sys/arch/usermode/usermode: trap.c
Log Message:
Move the debug printf's to the new dprintf_debug() and disable the SIGALRM
blocking since we queue them now.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/usermode/usermode/trap.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/usermode/usermode/trap.c
diff -u src/sys/arch/usermode/usermode/trap.c:1.40 src/sys/arch/usermode/usermode/trap.c:1.41
--- src/sys/arch/usermode/usermode/trap.c:1.40 Thu Sep 15 12:25:25 2011
+++ src/sys/arch/usermode/usermode/trap.c Fri Sep 16 16:29:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.40 2011/09/15 12:25:25 reinoud Exp $ */
+/* $NetBSD: trap.c,v 1.41 2011/09/16 16:29:11 reinoud Exp $ */
/*-
* Copyright (c) 2011 Reinoud Zandijk rein...@netbsd.org
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.40 2011/09/15 12:25:25 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.41 2011/09/16 16:29:11 reinoud Exp $);
#include sys/types.h
#include sys/param.h
@@ -82,7 +82,7 @@
sa.sa_flags = SA_RESTART | SA_SIGINFO | SA_ONSTACK;
sa.sa_sigaction = mem_access_handler;
thunk_sigemptyset(sa.sa_mask);
- thunk_sigaddset(sa.sa_mask, SIGALRM);
+// thunk_sigaddset(sa.sa_mask, SIGALRM);
if (thunk_sigaction(SIGSEGV, sa, NULL) == -1)
panic(couldn't register SIGSEGV handler : %d,
thunk_geterrno());
@@ -92,7 +92,7 @@
sa.sa_flags = SA_RESTART | SA_SIGINFO;
sa.sa_sigaction = illegal_instruction_handler;
thunk_sigemptyset(sa.sa_mask);
- thunk_sigaddset(sa.sa_mask, SIGALRM);
+// thunk_sigaddset(sa.sa_mask, SIGALRM);
if (thunk_sigaction(SIGILL, sa, NULL) == -1)
panic(couldn't register SIGILL handler : %d, thunk_geterrno());
@@ -118,7 +118,7 @@
recurse++;
if (recurse 1)
- printf(%s: enter trap recursion level %d\n, __func__, recurse);
+ dprintf_debug(%s: enter trap recursion level %d\n, __func__, recurse);
if ((info-si_signo == SIGSEGV) || (info-si_signo == SIGBUS)) {
l = curlwp;
p = l-l_proc;
@@ -129,29 +129,29 @@
lwp_errno = pcb-pcb_errno = thunk_geterrno();
#if 0
va = (vaddr_t) info-si_addr;
- printf(mem trap lwp = %p pid = %d lid = %d, va = %p\n,
+ dprintf_debug(mem trap lwp = %p pid = %d lid = %d, va = %p\n,
curlwp,
curlwp-l_proc-p_pid,
curlwp-l_lid,
(void *) va);
#endif
#if 0
- printf(SIGSEGV or SIGBUS!\n);
- printf(\tsi_signo = %d\n, info-si_signo);
- printf(\tsi_errno = %d\n, info-si_errno);
- printf(\tsi_code = %d\n, info-si_code);
+ dprintf_debug(SIGSEGV or SIGBUS!\n);
+ dprintf_debug(\tsi_signo = %d\n, info-si_signo);
+ dprintf_debug(\tsi_errno = %d\n, info-si_errno);
+ dprintf_debug(\tsi_code = %d\n, info-si_code);
if (info-si_code == SEGV_MAPERR)
- printf(\t\tSEGV_MAPERR\n);
+ dprintf_debug(\t\tSEGV_MAPERR\n);
if (info-si_code == SEGV_ACCERR)
- printf(\t\tSEGV_ACCERR\n);
+ dprintf_debug(\t\tSEGV_ACCERR\n);
if (info-si_code == BUS_ADRALN)
- printf(\t\tBUS_ADRALN\n);
+ dprintf_debug(\t\tBUS_ADRALN\n);
if (info-si_code == BUS_ADRERR)
- printf(\t\tBUS_ADRERR\n);
+ dprintf_debug(\t\tBUS_ADRERR\n);
if (info-si_code == BUS_OBJERR)
- printf(\t\tBUS_OBJERR\n);
- printf(\tsi_addr = %p\n, info-si_addr);
- printf(\tsi_trap = %d\n, info-si_trap);
+ dprintf_debug(\t\tBUS_OBJERR\n);
+ dprintf_debug(\tsi_addr = %p\n, info-si_addr);
+ dprintf_debug(\tsi_trap = %d\n, info-si_trap);
#endif
if (info-si_code == SI_NOINFO)
@@ -226,7 +226,7 @@
pcb-pcb_errno = lwp_errno;
}
if (recurse 1)
- printf(%s: leaving trap recursion level %d\n, __func__, recurse);
+ dprintf_debug(%s: leaving trap recursion level %d\n, __func__, recurse);
recurse--;
}
@@ -248,7 +248,7 @@
#if 0
va = (vaddr_t) info-si_addr;
- printf(illegal instruction trap lwp = %p pid = %d lid = %d, va = %p\n,
+ printf(\nillegal instruction trap lwp = %p pid = %d lid = %d, va = %p\n,
curlwp,
curlwp-l_proc-p_pid,
curlwp-l_lid,
CVS commit: src/external/bsd/ntp
Module Name:src Committed By: joerg Date: Fri Sep 16 16:29:12 UTC 2011 Modified Files: src/external/bsd/ntp: Makefile.inc Log Message: There is no such thing as WARNS=5. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/Makefile.inc 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/ntp/Makefile.inc diff -u src/external/bsd/ntp/Makefile.inc:1.7 src/external/bsd/ntp/Makefile.inc:1.8 --- src/external/bsd/ntp/Makefile.inc:1.7 Tue Aug 9 13:00:59 2011 +++ src/external/bsd/ntp/Makefile.inc Fri Sep 16 16:29:12 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.7 2011/08/09 13:00:59 joerg Exp $ +# $NetBSD: Makefile.inc,v 1.8 2011/09/16 16:29:12 joerg Exp $ .if !defined(NTP_MAKEFILE_INC) NTP_MAKEFILE_INC=yes @@ -9,7 +9,7 @@ -Wno-format-security \ -Wno-parentheses -Wno-constant-logical-operand -WARNS?= 5 +WARNS?= 4 .include bsd.own.mk
CVS commit: src/tests
Module Name:src Committed By: joerg Date: Fri Sep 16 16:30:18 UTC 2011 Modified Files: src/tests: Makefile.inc Log Message: Do not care about dead functions for test cases, in this case it is often enough just noise. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/Makefile.inc diff -u src/tests/Makefile.inc:1.1 src/tests/Makefile.inc:1.2 --- src/tests/Makefile.inc:1.1 Wed Nov 3 16:10:19 2010 +++ src/tests/Makefile.inc Fri Sep 16 16:30:18 2011 @@ -1,2 +1,3 @@ -# $NetBSD: Makefile.inc,v 1.1 2010/11/03 16:10:19 christos Exp $ +# $NetBSD: Makefile.inc,v 1.2 2011/09/16 16:30:18 joerg Exp $ WARNS ?= 4 +CWARNFLAGS+= -Wno-missing-noreturn
CVS commit: src/sys/arch/usermode/dev
Module Name:src Committed By: reinoud Date: Fri Sep 16 16:30:51 UTC 2011 Modified Files: src/sys/arch/usermode/dev: ld_thunkbus.c Log Message: Remove the blockage of SIGALRM here too To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/usermode/dev/ld_thunkbus.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/usermode/dev/ld_thunkbus.c diff -u src/sys/arch/usermode/dev/ld_thunkbus.c:1.15 src/sys/arch/usermode/dev/ld_thunkbus.c:1.16 --- src/sys/arch/usermode/dev/ld_thunkbus.c:1.15 Thu Sep 15 19:32:28 2011 +++ src/sys/arch/usermode/dev/ld_thunkbus.c Fri Sep 16 16:30:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ld_thunkbus.c,v 1.15 2011/09/15 19:32:28 reinoud Exp $ */ +/* $NetBSD: ld_thunkbus.c,v 1.16 2011/09/16 16:30:51 reinoud Exp $ */ /*- * Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ld_thunkbus.c,v 1.15 2011/09/15 19:32:28 reinoud Exp $); +__KERNEL_RCSID(0, $NetBSD: ld_thunkbus.c,v 1.16 2011/09/16 16:30:51 reinoud Exp $); #include sys/param.h #include sys/proc.h @@ -122,10 +122,10 @@ sc-sc_ih = softint_establish(SOFTINT_BIO, ld_thunkbus_complete, sc); - sigemptyset(sa.sa_mask); sa.sa_flags = SA_RESTART | SA_SIGINFO; sa.sa_sigaction = ld_thunkbus_sig; - thunk_sigaddset(sa.sa_mask, SIGALRM); + thunk_sigemptyset(sa.sa_mask); +// thunk_sigaddset(sa.sa_mask, SIGALRM); if (thunk_sigaction(SIGIO, sa, NULL) == -1) panic(couldn't register SIGIO handler: %d, thunk_geterrno());
CVS commit: src/sys/fs/ptyfs
Module Name:src
Committed By: christos
Date: Fri Sep 16 18:43:44 UTC 2011
Modified Files:
src/sys/fs/ptyfs: ptyfs_vnops.c
Log Message:
don't update access/change times on open.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/fs/ptyfs/ptyfs_vnops.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/fs/ptyfs/ptyfs_vnops.c
diff -u src/sys/fs/ptyfs/ptyfs_vnops.c:1.35 src/sys/fs/ptyfs/ptyfs_vnops.c:1.36
--- src/sys/fs/ptyfs/ptyfs_vnops.c:1.35 Sat Jun 11 23:35:53 2011
+++ src/sys/fs/ptyfs/ptyfs_vnops.c Fri Sep 16 14:43:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ptyfs_vnops.c,v 1.35 2011/06/12 03:35:53 rmind Exp $ */
+/* $NetBSD: ptyfs_vnops.c,v 1.36 2011/09/16 18:43:44 christos Exp $ */
/*
* Copyright (c) 1993, 1995
@@ -76,7 +76,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ptyfs_vnops.c,v 1.35 2011/06/12 03:35:53 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: ptyfs_vnops.c,v 1.36 2011/09/16 18:43:44 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -733,7 +733,6 @@
struct vnode *vp = ap-a_vp;
struct ptyfsnode *ptyfs = VTOPTYFS(vp);
- ptyfs-ptyfs_flag |= PTYFS_CHANGE|PTYFS_ACCESS;
switch (ptyfs-ptyfs_type) {
case PTYFSpts:
case PTYFSptc:
CVS commit: src/lib/libterminfo
Module Name:src
Committed By: christos
Date: Fri Sep 16 18:51:44 UTC 2011
Modified Files:
src/lib/libterminfo: termcap.c
Log Message:
PR/45370: Takehiko NOZAKI: termcap emulation tget{flag,num,str} should
work with non-NUL terminated strings.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/lib/libterminfo/termcap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libterminfo/termcap.c
diff -u src/lib/libterminfo/termcap.c:1.14 src/lib/libterminfo/termcap.c:1.15
--- src/lib/libterminfo/termcap.c:1.14 Fri Mar 18 06:42:54 2011
+++ src/lib/libterminfo/termcap.c Fri Sep 16 14:51:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: termcap.c,v 1.14 2011/03/18 10:42:54 roy Exp $ */
+/* $NetBSD: termcap.c,v 1.15 2011/09/16 18:51:44 christos Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: termcap.c,v 1.14 2011/03/18 10:42:54 roy Exp $);
+__RCSID($NetBSD: termcap.c,v 1.15 2011/09/16 18:51:44 christos Exp $);
#include assert.h
#include ctype.h
@@ -74,13 +74,12 @@
}
int
-tgetflag(const char *id)
+tgetflag(const char *id2)
{
uint32_t ind;
size_t i;
TERMUSERDEF *ud;
-
- _DIAGASSERT(id != NULL);
+ const char id[] = { id2[0], id2[1], '\0' };
if (cur_term == NULL)
return 0;
@@ -99,14 +98,13 @@
}
int
-tgetnum(const char *id)
+tgetnum(const char *id2)
{
uint32_t ind;
size_t i;
TERMUSERDEF *ud;
const TENTRY *te;
-
- _DIAGASSERT(id != NULL);
+ const char id[] = { id2[0], id2[1], '\0' };
if (cur_term == NULL)
return -1;
@@ -132,14 +130,13 @@
}
char *
-tgetstr(const char *id, char **area)
+tgetstr(const char *id2, char **area)
{
uint32_t ind;
size_t i;
TERMUSERDEF *ud;
const char *str;
-
- _DIAGASSERT(id != NULL);
+ const char id[] = { id2[0], id2[1], '\0' };
if (cur_term == NULL)
return NULL;
CVS commit: src/external/bsd/file/dist
Module Name:src Committed By: christos Date: Fri Sep 16 20:38:02 UTC 2011 Update of /cvsroot/src/external/bsd/file/dist In directory ivanova.netbsd.org:/tmp/cvs-serv28841 Log Message: from ftp.astron.com: - elf seeking fixes - improvements in cdf parsing - waitpid only for our child - magic fixes and additions Status: Vendor Tag: CHRISTOS Release Tags: FILE5_09 U src/external/bsd/file/dist/acinclude.m4 U src/external/bsd/file/dist/README C src/external/bsd/file/dist/configure.ac C src/external/bsd/file/dist/aclocal.m4 U src/external/bsd/file/dist/Makefile.am C src/external/bsd/file/dist/Makefile.in C src/external/bsd/file/dist/config.h.in C src/external/bsd/file/dist/configure U src/external/bsd/file/dist/AUTHORS U src/external/bsd/file/dist/COPYING U src/external/bsd/file/dist/ChangeLog C src/external/bsd/file/dist/INSTALL U src/external/bsd/file/dist/NEWS U src/external/bsd/file/dist/TODO C src/external/bsd/file/dist/compile C src/external/bsd/file/dist/config.guess C src/external/bsd/file/dist/config.sub C src/external/bsd/file/dist/depcomp C src/external/bsd/file/dist/install-sh U src/external/bsd/file/dist/ltmain.sh C src/external/bsd/file/dist/missing U src/external/bsd/file/dist/MAINT U src/external/bsd/file/dist/m4/lt~obsolete.m4 U src/external/bsd/file/dist/m4/libtool.m4 U src/external/bsd/file/dist/m4/ltoptions.m4 U src/external/bsd/file/dist/m4/ltsugar.m4 U src/external/bsd/file/dist/m4/ltversion.m4 U src/external/bsd/file/dist/src/Makefile.am U src/external/bsd/file/dist/src/magic.h U src/external/bsd/file/dist/src/getopt_long.c C src/external/bsd/file/dist/src/Makefile.in U src/external/bsd/file/dist/src/asprintf.c U src/external/bsd/file/dist/src/getline.c U src/external/bsd/file/dist/src/strlcat.c U src/external/bsd/file/dist/src/strlcpy.c U src/external/bsd/file/dist/src/vasprintf.c C src/external/bsd/file/dist/src/magic.c C src/external/bsd/file/dist/src/apprentice.c C src/external/bsd/file/dist/src/softmagic.c U src/external/bsd/file/dist/src/ascmagic.c U src/external/bsd/file/dist/src/encoding.c C src/external/bsd/file/dist/src/compress.c U src/external/bsd/file/dist/src/is_tar.c C src/external/bsd/file/dist/src/readelf.c C src/external/bsd/file/dist/src/print.c C src/external/bsd/file/dist/src/fsmagic.c U src/external/bsd/file/dist/src/funcs.c C src/external/bsd/file/dist/src/file.h U src/external/bsd/file/dist/src/names.h U src/external/bsd/file/dist/src/readelf.h U src/external/bsd/file/dist/src/tar.h C src/external/bsd/file/dist/src/cdf.c U src/external/bsd/file/dist/src/apptype.c U src/external/bsd/file/dist/src/file_opts.h U src/external/bsd/file/dist/src/elfclass.h U src/external/bsd/file/dist/src/mygetopt.h U src/external/bsd/file/dist/src/cdf_time.c C src/external/bsd/file/dist/src/readcdf.c U src/external/bsd/file/dist/src/cdf.h U src/external/bsd/file/dist/src/file.c C src/external/bsd/file/dist/magic/Makefile.am C src/external/bsd/file/dist/magic/Makefile.in U src/external/bsd/file/dist/magic/Header U src/external/bsd/file/dist/magic/Localstuff U src/external/bsd/file/dist/magic/magdir/adventure U src/external/bsd/file/dist/magic/magdir/acorn U src/external/bsd/file/dist/magic/magdir/adi U src/external/bsd/file/dist/magic/magdir/animation U src/external/bsd/file/dist/magic/magdir/allegro U src/external/bsd/file/dist/magic/magdir/alliant U src/external/bsd/file/dist/magic/magdir/amanda U src/external/bsd/file/dist/magic/magdir/amigaos U src/external/bsd/file/dist/magic/magdir/apple U src/external/bsd/file/dist/magic/magdir/apl U src/external/bsd/file/dist/magic/magdir/cddb U src/external/bsd/file/dist/magic/magdir/applix C src/external/bsd/file/dist/magic/magdir/archive U src/external/bsd/file/dist/magic/magdir/asterix U src/external/bsd/file/dist/magic/magdir/att3b U src/external/bsd/file/dist/magic/magdir/audio U src/external/bsd/file/dist/magic/magdir/basis U src/external/bsd/file/dist/magic/magdir/bflt U src/external/bsd/file/dist/magic/magdir/blcr U src/external/bsd/file/dist/magic/magdir/blender U src/external/bsd/file/dist/magic/magdir/blit U src/external/bsd/file/dist/magic/magdir/bout U src/external/bsd/file/dist/magic/magdir/bsdi U src/external/bsd/file/dist/magic/magdir/bsi U src/external/bsd/file/dist/magic/magdir/btsnoop U src/external/bsd/file/dist/magic/magdir/c-lang U src/external/bsd/file/dist/magic/magdir/c64 U src/external/bsd/file/dist/magic/magdir/cad U src/external/bsd/file/dist/magic/magdir/cafebabe U src/external/bsd/file/dist/magic/magdir/encore U src/external/bsd/file/dist/magic/magdir/efi U src/external/bsd/file/dist/magic/magdir/chord U src/external/bsd/file/dist/magic/magdir/cisco U src/external/bsd/file/dist/magic/magdir/citrus U src/external/bsd/file/dist/magic/magdir/clarion U src/external/bsd/file/dist/magic/magdir/claris U src/external/bsd/file/dist/magic/magdir/clipper U src/external/bsd/file/dist/magic/magdir/commands U src/external/bsd/file/dist/magic/magdir/communications U
CVS commit: src/external/bsd/file
Module Name:src
Committed By: christos
Date: Fri Sep 16 20:38:12 UTC 2011
Added Files:
src/external/bsd/file: file2netbsd
Log Message:
restore from the dead.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/file/file2netbsd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/bsd/file/file2netbsd
diff -u /dev/null src/external/bsd/file/file2netbsd:1.1
--- /dev/null Fri Sep 16 16:38:12 2011
+++ src/external/bsd/file/file2netbsd Fri Sep 16 16:38:12 2011
@@ -0,0 +1,113 @@
+#! /bin/sh
+#
+# $NetBSD: file2netbsd,v 1.1 2011/09/16 20:38:12 christos Exp $
+#
+# Copyright (c) 2003, 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+# file2netbsd: convert a file source tree into a
+# format suitable for import. Works on current dir.
+# You can run this only once if you want it to work.
+#
+# based on texinfo2netbsd
+#
+PROG=$(basename $0)
+
+if [ -z $1 ]
+then
+ echo Usage: $PROG directory 12
+ exit 1
+fi
+FILE=$1
+
+file_vers=$(awk -F', ' '/AC_INIT\(/ { print $2 }' $FILE/configure.ac)
+
+### Wipe out stuff we don't want
+find $FILE -name .cvsignore -delete
+
+### Remove the $'s around RCS tags
+find $FILE -type f -print | xargs egrep -l '\$(Id|Date|Header|Log|Revision)'\
+| while read f; do
+ sed -e 's/\$\(Id.*\) \$/\1/' \
+ -e 's/\$\(Date.*\) \$/\1/' \
+ -e 's/\$\(Header.*\) \$/\1/' \
+ -e 's/\$\(Log.*\) \$/\1/' \
+ -e 's/\$\(Revision.*\) \$/\1/' \
+ $f /tmp/file2$$ mv /tmp/file2$$ $f \
+ echo removed RCS tag from $f
+done
+
+### Add NetBSD RCS Id
+find $FILE -type f -name '*.[chly]' -print | while read c; do
+ sed -e '1{/$NetBSD/!{i\
+/* \$NetBSD\$ */\
+
+};}
+/#ifndef[ ]lint/{N;/FILE_RCSID/s/\n/\
+#if 0\
+/
+a\
+#else\
+__RCSID(\$NetBSD\$);\
+#endif
+}' $c /tmp/file3$$
+mv /tmp/file3$$ $c echo did source mods for $c
+done
+
+ Move files to proper names
+mv -f doc/file.man doc/file.1
+mv -f doc/libmagic.man doc/libmagic.3
+mv -f doc/magic.man doc/magic.5
+
+ Add RCS tags to man pages
+find $FILE -type f -name '*.[0-9]' -print | while read m; do
+ sed -e '1{/$NetBSD/!i\
+.\\ \$NetBSD\$\
+.\\
+
+}' -e 's/__CSECTION__/1/g' \
+ -e 's/__FSECTION__/5/g' \
+ -e 's/__VERSION__/'${file_vers}/g \
+ -e 's,__MAGIC__,/usr/share/misc/magic,g' \
+ $m /tmp/file4$$
+mv /tmp/file4$$ $m echo did manpage mods for $m
+done
+
+ de-capsize the magdir
+mv magic/Magdir magic/magdir
+
+ Make building easier, don't build magic and doc
+echo '/^SUBDIRS/
+t.
+s/^/#/
+-
+s/ magic.*//
+wq' | ed Makefile.in /dev/null 21
+
+echo done
+
+echo You can import now. Use the following command:
+echo cvs import src/external/bsd/file/dist CHRISTOS FILE${file_vers%.*}_${file_vers#*.}
+
+exit 0
CVS commit: src/sys/kern
Module Name:src
Committed By: reinoud
Date: Fri Sep 16 21:02:29 UTC 2011
Modified Files:
src/sys/kern: kern_exec.c
Log Message:
Improve diagnostics message on entry point too low/high checking
To generate a diff of this commit:
cvs rdiff -u -r1.328 -r1.329 src/sys/kern/kern_exec.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/kern/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.328 src/sys/kern/kern_exec.c:1.329
--- src/sys/kern/kern_exec.c:1.328 Sat Aug 27 18:11:48 2011
+++ src/sys/kern/kern_exec.c Fri Sep 16 21:02:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exec.c,v 1.328 2011/08/27 18:11:48 reinoud Exp $ */
+/* $NetBSD: kern_exec.c,v 1.329 2011/09/16 21:02:28 reinoud Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_exec.c,v 1.328 2011/08/27 18:11:48 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_exec.c,v 1.329 2011/09/16 21:02:28 reinoud Exp $);
#include opt_exec.h
#include opt_ktrace.h
@@ -374,8 +374,9 @@
/* Seems ok: check that entry point is not too high */
if (epp-ep_entry epp-ep_vm_maxaddr) {
#ifdef DIAGNOSTIC
-printf(%s: rejecting due to
- too high entry address\n, __func__);
+printf(%s: rejecting %p due to
+ too high entry address\n,
+ __func__, (void *) epp-ep_entry);
#endif
error = ENOEXEC;
break;
@@ -383,8 +384,9 @@
/* Seems ok: check that entry point is not too low */
if (epp-ep_entry epp-ep_vm_minaddr) {
#ifdef DIAGNOSTIC
-printf(%s: rejecting due to
- too low entry address\n, __func__);
+printf(%s: rejecting %p due to
+ too low entry address\n,
+ __func__, (void *) epp-ep_entry);
#endif
error = ENOEXEC;
break;
CVS commit: src/doc
Module Name:src Committed By: christos Date: Fri Sep 16 21:08:33 UTC 2011 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new file(1) To generate a diff of this commit: cvs rdiff -u -r1.871 -r1.872 src/doc/3RDPARTY cvs rdiff -u -r1.1606 -r1.1607 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.871 src/doc/3RDPARTY:1.872 --- src/doc/3RDPARTY:1.871 Mon Sep 12 18:55:53 2011 +++ src/doc/3RDPARTY Fri Sep 16 17:08:32 2011 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.871 2011/09/12 22:55:53 taca Exp $ +# $NetBSD: 3RDPARTY,v 1.872 2011/09/16 21:08:32 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -309,8 +309,8 @@ Only double-precision addressed at this time. Package: file -Version: 5.07 -Current Vers: 5.08 +Version: 5.09 +Current Vers: 5.09 Maintainer: Christos Zoulas chris...@zoulas.com Archive Site: ftp://ftp.astron.com/pub/file/ Home Page: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1606 src/doc/CHANGES:1.1607 --- src/doc/CHANGES:1.1606 Sun Sep 11 15:18:27 2011 +++ src/doc/CHANGES Fri Sep 16 17:08:32 2011 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1606 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1607 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -1119,3 +1119,4 @@ yacc(1): Import byacc-20110908 [christos 20110910] traceroute(8): Updated to 1.4a12 [christos 20110910] bind: Update to 9.9.0a1 [christos 20110911] + file: Update to 5.09 [christos 20110916]
CVS commit: src/sys/kern
Module Name:src Committed By: reinoud Date: Fri Sep 16 22:07:17 UTC 2011 Modified Files: src/sys/kern: kern_sig.c Log Message: Fix sigactsunshare() to do what the manpage and the commit tells it to do! I.e. unshare a process its sigacts by creating a new one BUT maintaining all signal state. The old code would CLEAR all the signal state. It used to work only due to the fact that sigactunshare() is only used in execsigs() and the fact that SIG_DFL was NULL. To generate a diff of this commit: cvs rdiff -u -r1.315 -r1.316 src/sys/kern/kern_sig.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/kern/kern_sig.c diff -u src/sys/kern/kern_sig.c:1.315 src/sys/kern/kern_sig.c:1.316 --- src/sys/kern/kern_sig.c:1.315 Sun Sep 4 23:03:00 2011 +++ src/sys/kern/kern_sig.c Fri Sep 16 22:07:17 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_sig.c,v 1.315 2011/09/04 23:03:00 christos Exp $ */ +/* $NetBSD: kern_sig.c,v 1.316 2011/09/16 22:07:17 reinoud Exp $ */ /*- * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -70,7 +70,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: kern_sig.c,v 1.315 2011/09/04 23:03:00 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: kern_sig.c,v 1.316 2011/09/16 22:07:17 reinoud Exp $); #include opt_ptrace.h #include opt_compat_sunos.h @@ -296,7 +296,7 @@ ps = pool_cache_get(sigacts_cache, PR_WAITOK); mutex_init(ps-sa_mutex, MUTEX_DEFAULT, IPL_SCHED); - memset(ps-sa_sigdesc, 0, sizeof(ps-sa_sigdesc)); + memcpy(ps-sa_sigdesc, oldps-sa_sigdesc, sizeof(ps-sa_sigdesc)); ps-sa_refcnt = 1; p-p_sigacts = ps;
CVS commit: src/share/man/man9
Module Name:src Committed By: jym Date: Fri Sep 16 22:27:36 UTC 2011 Modified Files: src/share/man/man9: opencrypto.9 Log Message: Update list of algorithm identifiers available in opencrypto(9). To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/share/man/man9/opencrypto.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/opencrypto.9 diff -u src/share/man/man9/opencrypto.9:1.11 src/share/man/man9/opencrypto.9:1.12 --- src/share/man/man9/opencrypto.9:1.11 Mon May 23 13:46:54 2011 +++ src/share/man/man9/opencrypto.9 Fri Sep 16 22:27:36 2011 @@ -1,5 +1,5 @@ .\ $OpenBSD: crypto.9,v 1.25 2003/07/11 13:47:41 jmc Exp $ -.\ $NetBSD: opencrypto.9,v 1.11 2011/05/23 13:46:54 drochner Exp $ +.\ $NetBSD: opencrypto.9,v 1.12 2011/09/16 22:27:36 jym Exp $ .\ .\ The author of this man page is Angelos D. Keromytis (ange...@cis.upenn.edu) .\ @@ -16,7 +16,7 @@ .\ MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR .\ PURPOSE. .\ -.Dd January 1, 2010 +.Dd September 17, 2011 .Dt OPENCRYPTO 9 .Os .Sh NAME @@ -177,16 +177,35 @@ CRYPTO_3DES_CBC CRYPTO_BLF_CBC CRYPTO_CAST_CBC +CRYPTO_CAMELLIA_CBC CRYPTO_SKIPJACK_CBC -CRYPTO_MD5_HMAC -CRYPTO_SHA1_HMAC -CRYPTO_RIPEMD160_HMAC -CRYPTO_MD5_KPDK -CRYPTO_SHA1_KPDK -CRYPTO_AES_CBC CRYPTO_ARC4 +CRYPTO_AES_CBC +CRYPTO_AES_CTR +CRYPTO_AES_GCM_16 +CRYPTO_AES_GMAC +CRYPTO_AES_128_GMAC +CRYPTO_AES_192_GMAC +CRYPTO_AES_256_GMAC +CRYPTO_AES_XCBC_MAC_96 CRYPTO_MD5 +CRYPTO_MD5_HMAC +CRYPTO_MD5_HMAC_96 +CRYPTO_MD5_KPDK +CRYPTO_NULL_CBC +CRYPTO_NULL_HMAC CRYPTO_SHA1 +CRYPTO_SHA1_HMAC +CRYPTO_SHA1_HMAC_96 +CRYPTO_SHA1_KPDK +CRYPTO_SHA2_256_HMAC +CRYPTO_SHA2_384_HMAC +CRYPTO_SHA2_512_HMAC +CRYPTO_RIPEMD160_HMAC +CRYPTO_RIPEMD160_HMAC_96 +CRYPTO_DEFLATE_COMP +CRYPTO_DEFLATE_COMP_NOGROW +CRYPTO_GZIP_COMP .Ed .Pp .It Fa cri_klen
CVS commit: src/external/bsd/tmux/usr.bin/tmux
Module Name:src
Committed By: christos
Date: Sat Sep 17 01:48:46 UTC 2011
Modified Files:
src/external/bsd/tmux/usr.bin/tmux: Makefile
Log Message:
Add utmp support.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/tmux/usr.bin/tmux/Makefile
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/tmux/usr.bin/tmux/Makefile
diff -u src/external/bsd/tmux/usr.bin/tmux/Makefile:1.8 src/external/bsd/tmux/usr.bin/tmux/Makefile:1.9
--- src/external/bsd/tmux/usr.bin/tmux/Makefile:1.8 Fri Aug 19 05:06:05 2011
+++ src/external/bsd/tmux/usr.bin/tmux/Makefile Fri Sep 16 21:48:46 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/08/19 09:06:05 christos Exp $
+# $NetBSD: Makefile,v 1.9 2011/09/17 01:48:46 christos Exp $
.include bsd.own.mk
@@ -138,6 +138,7 @@
SRCS+= window.c
SRCS+= xmalloc.c
SRCS+= xterm-keys.c
+SRCS+= utmp.c
# Files in compat/
#SRCS+= forkpty-hpux.c
@@ -205,6 +206,8 @@
CPPFLAGS+= -DHAVE_FCNTL_CLOSEM=1
CPPFLAGS+= -DHAVE_PROC_PID=1
CPPFLAGS+= -DHAVE_DIRFD=1
+CPPFLAGS+= -DSUPPORT_UTMP
+CPPFLAGS+= -DSUPPORT_UTMPX
LDADD+= -levent -lterminfo -lutil -lm
DPADD+= ${LIBEVENT} ${LIBTERMINFO} ${LIBUTIL}
CVS commit: src/external/bsd/tmux/dist
Module Name:src
Committed By: christos
Date: Sat Sep 17 01:50:09 UTC 2011
Modified Files:
src/external/bsd/tmux/dist: tmux.h window.c
Added Files:
src/external/bsd/tmux/dist: utmp.c
Log Message:
Add utmp/utmpx support.
XXX: Should we make the top pty (tmux) hide?
XXX: Should we add an option to not create utmp entries for a tmux terminal?
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/tmux/dist/tmux.h
cvs rdiff -u -r0 -r1.1 src/external/bsd/tmux/dist/utmp.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/tmux/dist/window.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/tmux/dist/tmux.h
diff -u src/external/bsd/tmux/dist/tmux.h:1.2 src/external/bsd/tmux/dist/tmux.h:1.3
--- src/external/bsd/tmux/dist/tmux.h:1.2 Fri Aug 19 05:06:05 2011
+++ src/external/bsd/tmux/dist/tmux.h Fri Sep 16 21:50:08 2011
@@ -1,4 +1,4 @@
-/* $Id: tmux.h,v 1.2 2011/08/19 09:06:05 christos Exp $ */
+/* $Id: tmux.h,v 1.3 2011/09/17 01:50:08 christos Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott n...@users.sourceforge.net
@@ -789,6 +789,7 @@
};
/* Child window structure. */
+struct window_utmp;
struct window_pane {
u_int id;
@@ -832,6 +833,8 @@
const struct window_mode *mode;
void *modedata;
+ struct window_utmp *utmp;
+
TAILQ_ENTRY(window_pane) entry;
RB_ENTRY(window_pane) tree_entry;
};
@@ -2067,4 +2070,8 @@
int printflike3 xsnprintf(char *, size_t, const char *, ...);
int xvsnprintf(char *, size_t, const char *, va_list);
+/* utmp.c */
+struct window_utmp *utmp_create(const char *);
+void utmp_destroy(struct window_utmp *);
+
#endif /* TMUX_H */
Index: src/external/bsd/tmux/dist/window.c
diff -u src/external/bsd/tmux/dist/window.c:1.3 src/external/bsd/tmux/dist/window.c:1.4
--- src/external/bsd/tmux/dist/window.c:1.3 Wed Aug 17 14:48:36 2011
+++ src/external/bsd/tmux/dist/window.c Fri Sep 16 21:50:09 2011
@@ -1,4 +1,4 @@
-/* $Id: window.c,v 1.3 2011/08/17 18:48:36 jmmv Exp $ */
+/* $Id: window.c,v 1.4 2011/09/17 01:50:09 christos Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott n...@users.sourceforge.net
@@ -629,6 +629,7 @@
xfree(wp-shell);
if (wp-cmd != NULL)
xfree(wp-cmd);
+ utmp_destroy(wp-utmp);
xfree(wp);
}
@@ -718,6 +719,8 @@
window_pane_read_callback, NULL, window_pane_error_callback, wp);
bufferevent_enable(wp-event, EV_READ|EV_WRITE);
+ wp-utmp = utmp_create(wp-tty);
+
return (0);
}
Added files:
Index: src/external/bsd/tmux/dist/utmp.c
diff -u /dev/null src/external/bsd/tmux/dist/utmp.c:1.1
--- /dev/null Fri Sep 16 21:50:09 2011
+++ src/external/bsd/tmux/dist/utmp.c Fri Sep 16 21:50:08 2011
@@ -0,0 +1,167 @@
+/* $NetBSD: utmp.c,v 1.1 2011/09/17 01:50:08 christos Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *must display the following acknowledgement:
+ *This product includes software developed by the NetBSD
+ *Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *contributors may be used to endorse or promote products derived
+ *from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#include sys/cdefs.h
+__RCSID($NetBSD: utmp.c,v 1.1 2011/09/17 01:50:08 christos Exp $);
+
+#include sys/types.h
+#include sys/param.h
+#include syslog.h
+#include string.h
CVS commit: src/libexec/utmp_update
Module Name:src
Committed By: christos
Date: Sat Sep 17 01:50:54 UTC 2011
Modified Files:
src/libexec/utmp_update: Makefile utmp_update.c
Log Message:
log to both syslog and stderr.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/libexec/utmp_update/Makefile
cvs rdiff -u -r1.9 -r1.10 src/libexec/utmp_update/utmp_update.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/utmp_update/Makefile
diff -u src/libexec/utmp_update/Makefile:1.3 src/libexec/utmp_update/Makefile:1.4
--- src/libexec/utmp_update/Makefile:1.3 Mon Dec 16 17:45:15 2002
+++ src/libexec/utmp_update/Makefile Fri Sep 16 21:50:54 2011
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2002/12/16 22:45:15 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2011/09/17 01:50:54 christos Exp $
PROG= utmp_update
MAN= utmp_update.8
BINOWN= root
BINMODE=4555
+COPTS.utmp_update.c += -Wno-format-nonliteral
+
.include bsd.prog.mk
Index: src/libexec/utmp_update/utmp_update.c
diff -u src/libexec/utmp_update/utmp_update.c:1.9 src/libexec/utmp_update/utmp_update.c:1.10
--- src/libexec/utmp_update/utmp_update.c:1.9 Sun Apr 12 23:38:15 2009
+++ src/libexec/utmp_update/utmp_update.c Fri Sep 16 21:50:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: utmp_update.c,v 1.9 2009/04/13 03:38:15 christos Exp $ */
+/* $NetBSD: utmp_update.c,v 1.10 2011/09/17 01:50:54 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: utmp_update.c,v 1.9 2009/04/13 03:38:15 christos Exp $);
+__RCSID($NetBSD: utmp_update.c,v 1.10 2011/09/17 01:50:54 christos Exp $);
#include sys/types.h
#include sys/param.h
@@ -46,8 +46,28 @@
#include string.h
#include unistd.h
#include paths.h
+#include stdarg.h
+#include errno.h
+#include syslog.h
-int main(int, char *[]);
+static __dead void
+logerr(int e, const char *fmt, ...)
+{
+ va_list sap, eap;
+ char *s = NULL;
+
+ if (e)
+ (void)asprintf(s, %s (%s), fmt, strerror(e));
+ if (s)
+ fmt = s;
+
+ va_start(sap, fmt);
+ va_copy(eap, sap);
+ vsyslog(LOG_ERR, fmt, sap);
+ va_end(sap);
+ errx(1, fmt, eap);
+ va_end(eap);
+}
int
main(int argc, char *argv[])
@@ -63,42 +83,45 @@
euid = geteuid();
ruid = getuid();
- if (seteuid(ruid) == -1)
- err(1, seteuid);
if (argc != 2) {
(void)fprintf(stderr, Usage: %s vis-utmpx-entry\n,
- getprogname());
- exit(1);
+ getprogname());
+ return 1;
}
+ openlog(getprogname(), LOG_PID | LOG_NDELAY, LOG_AUTH);
+ if (seteuid(ruid) == -1)
+ logerr(errno, Can't setuid %ld, (long)ruid);
+
len = strlen(argv[1]);
if (len sizeof(*utx) * 4 + 1 || len sizeof(*utx))
- errx(1, Bad argument);
+ logerr(0, Bad argument size %zu, len);
if ((utx = malloc(len)) == NULL)
- err(1, NULL);
+ logerr(errno, Can't allocate %zu, len);
res = strunvis((char *)utx, argv[1]);
if (res != (int)sizeof(*utx))
- errx(1, Decoding error %s %d != %zu, argv[1], res, sizeof(*utx));
+ logerr(0, Decoding error %s %d != %zu, argv[1], res,
+ sizeof(*utx));
switch (utx-ut_type) {
case USER_PROCESS:
case DEAD_PROCESS:
break;
default:
- errx(1, Invalid utmpx type %d, (int)utx-ut_type);
+ logerr(0, Invalid utmpx type %d, (int)utx-ut_type);
}
if (ruid != 0) {
if ((pwd = getpwuid(ruid)) == NULL)
- errx(1, User %lu does not exist in password database,
- (long)ruid);
+ logerr(0, User %ld does not exist in password
+ database, (long)ruid);
if (strcmp(pwd-pw_name, utx-ut_name) != 0)
- errx(1, Current user `%s' does not match
+ logerr(0, Current user `%s' does not match
`%s' in utmpx entry, pwd-pw_name, utx-ut_name);
}
@@ -106,34 +129,39 @@
fd = open(tty, O_RDONLY|O_NONBLOCK, 0);
if (fd != -1) {
if (fstat(fd, st) == -1)
- err(1, Cannot stat `%s', tty);
+ logerr(errno, Cannot stat `%s', tty);
if (ruid != 0 st.st_uid != ruid)
- errx(1, %s: Is not owned by you, tty);
+ logerr(0, %s: Is not owned by you, tty);
if (!isatty(fd))
- errx(1, %s: Not a tty device, tty);
+ logerr(0, %s: Not a tty device, tty);
(void)close(fd);
if (access(tty, W_OK|R_OK) == -1)
- err(1, %s, tty);
+ logerr(errno, Can't access `%s', tty);
} else {
struct utmpx utold, *utoldp;
+ pid_t ppid;
+
/*
* A daemon like ftpd that does not use a tty line?
* We only allow it to kill its own existing entries
*/
if (utx-ut_type != DEAD_PROCESS)
- err(1, Cannot open `%s', tty);
+ logerr(errno, Cannot open `%s', tty);
(void)memcpy(utold.ut_line, utx-ut_line, sizeof(utx-ut_line));
if ((utoldp = getutxline(utold)) == NULL)
- err(1, Cannot find existing entry for `%s',
+ logerr(0, Cannot find existing entry for `%s',
utx-ut_line);
- if (utoldp-ut_pid != getppid())
- err(1, Cannot modify entry for `%s', tty);
+ if (utoldp-ut_pid != (ppid = getppid()))
+ logerr(0, Cannot modify entry for `%s'
+
CVS commit: src/lib/libc/gen
Module Name:src
Committed By: christos
Date: Sat Sep 17 01:52:29 UTC 2011
Modified Files:
src/lib/libc/gen: utmpx.c
Log Message:
Never invoke utmp_update() recursively if we are root. Instead close the
read-only file so it can be opened later. It can happen when a setuid
program utmp_update, seteuid(ruid) - getutxent() - seteuid(0) - pututxent()
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/lib/libc/gen/utmpx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/utmpx.c
diff -u src/lib/libc/gen/utmpx.c:1.26 src/lib/libc/gen/utmpx.c:1.27
--- src/lib/libc/gen/utmpx.c:1.26 Sat Jan 10 21:46:27 2009
+++ src/lib/libc/gen/utmpx.c Fri Sep 16 21:52:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: utmpx.c,v 1.26 2009/01/11 02:46:27 christos Exp $ */
+/* $NetBSD: utmpx.c,v 1.27 2011/09/17 01:52:29 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: utmpx.c,v 1.26 2009/01/11 02:46:27 christos Exp $);
+__RCSID($NetBSD: utmpx.c,v 1.27 2011/09/17 01:52:29 christos Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
@@ -247,9 +247,15 @@
if (utx == NULL)
return NULL;
- if (strcmp(_PATH_UTMPX, utfile) == 0)
- if ((fp != NULL readonly) || (fp == NULL geteuid() != 0))
- return utmp_update(utx);
+ if (strcmp(_PATH_UTMPX, utfile) == 0) {
+ if (geteuid() == 0) {
+ if (fp != NULL readonly)
+endutxent();
+ } else {
+ if (fp == NULL || readonly)
+return utmp_update(utx);
+ }
+ }
(void)memcpy(temp, utx, sizeof(temp));
CVS commit: src/usr.bin/tftp
Module Name:src Committed By: minskim Date: Sat Sep 17 03:09:51 UTC 2011 Modified Files: src/usr.bin/tftp: main.c Log Message: Add back a line accidentally deleted in the previous commit. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.bin/tftp/main.c 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/tftp/main.c diff -u src/usr.bin/tftp/main.c:1.27 src/usr.bin/tftp/main.c:1.28 --- src/usr.bin/tftp/main.c:1.27 Fri Sep 16 15:39:30 2011 +++ src/usr.bin/tftp/main.c Sat Sep 17 03:09:51 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.27 2011/09/16 15:39:30 joerg Exp $ */ +/* $NetBSD: main.c,v 1.28 2011/09/17 03:09:51 minskim Exp $ */ /* * Copyright (c) 1983, 1993 @@ -36,7 +36,7 @@ #if 0 static char sccsid[] = @(#)main.c 8.1 (Berkeley) 6/6/93; #else -__RCSID($NetBSD: main.c,v 1.27 2011/09/16 15:39:30 joerg Exp $); +__RCSID($NetBSD: main.c,v 1.28 2011/09/17 03:09:51 minskim Exp $); #endif #endif /* not lint */ @@ -108,6 +108,7 @@ void settimeoutopt __P((int, char **)); void status __P((int, char **)); char *tail __P((char *)); +int main __P((int, char *[])); __dead static void intr __P((int)); const struct cmd *getcmd __P((char *));
