Module Name: src
Committed By: bouyer
Date: Mon May 18 18:31:18 UTC 2009
Modified Files:
src/doc [netbsd-4-0]: CHANGES-4.0.2
src/usr.bin/paste [netbsd-4-0]: paste.c
Log Message:
Tickets 1317, 1318
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.29 -r1.1.2.30 src/doc/CHANGES-4.0.2
cvs rdiff -u -r1.12 -r1.12.10.1 src/usr.bin/paste/paste.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES-4.0.2
diff -u src/doc/CHANGES-4.0.2:1.1.2.29 src/doc/CHANGES-4.0.2:1.1.2.30
--- src/doc/CHANGES-4.0.2:1.1.2.29 Mon May 11 19:31:33 2009
+++ src/doc/CHANGES-4.0.2 Mon May 18 18:31:18 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-4.0.2,v 1.1.2.29 2009/05/11 19:31:33 bouyer Exp $
+# $NetBSD: CHANGES-4.0.2,v 1.1.2.30 2009/05/18 18:31:18 bouyer Exp $
A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2
release:
@@ -244,3 +244,15 @@
Fix typo, from Shannon -jj Behrens in PR 41375.
[dholland, ticket #1314]
+sys/arch/sparc/include/psl.h 1.45
+
+ Add memory clobbers to the inline assembler modifying/testing the %psr
+ register, to avoid the compiler reordering instructions out of critical
+ sections. Should fix PR port-sparc/41372.
+ [martin, ticket #1317]
+
+lib/libc/gen/sysctl.3 patch
+
+ document PROC_PID_LIMIT_SBSIZE. Addresses PR 36463.
+ [snj, ticket #1318]
+
Index: src/usr.bin/paste/paste.c
diff -u src/usr.bin/paste/paste.c:1.12 src/usr.bin/paste/paste.c:1.12.10.1
--- src/usr.bin/paste/paste.c:1.12 Sat Apr 1 06:36:58 2006
+++ src/usr.bin/paste/paste.c Mon May 18 18:31:18 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: paste.c,v 1.12 2006/04/01 06:36:58 rtr Exp $ */
+/* $NetBSD: paste.c,v 1.12.10.1 2009/05/18 18:31:18 bouyer Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -40,7 +40,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)paste.c 8.1 (Berkeley) 6/6/93";*/
-__RCSID("$NetBSD: paste.c,v 1.12 2006/04/01 06:36:58 rtr Exp $");
+__RCSID("$NetBSD: paste.c,v 1.12.10.1 2009/05/18 18:31:18 bouyer Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -222,6 +222,7 @@
if (!cnt)
errx(1, "no delimiters specified.");
+ *arg = '\0';
return(cnt);
}