CVS commit: src/tools/host-mkdep
Module Name:src
Committed By: uwe
Date: Wed Mar 27 01:03:40 UTC 2013
Modified Files:
src/tools/host-mkdep: host-mkdep.in
Log Message:
Some shells have ((expr)) syntax for arithmetic. Add space between
parens of nested (compound-list)s to unconfuse them.
Fixes PR toolchain/47695
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/tools/host-mkdep/host-mkdep.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/host-mkdep/host-mkdep.in
diff -u src/tools/host-mkdep/host-mkdep.in:1.28 src/tools/host-mkdep/host-mkdep.in:1.29
--- src/tools/host-mkdep/host-mkdep.in:1.28 Sat Mar 16 02:51:56 2013
+++ src/tools/host-mkdep/host-mkdep.in Wed Mar 27 01:03:39 2013
@@ -1,6 +1,6 @@
#!@BSHELL@ -
#
-# $NetBSD: host-mkdep.in,v 1.28 2013/03/16 02:51:56 christos Exp $
+# $NetBSD: host-mkdep.in,v 1.29 2013/03/27 01:03:39 uwe Exp $
#
# Copyright (c) 1991, 1993
# The Regents of the University of California. All rights reserved.
@@ -231,7 +231,7 @@ else
file=${file%.*}
set_objlist $file
- ((@CPP@ "$@" $f; echo $? >&3) | @AWK@ '
+ ( (@CPP@ "$@" $f; echo $? >&3) | @AWK@ '
/^#/ {
# Be as tolerant as possible.
sub(/^#(line)? [ 0-9]*\"?/, "")
CVS commit: src/doc
Module Name:src Committed By: christos Date: Wed Mar 27 00:39:32 UTC 2013 Modified Files: src/doc: 3RDPARTY Log Message: sync to dhcp-4.2.5-P1 To generate a diff of this commit: cvs rdiff -u -r1.1019 -r1.1020 src/doc/3RDPARTY 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.1019 src/doc/3RDPARTY:1.1020 --- src/doc/3RDPARTY:1.1019 Tue Mar 26 12:20:49 2013 +++ src/doc/3RDPARTY Tue Mar 26 20:39:31 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1019 2013/03/26 16:20:49 taca Exp $ +# $NetBSD: 3RDPARTY,v 1.1020 2013/03/27 00:39:31 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -283,7 +283,7 @@ distribution into the netbsd format. Th src/lib/libc/db/db2netbsd. Package: dhcp -Version: 4.2.5 +Version: 4.2.5-P1 Current Vers: 4.2.5-P1 Maintainer: mellon Archive Site: ftp://ftp.isc.org/isc/dhcp/
CVS commit: src/external/bsd/dhcp/include
Module Name:src Committed By: christos Date: Wed Mar 27 00:38:54 UTC 2013 Modified Files: src/external/bsd/dhcp/include: config.h Log Message: update for version change To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/dhcp/include/config.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/dhcp/include/config.h diff -u src/external/bsd/dhcp/include/config.h:1.3 src/external/bsd/dhcp/include/config.h:1.4 --- src/external/bsd/dhcp/include/config.h:1.3 Sun Mar 24 21:11:03 2013 +++ src/external/bsd/dhcp/include/config.h Tue Mar 26 20:38:54 2013 @@ -121,13 +121,13 @@ #define PACKAGE_NAME "DHCP" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "DHCP 4.2.5" +#define PACKAGE_STRING "DHCP 4.2.5-P1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "dhcp" /* Define to the version of this package. */ -#define PACKAGE_VERSION "4.2.5" +#define PACKAGE_VERSION "4.2.5-P1" /* Define to any value to include Ari's PARANOIA patch. */ /* #undef PARANOIA */ @@ -151,7 +151,7 @@ /* #undef USE_V4_PKTINFO */ /* Version number of package */ -#define VERSION "4.2.5" +#define VERSION "4.2.5-P1" /* Define to 1 if on AIX 3. System headers sometimes define this.
CVS commit: src/external/bsd/dhcp
Module Name:src
Committed By: christos
Date: Wed Mar 27 00:38:42 UTC 2013
Modified Files:
src/external/bsd/dhcp: dhcp2netbsd
Log Message:
make sure we add rcsids in all the files and not in the headers
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/dhcp/dhcp2netbsd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcp/dhcp2netbsd
diff -u src/external/bsd/dhcp/dhcp2netbsd:1.1 src/external/bsd/dhcp/dhcp2netbsd:1.2
--- src/external/bsd/dhcp/dhcp2netbsd:1.1 Sun Mar 24 11:54:29 2013
+++ src/external/bsd/dhcp/dhcp2netbsd Tue Mar 26 20:38:41 2013
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: dhcp2netbsd,v 1.1 2013/03/24 15:54:29 christos Exp $
+# $NetBSD: dhcp2netbsd,v 1.2 2013/03/27 00:38:41 christos Exp $
#
# Copyright (c) 2003, 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -52,18 +52,38 @@ find "$FILE" -type f -name '*.[chly]' -p
sed -e '1{/$NetBSD/!{i\
/* \$NetBSD\$ */\
-};}' -e \
-'/www.nominum.com/ {
- N
- N
- a\
-#include \
-__RCSID("\$NetBSD\$\");\
+};}' $c > /tmp/dhcp1$$
+mv /tmp/dhcp1$$ $c && echo did source mods for $c
+done
+find "$FILE" -type f -name '*.[cly]' -print | while read c; do
+sed -e \
+'/:\/\/www.isc.org/,/^ \*\// {
+/^ \*\//a\
+\
+#include \
+__RCSID("\$NetBSD\$");
}' $c > /tmp/dhcp1$$
mv /tmp/dhcp1$$ $c && echo did source mods for $c
done
+ for f in dst/dst_api.c dst/dst_support.c dst/hmac_link.c dst/prandom.c \
+ omapip/inet_addr.c omapip/iscprint.c server/dhcpv6.c \
+ server/dhcpleasequery.c server/ldap.c server/mdb6.c; do
+ c=$FILE/$f
+ sed -E -e \
+'/\* TH(E|IS) SOFTWARE/,/^ \*\// {
+/^ \*\//a\
+\
+#include \
+__RCSID("\$NetBSD\$");\
+
+}' $c > /tmp/dhcp1$$
+mv /tmp/dhcp1$$ $c && echo did source mods for $c
+done
+
+
+
Add RCS tags to man pages
find "$FILE" -type f -name '*.[0-9]' -print | while read m; do
sed -e '1{/$NetBSD/!i\
CVS commit: src/external/bsd/dhcp/dist
Module Name:src
Committed By: christos
Date: Wed Mar 27 00:38:09 UTC 2013
Modified Files:
src/external/bsd/dhcp/dist/client: dhc6.c dhclient.c
src/external/bsd/dhcp/dist/common: dispatch.c dns.c ns_name.c
src/external/bsd/dhcp/dist/dst: base64.c dst_api.c
src/external/bsd/dhcp/dist/includes: dhcpd.h
src/external/bsd/dhcp/dist/relay: dhcrelay.c
src/external/bsd/dhcp/dist/server: dhcpleasequery.c dhcpv6.c mdb6.c
Log Message:
welcome to 4.2.5-P1
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/dhcp/dist/client/dhc6.c \
src/external/bsd/dhcp/dist/client/dhclient.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/dhcp/dist/common/dispatch.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/dhcp/dist/common/dns.c \
src/external/bsd/dhcp/dist/common/ns_name.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/dhcp/dist/dst/base64.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/dhcp/dist/dst/dst_api.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/dhcp/dist/includes/dhcpd.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/dhcp/dist/relay/dhcrelay.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/dhcp/dist/server/dhcpleasequery.c \
src/external/bsd/dhcp/dist/server/dhcpv6.c \
src/external/bsd/dhcp/dist/server/mdb6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcp/dist/client/dhc6.c
diff -u src/external/bsd/dhcp/dist/client/dhc6.c:1.3 src/external/bsd/dhcp/dist/client/dhc6.c:1.4
--- src/external/bsd/dhcp/dist/client/dhc6.c:1.3 Sun Mar 24 19:03:05 2013
+++ src/external/bsd/dhcp/dist/client/dhc6.c Tue Mar 26 20:38:07 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dhc6.c,v 1.3 2013/03/24 23:03:05 christos Exp $ */
+/* $NetBSD: dhc6.c,v 1.4 2013/03/27 00:38:07 christos Exp $ */
/* dhc6.c - DHCPv6 client routines. */
@@ -25,6 +25,9 @@
* https://www.isc.org/
*/
+#include
+__RCSID("$NetBSD: dhc6.c,v 1.4 2013/03/27 00:38:07 christos Exp $");
+
#include "dhcpd.h"
#ifdef DHCPv6
Index: src/external/bsd/dhcp/dist/client/dhclient.c
diff -u src/external/bsd/dhcp/dist/client/dhclient.c:1.3 src/external/bsd/dhcp/dist/client/dhclient.c:1.4
--- src/external/bsd/dhcp/dist/client/dhclient.c:1.3 Sun Mar 24 19:03:05 2013
+++ src/external/bsd/dhcp/dist/client/dhclient.c Tue Mar 26 20:38:07 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dhclient.c,v 1.3 2013/03/24 23:03:05 christos Exp $ */
+/* $NetBSD: dhclient.c,v 1.4 2013/03/27 00:38:07 christos Exp $ */
/* dhclient.c
@@ -32,6 +32,9 @@
* fault and not Elliot's.
*/
+#include
+__RCSID("$NetBSD: dhclient.c,v 1.4 2013/03/27 00:38:07 christos Exp $");
+
#include "dhcpd.h"
#include
#include
@@ -866,6 +869,9 @@ int find_subnet (struct subnet **sp,
* can no longer legitimately use the lease.
*/
+#include
+__RCSID("$NetBSD: dhclient.c,v 1.4 2013/03/27 00:38:07 christos Exp $");
+
void state_reboot (cpp)
void *cpp;
{
Index: src/external/bsd/dhcp/dist/common/dispatch.c
diff -u src/external/bsd/dhcp/dist/common/dispatch.c:1.2 src/external/bsd/dhcp/dist/common/dispatch.c:1.3
--- src/external/bsd/dhcp/dist/common/dispatch.c:1.2 Sun Mar 24 11:53:58 2013
+++ src/external/bsd/dhcp/dist/common/dispatch.c Tue Mar 26 20:38:07 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dispatch.c,v 1.2 2013/03/24 15:53:58 christos Exp $ */
+/* $NetBSD: dispatch.c,v 1.3 2013/03/27 00:38:07 christos Exp $ */
/* dispatch.c
@@ -28,6 +28,9 @@
*
*/
+#include
+__RCSID("$NetBSD: dispatch.c,v 1.3 2013/03/27 00:38:07 christos Exp $");
+
#include "dhcpd.h"
#include
Index: src/external/bsd/dhcp/dist/common/dns.c
diff -u src/external/bsd/dhcp/dist/common/dns.c:1.3 src/external/bsd/dhcp/dist/common/dns.c:1.4
--- src/external/bsd/dhcp/dist/common/dns.c:1.3 Sun Mar 24 19:03:06 2013
+++ src/external/bsd/dhcp/dist/common/dns.c Tue Mar 26 20:38:07 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dns.c,v 1.3 2013/03/24 23:03:06 christos Exp $ */
+/* $NetBSD: dns.c,v 1.4 2013/03/27 00:38:07 christos Exp $ */
/* dns.c
@@ -32,6 +32,9 @@
* asynchronous DNS routines.
*/
+#include
+__RCSID("$NetBSD: dns.c,v 1.4 2013/03/27 00:38:07 christos Exp $");
+
#include "dhcpd.h"
#include "arpa/nameser.h"
#include
Index: src/external/bsd/dhcp/dist/common/ns_name.c
diff -u src/external/bsd/dhcp/dist/common/ns_name.c:1.3 src/external/bsd/dhcp/dist/common/ns_name.c:1.4
--- src/external/bsd/dhcp/dist/common/ns_name.c:1.3 Sun Mar 24 19:03:06 2013
+++ src/external/bsd/dhcp/dist/common/ns_name.c Tue Mar 26 20:38:08 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ns_name.c,v 1.3 2013/03/24 23:03:06 christos Exp $ */
+/* $NetBSD: ns_name.c,v 1.4 2013/03/27 00:38:08 christos Exp $ */
/*
* Copyright (c) 2004,2009 by Internet Systems Consortium, Inc. ("ISC")
@@ -23,6 +23,9 @@
* http://www.isc.org/
*/
+#include
+__RCSID("$NetBSD: ns_name.c,v 1.4 2013/03/27 00:38:08 christos Exp $");
+
#ifndef lint
static const char rcsid[] = "Id: ns_name.c,v 1.2 2009/10/28 04:12:29 s
CVS commit: src/external/bsd/dhcp/dist
Module Name:src Committed By: christos Date: Wed Mar 27 00:31:54 UTC 2013 Update of /cvsroot/src/external/bsd/dhcp/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21137 Log Message: security fix propagation from bind, no actual changes, and it does not affect us since we use an external bind. Status: Vendor Tag: ISC Release Tags: DHCP4_2_5_P1 U src/external/bsd/dhcp/dist/aclocal.m4 U src/external/bsd/dhcp/dist/configure U src/external/bsd/dhcp/dist/configure.ac U src/external/bsd/dhcp/dist/depcomp U src/external/bsd/dhcp/dist/install-sh U src/external/bsd/dhcp/dist/LICENSE U src/external/bsd/dhcp/dist/Makefile.am U src/external/bsd/dhcp/dist/Makefile.in U src/external/bsd/dhcp/dist/missing U src/external/bsd/dhcp/dist/README U src/external/bsd/dhcp/dist/RELNOTES N src/external/bsd/dhcp/dist/bind/bind.tar.gz N src/external/bsd/dhcp/dist/bind/Makefile N src/external/bsd/dhcp/dist/bind/version.tmp U src/external/bsd/dhcp/dist/doc/api+protocol U src/external/bsd/dhcp/dist/doc/IANA-arp-parameters U src/external/bsd/dhcp/dist/doc/References.html U src/external/bsd/dhcp/dist/doc/Makefile U src/external/bsd/dhcp/dist/doc/References.xml U src/external/bsd/dhcp/dist/doc/References.txt U src/external/bsd/dhcp/dist/doc/devel/doxyfile.in U src/external/bsd/dhcp/dist/doc/examples/dhclient-dhcpv6.conf U src/external/bsd/dhcp/dist/doc/examples/dhcpd-dhcpv6.conf U src/external/bsd/dhcp/dist/doc/ja_JP.eucJP/dhclient-script.8 U src/external/bsd/dhcp/dist/doc/ja_JP.eucJP/dhclient.8 U src/external/bsd/dhcp/dist/doc/ja_JP.eucJP/dhclient.conf.5 U src/external/bsd/dhcp/dist/doc/ja_JP.eucJP/dhclient.leases.5 U src/external/bsd/dhcp/dist/doc/ja_JP.eucJP/dhcp-eval.5 U src/external/bsd/dhcp/dist/doc/ja_JP.eucJP/dhcp-options.5 U src/external/bsd/dhcp/dist/client/dhclient-script.8 U src/external/bsd/dhcp/dist/client/clparse.c C src/external/bsd/dhcp/dist/client/dhc6.c U src/external/bsd/dhcp/dist/client/dhclient.conf.5 U src/external/bsd/dhcp/dist/client/dhclient.8 C src/external/bsd/dhcp/dist/client/dhclient.c U src/external/bsd/dhcp/dist/client/dhclient.conf.example U src/external/bsd/dhcp/dist/client/dhclient.leases.5 U src/external/bsd/dhcp/dist/client/Makefile.am U src/external/bsd/dhcp/dist/client/Makefile.in U src/external/bsd/dhcp/dist/client/scripts/freebsd U src/external/bsd/dhcp/dist/client/scripts/bsdos U src/external/bsd/dhcp/dist/client/scripts/macos U src/external/bsd/dhcp/dist/client/scripts/linux U src/external/bsd/dhcp/dist/client/scripts/netbsd U src/external/bsd/dhcp/dist/client/scripts/nextstep U src/external/bsd/dhcp/dist/client/scripts/openbsd U src/external/bsd/dhcp/dist/client/scripts/openwrt U src/external/bsd/dhcp/dist/client/scripts/solaris U src/external/bsd/dhcp/dist/common/conflex.c U src/external/bsd/dhcp/dist/common/alloc.c U src/external/bsd/dhcp/dist/common/bpf.c U src/external/bsd/dhcp/dist/common/comapi.c U src/external/bsd/dhcp/dist/common/dhcp-eval.5 U src/external/bsd/dhcp/dist/common/ctrace.c U src/external/bsd/dhcp/dist/common/parse.c U src/external/bsd/dhcp/dist/common/dhcp-options.5 U src/external/bsd/dhcp/dist/common/discover.c C src/external/bsd/dhcp/dist/common/dispatch.c U src/external/bsd/dhcp/dist/common/dlpi.c C src/external/bsd/dhcp/dist/common/dns.c U src/external/bsd/dhcp/dist/common/ethernet.c U src/external/bsd/dhcp/dist/common/execute.c U src/external/bsd/dhcp/dist/common/fddi.c U src/external/bsd/dhcp/dist/common/icmp.c U src/external/bsd/dhcp/dist/common/inet.c U src/external/bsd/dhcp/dist/common/lpf.c U src/external/bsd/dhcp/dist/common/Makefile.am U src/external/bsd/dhcp/dist/common/Makefile.in U src/external/bsd/dhcp/dist/common/memory.c U src/external/bsd/dhcp/dist/common/nit.c C src/external/bsd/dhcp/dist/common/ns_name.c U src/external/bsd/dhcp/dist/common/options.c U src/external/bsd/dhcp/dist/common/packet.c U src/external/bsd/dhcp/dist/common/print.c U src/external/bsd/dhcp/dist/common/raw.c U src/external/bsd/dhcp/dist/common/resolv.c U src/external/bsd/dhcp/dist/common/socket.c U src/external/bsd/dhcp/dist/common/tables.c U src/external/bsd/dhcp/dist/common/tree.c U src/external/bsd/dhcp/dist/common/tr.c U src/external/bsd/dhcp/dist/common/upf.c U src/external/bsd/dhcp/dist/common/tests/Makefile.am U src/external/bsd/dhcp/dist/common/tests/Atffile U src/external/bsd/dhcp/dist/common/tests/test_alloc.c U src/external/bsd/dhcp/dist/common/tests/Makefile.in U src/external/bsd/dhcp/dist/contrib/dhclient-tz-exithook.sh U src/external/bsd/dhcp/dist/contrib/3.0b1-lease-convert U src/external/bsd/dhcp/dist/contrib/dhcp.spec U src/external/bsd/dhcp/dist/contrib/sethostname.sh U src/external/bsd/dhcp/dist/contrib/solaris.init U src/external/bsd/dhcp/dist/contrib/ldap/dhcpd-conf-to-ldap U src/external/bsd/dhcp/dist/contrib/ldap/dhcp.schema U src/external/bsd/dhcp/dist/contrib/ldap/README.ldap U src/external/bsd/dhcp/dist/contrib/ms2isc/ms2isc.pl U src/external/bsd/dhcp/dist/contrib/ms2isc/readme.txt U src/external/bsd/dhcp/dist/contr
CVS commit: src/sys/dev/mscp
Module Name:src
Committed By: martin
Date: Tue Mar 26 23:29:11 UTC 2013
Modified Files:
src/sys/dev/mscp: mscp_subr.c
Log Message:
Fix device_t split glitch
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/mscp/mscp_subr.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/dev/mscp/mscp_subr.c
diff -u src/sys/dev/mscp/mscp_subr.c:1.44 src/sys/dev/mscp/mscp_subr.c:1.45
--- src/sys/dev/mscp/mscp_subr.c:1.44 Sat Oct 27 17:18:27 2012
+++ src/sys/dev/mscp/mscp_subr.c Tue Mar 26 23:29:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_subr.c,v 1.44 2012/10/27 17:18:27 chs Exp $ */
+/* $NetBSD: mscp_subr.c,v 1.45 2013/03/26 23:29:11 martin Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -75,7 +75,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mscp_subr.c,v 1.44 2012/10/27 17:18:27 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_subr.c,v 1.45 2013/03/26 23:29:11 martin Exp $");
#include
#include
@@ -550,7 +550,7 @@ mscp_print(void *aux, const char *name)
void
mscp_strategy(struct buf *bp, device_t usc)
{
- struct mscp_softc *mi = (void *)usc;
+ struct mscp_softc *mi = device_private(usc);
int s = spluba();
bufq_put(mi->mi_resq, bp);
CVS commit: src/usr.bin/cap_mkdb
Module Name:src
Committed By: christos
Date: Tue Mar 26 20:58:35 UTC 2013
Modified Files:
src/usr.bin/cap_mkdb: cap_mkdb.c
Log Message:
PR/32591: JuanRP: Also remove the file we are going to be building to prevent
it from being used as input.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/cap_mkdb/cap_mkdb.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/cap_mkdb/cap_mkdb.c
diff -u src/usr.bin/cap_mkdb/cap_mkdb.c:1.28 src/usr.bin/cap_mkdb/cap_mkdb.c:1.29
--- src/usr.bin/cap_mkdb/cap_mkdb.c:1.28 Wed Jan 23 15:27:01 2013
+++ src/usr.bin/cap_mkdb/cap_mkdb.c Tue Mar 26 16:58:35 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cap_mkdb.c,v 1.28 2013/01/23 20:27:01 riastradh Exp $ */
+/* $NetBSD: cap_mkdb.c,v 1.29 2013/03/26 20:58:35 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -40,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 19
#if 0
static char sccsid[] = "@(#)cap_mkdb.c 8.2 (Berkeley) 4/27/95";
#endif
-__RCSID("$NetBSD: cap_mkdb.c,v 1.28 2013/01/23 20:27:01 riastradh Exp $");
+__RCSID("$NetBSD: cap_mkdb.c,v 1.29 2013/03/26 20:58:35 christos Exp $");
#endif /* not lint */
#include
@@ -63,7 +63,7 @@ static int count_records(char **);
static DB *capdbp;
static int verbose;
-static char *capname, buf[8 * 1024];
+static char *capname, outfile[MAXPATHLEN];
static HASHINFO openinfo = {
4096, /* bsize */
@@ -126,13 +126,17 @@ main(int argc, char *argv[])
* The database file is the first argument if no name is specified.
* Make arrangements to unlink it if exit badly.
*/
- (void)snprintf(buf, sizeof(buf), "%s.db.tmp",
+ (void)snprintf(outfile, sizeof(outfile), "%s.db.tmp",
capname ? capname : *argv);
- if ((capname = strdup(buf)) == NULL)
+ if ((capname = strdup(outfile)) == NULL)
err(1, "strdup");
+ p = strrchr(outfile, '.');
+ assert(p != NULL);
+ *p = '\0';
+ (void)unlink(outfile);
if ((capdbp = dbopen(capname, O_CREAT | O_TRUNC | O_RDWR,
DEFFILEMODE, DB_HASH, &openinfo)) == NULL)
- err(1, "%s", buf);
+ err(1, "%s", outfile);
if (atexit(dounlink))
err(1, "atexit");
@@ -141,10 +145,7 @@ main(int argc, char *argv[])
if (capdbp->close(capdbp) < 0)
err(1, "%s", capname);
- p = strrchr(buf, '.');
- assert(p != NULL);
- *p = '\0';
- if (rename(capname, buf) == -1)
+ if (rename(capname, outfile) == -1)
err(1, "rename");
free(capname);
capname = NULL;
@@ -155,7 +156,7 @@ static void
dounlink(void)
{
if (capname != NULL)
- (void)unlink(capname);
+ unlink(capname);
}
/*
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: garbled
Date: Tue Mar 26 20:56:55 UTC 2013
Modified Files:
src/distrib/utils/sysinst: configmenu.c defs.h
src/distrib/utils/sysinst/arch/evbarm: md.c
Log Message:
Add def for KERNEL_9
Get rid of unneeded disklabel -D in md.c
Fix pr/47684 by getting rid of a stupid NULL.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/utils/sysinst/configmenu.c
cvs rdiff -u -r1.166 -r1.167 src/distrib/utils/sysinst/defs.h
cvs rdiff -u -r1.27 -r1.28 src/distrib/utils/sysinst/arch/evbarm/md.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/configmenu.c
diff -u src/distrib/utils/sysinst/configmenu.c:1.6 src/distrib/utils/sysinst/configmenu.c:1.7
--- src/distrib/utils/sysinst/configmenu.c:1.6 Tue Mar 19 22:16:53 2013
+++ src/distrib/utils/sysinst/configmenu.c Tue Mar 26 20:56:54 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: configmenu.c,v 1.6 2013/03/19 22:16:53 garbled Exp $ */
+/* $NetBSD: configmenu.c,v 1.7 2013/03/26 20:56:54 garbled Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -92,7 +92,7 @@ configinfo config_list[] = {
{MSG_enable_ntpd, CONFIGOPT_NTPD, "ntpd", toggle_rcvar, NULL},
{MSG_run_ntpdate, CONFIGOPT_NTPDATE, "ntpdate", toggle_rcvar, NULL},
{MSG_enable_mdnsd, CONFIGOPT_MDNSD, "mdnsd", toggle_rcvar, NULL},
- {MSG_add_a_user, CONFIGOPT_ADDUSER, NULL, add_new_user, NULL},
+ {MSG_add_a_user, CONFIGOPT_ADDUSER, NULL, add_new_user, ""},
{NULL, CONFIGOPT_LAST, NULL, NULL, NULL}
};
Index: src/distrib/utils/sysinst/defs.h
diff -u src/distrib/utils/sysinst/defs.h:1.166 src/distrib/utils/sysinst/defs.h:1.167
--- src/distrib/utils/sysinst/defs.h:1.166 Tue Mar 19 22:16:53 2013
+++ src/distrib/utils/sysinst/defs.h Tue Mar 26 20:56:54 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.166 2013/03/19 22:16:53 garbled Exp $ */
+/* $NetBSD: defs.h,v 1.167 2013/03/26 20:56:54 garbled Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -95,7 +95,8 @@ enum {
SET_KERNEL_6, /* MD kernel... */
SET_KERNEL_7, /* MD kernel... */
SET_KERNEL_8, /* MD kernel... */
-SET_KERNEL_LAST, /* allow 8 kernels */
+SET_KERNEL_9, /* MD kernel... */
+SET_KERNEL_LAST, /* allow 9 kernels */
/* System sets */
SET_BASE, /* base */
Index: src/distrib/utils/sysinst/arch/evbarm/md.c
diff -u src/distrib/utils/sysinst/arch/evbarm/md.c:1.27 src/distrib/utils/sysinst/arch/evbarm/md.c:1.28
--- src/distrib/utils/sysinst/arch/evbarm/md.c:1.27 Tue Mar 19 22:16:54 2013
+++ src/distrib/utils/sysinst/arch/evbarm/md.c Tue Mar 26 20:56:55 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.27 2013/03/19 22:16:54 garbled Exp $ */
+/* $NetBSD: md.c,v 1.28 2013/03/26 20:56:55 garbled Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -178,11 +178,6 @@ md_pre_disklabel(void)
process_menu(MENU_ok, NULL);
return 1;
}
- /* nuke the disklabel from orbit, because d from the gzimg
- corrupts it hopelessly
- */
- if (boardtype == BOARD_TYPE_RPI)
- run_program(RUN_DISPLAY, "/sbin/disklabel -D %s", diskdev);
return 0;
}
CVS commit: src/sys/arch/vax/vax
Module Name:src
Committed By: martin
Date: Tue Mar 26 20:52:30 UTC 2013
Modified Files:
src/sys/arch/vax/vax: ka730.c ka750.c ka780.c
Log Message:
Minor cosmetic tweaks for cpu attach messages
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/vax/vax/ka730.c
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/vax/vax/ka750.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/vax/vax/ka780.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/vax/vax/ka730.c
diff -u src/sys/arch/vax/vax/ka730.c:1.4 src/sys/arch/vax/vax/ka730.c:1.5
--- src/sys/arch/vax/vax/ka730.c:1.4 Mon Oct 29 12:55:41 2012
+++ src/sys/arch/vax/vax/ka730.c Tue Mar 26 20:52:29 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ka730.c,v 1.4 2012/10/29 12:55:41 chs Exp $ */
+/* $NetBSD: ka730.c,v 1.5 2013/03/26 20:52:29 martin Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 The Regents of the University of California.
* All rights reserved.
@@ -68,7 +68,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ka730.c,v 1.4 2012/10/29 12:55:41 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka730.c,v 1.5 2013/03/26 20:52:29 martin Exp $");
#include
#include
@@ -117,7 +117,7 @@ ka730_conf(void)
void
ka730_attach_cpu(device_t self)
{
- aprint_normal("KA730, ucode rev %d\n", V730UCODE(vax_cpudata));
+ aprint_normal(": KA730, ucode rev %d\n", V730UCODE(vax_cpudata));
}
static void ka730_memenable(device_t, device_t, void *);
Index: src/sys/arch/vax/vax/ka750.c
diff -u src/sys/arch/vax/vax/ka750.c:1.44 src/sys/arch/vax/vax/ka750.c:1.45
--- src/sys/arch/vax/vax/ka750.c:1.44 Tue Dec 14 23:44:49 2010
+++ src/sys/arch/vax/vax/ka750.c Tue Mar 26 20:52:29 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ka750.c,v 1.44 2010/12/14 23:44:49 matt Exp $ */
+/* $NetBSD: ka750.c,v 1.45 2013/03/26 20:52:29 martin Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 The Regents of the University of California.
* All rights reserved.
@@ -68,7 +68,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ka750.c,v 1.44 2010/12/14 23:44:49 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka750.c,v 1.45 2013/03/26 20:52:29 martin Exp $");
#include
#include
@@ -123,7 +123,7 @@ ka750_conf(void)
void
ka750_attach_cpu(device_t self)
{
- aprint_normal("KA750, 4KB L1 cache, hardware/ucode rev %d/%d, ",
+ aprint_normal(": KA750, 4KB L1 cache, hardware/ucode rev %d/%d, ",
V750HARDW(vax_cpudata), V750UCODE(vax_cpudata));
if (mfpr(PR_ACCS) & 255) {
aprint_normal("FPA present\n");
Index: src/sys/arch/vax/vax/ka780.c
diff -u src/sys/arch/vax/vax/ka780.c:1.29 src/sys/arch/vax/vax/ka780.c:1.30
--- src/sys/arch/vax/vax/ka780.c:1.29 Tue Dec 14 23:44:49 2010
+++ src/sys/arch/vax/vax/ka780.c Tue Mar 26 20:52:30 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ka780.c,v 1.29 2010/12/14 23:44:49 matt Exp $ */
+/* $NetBSD: ka780.c,v 1.30 2013/03/26 20:52:30 martin Exp $ */
/*-
* Copyright (c) 1982, 1986, 1988 The Regents of the University of California.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ka780.c,v 1.29 2010/12/14 23:44:49 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka780.c,v 1.30 2013/03/26 20:52:30 martin Exp $");
#include
#include
@@ -364,7 +364,7 @@ ka780_attach_cpu(device_t self)
{
struct ka78x * const ka78 = (void *)&vax_cpudata;
- aprint_normal("KA%s, serial number %d(%d), hardware ECO level %d(%d)\n",
+ aprint_normal(": KA%s, S/N %d(%d), hardware ECO level %d(%d)\n",
&cpu_model[8], ka78->snr, ka78->plant, ka78->eco >> 4, ka78->eco);
aprint_normal_dev(self, "4KB L1 cachen");
if (mfpr(PR_ACCS) & 255) {
CVS commit: src/doc
Module Name:src Committed By: taca Date: Tue Mar 26 16:20:50 UTC 2013 Modified Files: src/doc: 3RDPARTY Log Message: - ISC DHCP 4.2.5-P1 is out. - Add Postfix 2.10.0 with 2.9.5. To generate a diff of this commit: cvs rdiff -u -r1.1018 -r1.1019 src/doc/3RDPARTY 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.1018 src/doc/3RDPARTY:1.1019 --- src/doc/3RDPARTY:1.1018 Sun Mar 24 23:04:07 2013 +++ src/doc/3RDPARTY Tue Mar 26 16:20:49 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1018 2013/03/24 23:04:07 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1019 2013/03/26 16:20:49 taca Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -284,7 +284,7 @@ src/lib/libc/db/db2netbsd. Package: dhcp Version: 4.2.5 -Current Vers: 4.2.5 +Current Vers: 4.2.5-P1 Maintainer: mellon Archive Site: ftp://ftp.isc.org/isc/dhcp/ Home Page: http://www.isc.org/software/dhcp/ @@ -1048,7 +1048,7 @@ now to do a new import. Package: Postfix Version: 2.9.5 -Current Vers: 2.9.5 +Current Vers: 2.10.0/2.9.5 Maintainer: Wietse Venema Archive Site: ftp://postfix.cloud9.net/official/ Home Page: http://www.postfix.org/
CVS commit: [agc-symver] src/lib/libterminfo
Module Name:src
Committed By: agc
Date: Tue Mar 26 14:45:24 UTC 2013
Added Files:
src/lib/libterminfo [agc-symver]: Version.map
Log Message:
Add symbol versioning information for libterminfo.
Obvious (but interesting) aspect of this library: ospeed, PC, and
BC also need to be exported as global symbols or they are not found
at link time.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.2.1 src/lib/libterminfo/Version.map
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/lib/libterminfo/Version.map
diff -u /dev/null src/lib/libterminfo/Version.map:1.1.2.1
--- /dev/null Tue Mar 26 14:45:24 2013
+++ src/lib/libterminfo/Version.map Tue Mar 26 14:45:24 2013
@@ -0,0 +1,61 @@
+LIBTERMINFO_1.0.0.0 {
+global:
+ PC;
+ ospeed;
+ putp;
+ ti_putp;
+ ti_puts;
+ tputs;
+ ti_getflag;
+ ti_getnum;
+ ti_getstr;
+ tigetflag;
+ tigetnum;
+ tigetstr;
+ BC;
+ UP;
+ captoinfo;
+ tgetent;
+ tgetflag;
+ tgetnum;
+ tgetstr;
+ tgoto;
+ _ti_parm_analyse;
+ ti_tiparm;
+ tiparm;
+ tparm;
+ setupterm;
+ ti_setupterm;
+ _ti_database;
+ _ti_getterm;
+ _ti_compile;
+ _ti_find_cap;
+ _ti_find_extra;
+ _ti_flatten;
+ _ti_freetic;
+ _ti_get_token;
+ _ti_grow_tbuf;
+ _ti_store_extra;
+ _ti_setospeed;
+ cur_term;
+ del_curterm;
+ longname;
+ set_curterm;
+ termname;
+ ttytype;
+ _ti_flagid;
+ _ti_flagindex;
+ _ti_numid;
+ _ti_numindex;
+ _ti_strid;
+ _ti_strindex;
+};
+
+NetBSD_6.99.18.0 {
+} LIBTERMINFO_1.0.0.0;
+
+LIBTERMINFO_private_1.0.0.0 {
+local:
+ *;
+};
+
CVS commit: src/sys/arch/m68k/fpe
Module Name:src
Committed By: isaki
Date: Tue Mar 26 11:30:21 UTC 2013
Modified Files:
src/sys/arch/m68k/fpe: fpu_add.c fpu_arith.h fpu_div.c fpu_emulate.c
fpu_emulate.h fpu_explode.c fpu_fmovecr.c fpu_fscale.c fpu_fstore.c
fpu_implode.c fpu_log.c fpu_mul.c fpu_rem.c fpu_sqrt.c fpu_subr.c
fpu_trig.c
Log Message:
u_int -> uint32_t
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/m68k/fpe/fpu_add.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/m68k/fpe/fpu_arith.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/m68k/fpe/fpu_div.c \
src/sys/arch/m68k/fpe/fpu_mul.c src/sys/arch/m68k/fpe/fpu_sqrt.c \
src/sys/arch/m68k/fpe/fpu_trig.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/m68k/fpe/fpu_emulate.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/m68k/fpe/fpu_emulate.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/m68k/fpe/fpu_explode.c \
src/sys/arch/m68k/fpe/fpu_fstore.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/m68k/fpe/fpu_fmovecr.c \
src/sys/arch/m68k/fpe/fpu_fscale.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/m68k/fpe/fpu_implode.c \
src/sys/arch/m68k/fpe/fpu_log.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/m68k/fpe/fpu_rem.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/m68k/fpe/fpu_subr.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/m68k/fpe/fpu_add.c
diff -u src/sys/arch/m68k/fpe/fpu_add.c:1.8 src/sys/arch/m68k/fpe/fpu_add.c:1.9
--- src/sys/arch/m68k/fpe/fpu_add.c:1.8 Tue Mar 19 09:17:17 2013
+++ src/sys/arch/m68k/fpe/fpu_add.c Tue Mar 26 11:30:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_add.c,v 1.8 2013/03/19 09:17:17 isaki Exp $ */
+/* $NetBSD: fpu_add.c,v 1.9 2013/03/26 11:30:20 isaki Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -47,7 +47,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fpu_add.c,v 1.8 2013/03/19 09:17:17 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_add.c,v 1.9 2013/03/26 11:30:20 isaki Exp $");
#include
#include
@@ -61,7 +61,7 @@ struct fpn *
fpu_add(struct fpemu *fe)
{
struct fpn *x = &fe->fe_f1, *y = &fe->fe_f2, *r;
- u_int r0, r1, r2;
+ uint32_t r0, r1, r2;
int rd;
/*
Index: src/sys/arch/m68k/fpe/fpu_arith.h
diff -u src/sys/arch/m68k/fpe/fpu_arith.h:1.6 src/sys/arch/m68k/fpe/fpu_arith.h:1.7
--- src/sys/arch/m68k/fpe/fpu_arith.h:1.6 Tue Mar 19 09:17:17 2013
+++ src/sys/arch/m68k/fpe/fpu_arith.h Tue Mar 26 11:30:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_arith.h,v 1.6 2013/03/19 09:17:17 isaki Exp $ */
+/* $NetBSD: fpu_arith.h,v 1.7 2013/03/26 11:30:20 isaki Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -80,13 +80,13 @@
#define FPU_ADDS(r, x, y) \
{ \
fpu_tmp = (quad_t)(x) + (quad_t)(y); \
- (r) = (u_int)fpu_tmp; \
+ (r) = (uint32_t)fpu_tmp; \
fpu_carry = ((fpu_tmp & 0xLL) != 0); \
}
#define FPU_ADDCS(r, x, y) \
{ \
fpu_tmp = (quad_t)(x) + (quad_t)(y) + (!!fpu_carry); \
- (r) = (u_int)fpu_tmp; \
+ (r) = (uint32_t)fpu_tmp; \
fpu_carry = ((fpu_tmp & 0xLL) != 0); \
}
#define FPU_SUBC(r, x, y) \
@@ -94,13 +94,13 @@
#define FPU_SUBS(r, x, y) \
{ \
fpu_tmp = (quad_t)(x) - (quad_t)(y); \
- (r) = (u_int)fpu_tmp; \
+ (r) = (uint32_t)fpu_tmp; \
fpu_carry = ((fpu_tmp & 0xLL) != 0); \
}
#define FPU_SUBCS(r, x, y) \
{ \
fpu_tmp = (quad_t)(x) - (quad_t)(y) - (!!fpu_carry); \
- (r) = (u_int)fpu_tmp; \
+ (r) = (uint32_t)fpu_tmp; \
fpu_carry = ((fpu_tmp & 0xLL) != 0); \
}
Index: src/sys/arch/m68k/fpe/fpu_div.c
diff -u src/sys/arch/m68k/fpe/fpu_div.c:1.7 src/sys/arch/m68k/fpe/fpu_div.c:1.8
--- src/sys/arch/m68k/fpe/fpu_div.c:1.7 Tue Mar 19 09:17:17 2013
+++ src/sys/arch/m68k/fpe/fpu_div.c Tue Mar 26 11:30:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_div.c,v 1.7 2013/03/19 09:17:17 isaki Exp $ */
+/* $NetBSD: fpu_div.c,v 1.8 2013/03/26 11:30:20 isaki Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fpu_div.c,v 1.7 2013/03/19 09:17:17 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_div.c,v 1.8 2013/03/26 11:30:20 isaki Exp $");
#include
@@ -153,8 +153,8 @@ struct fpn *
fpu_div(struct fpemu *fe)
{
struct fpn *x = &fe->fe_f1, *y = &fe->fe_f2;
- u_int q, bit;
- u_int r0, r1, r2, d0, d1, d2, y0, y1, y2;
+ uint32_t q, bit;
+ uint32_t r0, r1, r2, d0, d1, d2, y0, y1, y2;
FPU_DECL_CARRY
fe->fe_fpsr &= ~FPSR_EXCP; /* clear all exceptions */
Index: src/sys/arch/m68k/fpe/fpu_mul.c
diff -u src/sys/arch/m68k/fpe/fpu_mul.c:1.7 src/sys/arch/m68k/fpe/fpu_mul.c:1.8
--- src/sys/arch/m68k/fpe/fpu_mul.c:1.7 Tue Mar 19 09:17:17 2013
+++ src/sys/arch/m68k/fpe/fpu_mul.c Tue Mar 26 11:30:21 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_mul.c,v 1.7 2013/03/19 09:17:17 isaki Exp $ */
+/* $NetBSD: fpu_mul.c,v 1.8 2013/03/26 11:30:21 isaki Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fpu_mul.c,v 1.7 2013/0
CVS commit: src/sys/arch/m68k/fpe
Module Name:src
Committed By: isaki
Date: Tue Mar 26 10:57:13 UTC 2013
Modified Files:
src/sys/arch/m68k/fpe: fpu_rem.c
Log Message:
Fix a wrong "raw" comparison in step3.2.
It should solve a PR kern/47692.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/m68k/fpe/fpu_rem.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/m68k/fpe/fpu_rem.c
diff -u src/sys/arch/m68k/fpe/fpu_rem.c:1.11 src/sys/arch/m68k/fpe/fpu_rem.c:1.12
--- src/sys/arch/m68k/fpe/fpu_rem.c:1.11 Mon Jul 18 14:11:27 2011
+++ src/sys/arch/m68k/fpe/fpu_rem.c Tue Mar 26 10:57:13 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_rem.c,v 1.11 2011/07/18 14:11:27 isaki Exp $ */
+/* $NetBSD: fpu_rem.c,v 1.12 2013/03/26 10:57:13 isaki Exp $ */
/*
* Copyright (c) 1995 Ken Nakata
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fpu_rem.c,v 1.11 2011/07/18 14:11:27 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_rem.c,v 1.12 2013/03/26 10:57:13 isaki Exp $");
#include
#include
@@ -92,6 +92,7 @@ __fpu_modrem(struct fpemu *fe, int modre
{
static struct fpn X, Y;
struct fpn *x, *y, *r;
+ struct fpn r_bkup;
u_int signX, signY, signQ;
int j, k, l, q;
int Last_Subtract;
@@ -130,15 +131,15 @@ __fpu_modrem(struct fpemu *fe, int modre
y->fp_mant[2] != r->fp_mant[2]) {
/* Step 3.2 */
- if (y->fp_exp < r->fp_exp ||
- y->fp_mant[0] < r->fp_mant[0] ||
- y->fp_mant[1] < r->fp_mant[1] ||
- y->fp_mant[2] < r->fp_mant[2]) {
-CPYFPN(&fe->fe_f1, r);
-CPYFPN(&fe->fe_f2, y);
-fe->fe_f2.fp_sign = 1;
-r = fpu_add(fe);
+ CPYFPN(&r_bkup, r);
+ CPYFPN(&fe->fe_f1, r);
+ CPYFPN(&fe->fe_f2, y);
+ fe->fe_f2.fp_sign = 1;
+ r = fpu_add(fe);
+ if (r->fp_sign == 0) {
q++;
+ } else {
+CPYFPN(r, &r_bkup);
}
/* Step 3.3 */
