CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: macallan Date: Tue Jun 16 18:12:18 UTC 2015 Modified Files: src/sys/arch/mips/mips: locore_mips3.S Log Message: .set mips3 for __mips_o32 now o32 kernels boot again on my O2 To generate a diff of this commit: cvs rdiff -u -r1.109 -r1.110 src/sys/arch/mips/mips/locore_mips3.S 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/mips/mips/locore_mips3.S diff -u src/sys/arch/mips/mips/locore_mips3.S:1.109 src/sys/arch/mips/mips/locore_mips3.S:1.110 --- src/sys/arch/mips/mips/locore_mips3.S:1.109 Thu Jun 11 07:30:10 2015 +++ src/sys/arch/mips/mips/locore_mips3.S Tue Jun 16 18:12:18 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: locore_mips3.S,v 1.109 2015/06/11 07:30:10 matt Exp $ */ +/* $NetBSD: locore_mips3.S,v 1.110 2015/06/16 18:12:18 macallan Exp $ */ /* * Copyright (c) 1997 Jonathan Stone (hereinafter referred to as the author) @@ -121,7 +121,7 @@ * */ .set noreorder -#if __mips 3 +#if (__mips 3) || __mips_o32 .set mips3 #endif
CVS commit: src/usr.bin/config
Module Name:src
Committed By: christos
Date: Tue Jun 16 21:12:19 UTC 2015
Modified Files:
src/usr.bin/config: main.c scan.l
Log Message:
remove stray newlines from errors/warnings
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/usr.bin/config/main.c
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/config/scan.l
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/config/main.c
diff -u src/usr.bin/config/main.c:1.74 src/usr.bin/config/main.c:1.75
--- src/usr.bin/config/main.c:1.74 Thu Jan 22 15:01:22 2015
+++ src/usr.bin/config/main.c Tue Jun 16 17:12:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.74 2015/01/22 20:01:22 christos Exp $ */
+/* $NetBSD: main.c,v 1.75 2015/06/16 21:12:19 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: main.c,v 1.74 2015/01/22 20:01:22 christos Exp $);
+__RCSID($NetBSD: main.c,v 1.75 2015/06/16 21:12:19 christos Exp $);
#ifndef MAKE_BOOTSTRAP
#include sys/cdefs.h
@@ -598,7 +598,7 @@ recreate(const char *p, const char *q)
int ret;
if ((ret = unlink(q)) == -1 errno != ENOENT)
- warn(unlink(%s)\n, q);
+ warn(unlink(%s), q);
if ((ret = symlink(p, q)) == -1)
warn(symlink(%s - %s), q, p);
return ret;
Index: src/usr.bin/config/scan.l
diff -u src/usr.bin/config/scan.l:1.22 src/usr.bin/config/scan.l:1.23
--- src/usr.bin/config/scan.l:1.22 Fri Nov 7 12:50:14 2014
+++ src/usr.bin/config/scan.l Tue Jun 16 17:12:19 2015
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: scan.l,v 1.22 2014/11/07 17:50:14 christos Exp $ */
+/* $NetBSD: scan.l,v 1.23 2015/06/16 21:12:19 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: scan.l,v 1.22 2014/11/07 17:50:14 christos Exp $);
+__RCSID($NetBSD: scan.l,v 1.23 2015/06/16 21:12:19 christos Exp $);
#include sys/param.h
#include errno.h
@@ -362,7 +362,7 @@ package[ \t]+{FILENAME}{RESTOFLINE} {
/* Detect NUL characters in the config file and
* error out.
*/
- cfgerror(NUL character detected at line %i\n, yyline);
+ cfgerror(NUL character detected at line %i, yyline);
}
#.* { /* ignored (comment) */; }
[ \t]+ { /* ignored (white space) */; }
@@ -505,7 +505,7 @@ include(const char *fname, int ateof, in
s = sourcepath(fname);
if ((fp = fopen(s, r)) == NULL) {
if (conditional == 0)
- cfgerror(cannot open %s for reading: %s\n, s,
+ cfgerror(cannot open %s for reading: %s, s,
strerror(errno));
else if (vflag)
cfgwarn(cannot open conditional include file %s: %s,
@@ -514,7 +514,7 @@ include(const char *fname, int ateof, in
return (-1);
}
if (curdir_push(s) == -1) {
- cfgerror(cannot record current working directory for %s\n, s);
+ cfgerror(cannot record current working directory for %s, s);
fclose(fp);
free(s);
return (-1);
CVS import: src/crypto/external/bsd/openssl/dist
Module Name:src Committed By: christos Date: Tue Jun 16 19:55:47 UTC 2015 Update of /cvsroot/src/crypto/external/bsd/openssl/dist In directory ivanova.netbsd.org:/tmp/cvs-serv17683 Log Message: Changes between 1.0.1n and 1.0.1o [12 Jun 2015] *) Fix HMAC ABI incompatibility. The previous version introduced an ABI incompatibility in the handling of HMAC. The previous ABI has now been restored. Status: Vendor Tag: OPENSSL Release Tags: openssl-1-0-1o U src/crypto/external/bsd/openssl/dist/ACKNOWLEDGMENTS U src/crypto/external/bsd/openssl/dist/CHANGES.SSLeay C src/crypto/external/bsd/openssl/dist/CHANGES U src/crypto/external/bsd/openssl/dist/Configure U src/crypto/external/bsd/openssl/dist/config U src/crypto/external/bsd/openssl/dist/e_os2.h U src/crypto/external/bsd/openssl/dist/e_os.h U src/crypto/external/bsd/openssl/dist/FAQ U src/crypto/external/bsd/openssl/dist/install.com U src/crypto/external/bsd/openssl/dist/INSTALL U src/crypto/external/bsd/openssl/dist/INSTALL.W64 U src/crypto/external/bsd/openssl/dist/INSTALL.DJGPP U src/crypto/external/bsd/openssl/dist/INSTALL.MacOS U src/crypto/external/bsd/openssl/dist/INSTALL.NW U src/crypto/external/bsd/openssl/dist/INSTALL.OS2 U src/crypto/external/bsd/openssl/dist/INSTALL.VMS U src/crypto/external/bsd/openssl/dist/INSTALL.W32 U src/crypto/external/bsd/openssl/dist/INSTALL.WCE U src/crypto/external/bsd/openssl/dist/LICENSE C src/crypto/external/bsd/openssl/dist/Makefile U src/crypto/external/bsd/openssl/dist/Makefile.shared U src/crypto/external/bsd/openssl/dist/Makefile.org U src/crypto/external/bsd/openssl/dist/makevms.com C src/crypto/external/bsd/openssl/dist/NEWS U src/crypto/external/bsd/openssl/dist/README.ENGINE U src/crypto/external/bsd/openssl/dist/openssl.doxy C src/crypto/external/bsd/openssl/dist/openssl.spec U src/crypto/external/bsd/openssl/dist/PROBLEMS C src/crypto/external/bsd/openssl/dist/README U src/crypto/external/bsd/openssl/dist/README.ASN1 U src/crypto/external/bsd/openssl/dist/apps/app_rand.c U src/crypto/external/bsd/openssl/dist/apps/apps.c U src/crypto/external/bsd/openssl/dist/apps/apps.h U src/crypto/external/bsd/openssl/dist/apps/asn1pars.c U src/crypto/external/bsd/openssl/dist/apps/ca.c U src/crypto/external/bsd/openssl/dist/apps/ca-cert.srl U src/crypto/external/bsd/openssl/dist/apps/CA.com U src/crypto/external/bsd/openssl/dist/apps/ca-key.pem U src/crypto/external/bsd/openssl/dist/apps/CA.pl U src/crypto/external/bsd/openssl/dist/apps/CA.pl.in U src/crypto/external/bsd/openssl/dist/apps/ca-req.pem U src/crypto/external/bsd/openssl/dist/apps/CA.sh U src/crypto/external/bsd/openssl/dist/apps/cert.pem U src/crypto/external/bsd/openssl/dist/apps/ciphers.c U src/crypto/external/bsd/openssl/dist/apps/client.pem U src/crypto/external/bsd/openssl/dist/apps/cms.c U src/crypto/external/bsd/openssl/dist/apps/crl2p7.c U src/crypto/external/bsd/openssl/dist/apps/crl.c U src/crypto/external/bsd/openssl/dist/apps/dh1024.pem U src/crypto/external/bsd/openssl/dist/apps/dgst.c U src/crypto/external/bsd/openssl/dist/apps/install-apps.com U src/crypto/external/bsd/openssl/dist/apps/dh2048.pem U src/crypto/external/bsd/openssl/dist/apps/dh4096.pem U src/crypto/external/bsd/openssl/dist/apps/dh512.pem U src/crypto/external/bsd/openssl/dist/apps/dh.c U src/crypto/external/bsd/openssl/dist/apps/dhparam.c U src/crypto/external/bsd/openssl/dist/apps/dsa1024.pem U src/crypto/external/bsd/openssl/dist/apps/dsa512.pem U src/crypto/external/bsd/openssl/dist/apps/dsa.c U src/crypto/external/bsd/openssl/dist/apps/dsa-ca.pem U src/crypto/external/bsd/openssl/dist/apps/dsaparam.c U src/crypto/external/bsd/openssl/dist/apps/dsa-pca.pem U src/crypto/external/bsd/openssl/dist/apps/dsap.pem U src/crypto/external/bsd/openssl/dist/apps/ec.c U src/crypto/external/bsd/openssl/dist/apps/ecparam.c U src/crypto/external/bsd/openssl/dist/apps/enc.c U src/crypto/external/bsd/openssl/dist/apps/engine.c U src/crypto/external/bsd/openssl/dist/apps/errstr.c U src/crypto/external/bsd/openssl/dist/apps/gendh.c U src/crypto/external/bsd/openssl/dist/apps/gendsa.c U src/crypto/external/bsd/openssl/dist/apps/genpkey.c U src/crypto/external/bsd/openssl/dist/apps/genrsa.c U src/crypto/external/bsd/openssl/dist/apps/makeapps.com U src/crypto/external/bsd/openssl/dist/apps/Makefile U src/crypto/external/bsd/openssl/dist/apps/openssl.c U src/crypto/external/bsd/openssl/dist/apps/nseq.c U src/crypto/external/bsd/openssl/dist/apps/ocsp.c U src/crypto/external/bsd/openssl/dist/apps/oid.cnf U src/crypto/external/bsd/openssl/dist/apps/openssl-vms.cnf U src/crypto/external/bsd/openssl/dist/apps/s_apps.h U src/crypto/external/bsd/openssl/dist/apps/openssl.cnf U src/crypto/external/bsd/openssl/dist/apps/pca-cert.srl U src/crypto/external/bsd/openssl/dist/apps/passwd.c U src/crypto/external/bsd/openssl/dist/apps/smime.c U src/crypto/external/bsd/openssl/dist/apps/pca-key.pem U src/crypto/external/bsd/openssl/dist/apps/pca-req.pem U
CVS commit: src/doc
Module Name:src Committed By: christos Date: Tue Jun 16 20:01:20 UTC 2015 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new openssl again To generate a diff of this commit: cvs rdiff -u -r1.1227 -r1.1228 src/doc/3RDPARTY cvs rdiff -u -r1.2077 -r1.2078 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.1227 src/doc/3RDPARTY:1.1228 --- src/doc/3RDPARTY:1.1227 Fri Jun 12 13:02:30 2015 +++ src/doc/3RDPARTY Tue Jun 16 16:01:20 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1227 2015/06/12 17:02:30 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1228 2015/06/16 20:01:20 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1037,8 +1037,8 @@ markus is very cooperative about it): - make compile with gcc-4.5; const fixes, fileno() checks, shadow fixes. Package: OpenSSL -Version: 1.0.1n -Current Vers: 1.0.2a +Version: 1.0.1o +Current Vers: 1.0.2c Maintainer: The OpenSSL Project Archive Site: ftp://ftp.openssl.org/source/ Home Page: http://www.openssl.org/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2077 src/doc/CHANGES:1.2078 --- src/doc/CHANGES:1.2077 Fri Jun 12 13:02:30 2015 +++ src/doc/CHANGES Tue Jun 16 16:01:20 2015 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2077 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2078 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -161,3 +161,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: RFC 5227. [roy 20150502] dhcpcd(8): Import dhcpcd-6.9.0. [roy 20150517] openssl: Import openssl 1.0.1n [christos 20150612] + openssl: Import openssl 1.0.1o [christos 20150616]
CVS commit: src/crypto/external/bsd/openssl/dist
Module Name:src
Committed By: christos
Date: Tue Jun 16 20:00:13 UTC 2015
Modified Files:
src/crypto/external/bsd/openssl/dist: CHANGES Makefile NEWS README
openssl.spec
src/crypto/external/bsd/openssl/dist/crypto: opensslv.h
src/crypto/external/bsd/openssl/dist/crypto/hmac: hmac.c hmactest.c
src/crypto/external/bsd/openssl/dist/ssl: t1_lib.c
Log Message:
Use the official version of openssl's restore binary compatibility fix.
Also merge new change to ssl checking.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssl/dist/CHANGES \
src/crypto/external/bsd/openssl/dist/NEWS \
src/crypto/external/bsd/openssl/dist/README \
src/crypto/external/bsd/openssl/dist/openssl.spec
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssl/dist/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/openssl/dist/crypto/opensslv.h
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/dist/crypto/hmac/hmac.c
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/dist/crypto/hmac/hmactest.c
cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssl/dist/ssl/t1_lib.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/openssl/dist/CHANGES
diff -u src/crypto/external/bsd/openssl/dist/CHANGES:1.5 src/crypto/external/bsd/openssl/dist/CHANGES:1.6
--- src/crypto/external/bsd/openssl/dist/CHANGES:1.5 Fri Jun 12 13:01:11 2015
+++ src/crypto/external/bsd/openssl/dist/CHANGES Tue Jun 16 16:00:13 2015
@@ -2,6 +2,12 @@
OpenSSL CHANGES
___
+ Changes between 1.0.1n and 1.0.1o [12 Jun 2015]
+
+ *) Fix HMAC ABI incompatibility. The previous version introduced an ABI
+ incompatibility in the handling of HMAC. The previous ABI has now been
+ restored.
+
Changes between 1.0.1m and 1.0.1n [11 Jun 2015]
*) Malformed ECParameters causes infinite loop
Index: src/crypto/external/bsd/openssl/dist/NEWS
diff -u src/crypto/external/bsd/openssl/dist/NEWS:1.5 src/crypto/external/bsd/openssl/dist/NEWS:1.6
--- src/crypto/external/bsd/openssl/dist/NEWS:1.5 Fri Jun 12 13:01:11 2015
+++ src/crypto/external/bsd/openssl/dist/NEWS Tue Jun 16 16:00:13 2015
@@ -5,6 +5,10 @@
This file gives a brief overview of the major changes between each OpenSSL
release. For more details please read the CHANGES file.
+ Major changes between OpenSSL 1.0.1n and OpenSSL 1.0.1o [12 Jun 2015]
+
+ o Fix HMAC ABI incompatibility
+
Major changes between OpenSSL 1.0.1m and OpenSSL 1.0.1n [11 Jun 2015]
o Malformed ECParameters causes infinite loop (CVE-2015-1788)
Index: src/crypto/external/bsd/openssl/dist/README
diff -u src/crypto/external/bsd/openssl/dist/README:1.5 src/crypto/external/bsd/openssl/dist/README:1.6
--- src/crypto/external/bsd/openssl/dist/README:1.5 Fri Jun 12 13:01:11 2015
+++ src/crypto/external/bsd/openssl/dist/README Tue Jun 16 16:00:13 2015
@@ -1,5 +1,5 @@
- OpenSSL 1.0.1n 11 Jun 2015
+ OpenSSL 1.0.1o 12 Jun 2015
Copyright (c) 1998-2011 The OpenSSL Project
Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
Index: src/crypto/external/bsd/openssl/dist/openssl.spec
diff -u src/crypto/external/bsd/openssl/dist/openssl.spec:1.5 src/crypto/external/bsd/openssl/dist/openssl.spec:1.6
--- src/crypto/external/bsd/openssl/dist/openssl.spec:1.5 Fri Jun 12 13:01:11 2015
+++ src/crypto/external/bsd/openssl/dist/openssl.spec Tue Jun 16 16:00:13 2015
@@ -7,7 +7,7 @@ Release: 1
Summary: Secure Sockets Layer and cryptography libraries and tools
Name: openssl
#Version: %{libmaj}.%{libmin}.%{librel}
-Version: 1.0.1n
+Version: 1.0.1o
Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
License: OpenSSL
Group: System Environment/Libraries
Index: src/crypto/external/bsd/openssl/dist/Makefile
diff -u src/crypto/external/bsd/openssl/dist/Makefile:1.6 src/crypto/external/bsd/openssl/dist/Makefile:1.7
--- src/crypto/external/bsd/openssl/dist/Makefile:1.6 Fri Jun 12 13:01:11 2015
+++ src/crypto/external/bsd/openssl/dist/Makefile Tue Jun 16 16:00:13 2015
@@ -4,7 +4,7 @@
## Makefile for OpenSSL
##
-VERSION=1.0.1n
+VERSION=1.0.1o
MAJOR=1
MINOR=0.1
SHLIB_VERSION_NUMBER=1.0.0
Index: src/crypto/external/bsd/openssl/dist/crypto/opensslv.h
diff -u src/crypto/external/bsd/openssl/dist/crypto/opensslv.h:1.14 src/crypto/external/bsd/openssl/dist/crypto/opensslv.h:1.15
--- src/crypto/external/bsd/openssl/dist/crypto/opensslv.h:1.14 Fri Jun 12 13:01:11 2015
+++ src/crypto/external/bsd/openssl/dist/crypto/opensslv.h Tue Jun 16 16:00:13 2015
@@ -30,11 +30,11 @@ extern C {
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
* major minor fix final patch/beta)
*/
-# define OPENSSL_VERSION_NUMBER 0x100010efL
+# define OPENSSL_VERSION_NUMBER 0x100010ffL
# ifdef OPENSSL_FIPS
-# define OPENSSL_VERSION_TEXTOpenSSL 1.0.1n-fips 11 Jun 2015
+#
CVS commit: src/bin
Module Name:src
Committed By: christos
Date: Tue Jun 16 22:31:08 UTC 2015
Modified Files:
src/bin/pax: tar.c
src/bin/ps: ps.c
Log Message:
remove \n from error messages
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/bin/pax/tar.c
cvs rdiff -u -r1.82 -r1.83 src/bin/ps/ps.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/pax/tar.c
diff -u src/bin/pax/tar.c:1.71 src/bin/pax/tar.c:1.72
--- src/bin/pax/tar.c:1.71 Thu Jan 24 12:43:44 2013
+++ src/bin/pax/tar.c Tue Jun 16 18:31:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tar.c,v 1.71 2013/01/24 17:43:44 christos Exp $ */
+/* $NetBSD: tar.c,v 1.72 2015/06/16 22:31:08 christos Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = @(#)tar.c 8.2 (Berkeley) 4/18/94;
#else
-__RCSID($NetBSD: tar.c,v 1.71 2013/01/24 17:43:44 christos Exp $);
+__RCSID($NetBSD: tar.c,v 1.72 2015/06/16 22:31:08 christos Exp $);
#endif
#endif /* not lint */
@@ -1009,7 +1009,7 @@ longlink(ARCHD *arcn, int type)
gnu_hack_len = arcn-nlen + 1;
break;
default:
- errx(1, Invalid type in GNU longlink %d\n, type);
+ errx(1, Invalid type in GNU longlink %d, type);
}
/*
Index: src/bin/ps/ps.c
diff -u src/bin/ps/ps.c:1.82 src/bin/ps/ps.c:1.83
--- src/bin/ps/ps.c:1.82 Sat Jun 28 13:32:27 2014
+++ src/bin/ps/ps.c Tue Jun 16 18:31:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ps.c,v 1.82 2014/06/28 17:32:27 dholland Exp $ */
+/* $NetBSD: ps.c,v 1.83 2015/06/16 22:31:08 christos Exp $ */
/*
* Copyright (c) 2000-2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@ __COPYRIGHT(@(#) Copyright (c) 1990, 19
#if 0
static char sccsid[] = @(#)ps.c 8.4 (Berkeley) 4/2/94;
#else
-__RCSID($NetBSD: ps.c,v 1.82 2014/06/28 17:32:27 dholland Exp $);
+__RCSID($NetBSD: ps.c,v 1.83 2015/06/16 22:31:08 christos Exp $);
#endif
#endif /* not lint */
@@ -398,7 +398,7 @@ main(int argc, char *argv[])
parsesort(tdev,pid);
SIMPLEQ_FOREACH(vent, sortlist, next) {
if (vent-var-flag LWP || vent-var-type == UNSPECIFIED)
- warnx(Cannot sort on %s, sort key ignored\n,
+ warnx(Cannot sort on %s, sort key ignored,
vent-var-name);
}
@@ -558,7 +558,7 @@ pick_representative_lwp(struct kinfo_pro
break;
}
/* Error condition! */
- warnx(Inconsistent LWP state for process %d\n, ki-p_pid);
+ warnx(Inconsistent LWP state for process %d, ki-p_pid);
return kl;
}
CVS commit: src/sbin
Module Name:src
Committed By: christos
Date: Tue Jun 16 23:18:55 UTC 2015
Modified Files:
src/sbin/cgdconfig: params.c
src/sbin/dmctl: dmctl.c
src/sbin/fdisk: fdisk.c
src/sbin/fsck_ffs: main.c
src/sbin/fsck_lfs: inode.c main.c pass2.c pass4.c segwrite.c
utilities.c
src/sbin/fsck_msdos: main.c
src/sbin/gpt: restore.c
src/sbin/init: init.c
src/sbin/newfs: mkfs.c
src/sbin/newfs_ext2fs: mke2fs.c
src/sbin/newfs_udf: udf_create.c
src/sbin/newfs_v7fs: newfs_v7fs.c
src/sbin/veriexecctl: veriexecctl.c
Log Message:
fix error messages containing \n
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sbin/cgdconfig/params.c
cvs rdiff -u -r1.4 -r1.5 src/sbin/dmctl/dmctl.c
cvs rdiff -u -r1.150 -r1.151 src/sbin/fdisk/fdisk.c
cvs rdiff -u -r1.81 -r1.82 src/sbin/fsck_ffs/main.c
cvs rdiff -u -r1.53 -r1.54 src/sbin/fsck_lfs/inode.c
cvs rdiff -u -r1.48 -r1.49 src/sbin/fsck_lfs/main.c
cvs rdiff -u -r1.23 -r1.24 src/sbin/fsck_lfs/pass2.c
cvs rdiff -u -r1.22 -r1.23 src/sbin/fsck_lfs/pass4.c
cvs rdiff -u -r1.29 -r1.30 src/sbin/fsck_lfs/segwrite.c
cvs rdiff -u -r1.35 -r1.36 src/sbin/fsck_lfs/utilities.c
cvs rdiff -u -r1.23 -r1.24 src/sbin/fsck_msdos/main.c
cvs rdiff -u -r1.7 -r1.8 src/sbin/gpt/restore.c
cvs rdiff -u -r1.105 -r1.106 src/sbin/init/init.c
cvs rdiff -u -r1.124 -r1.125 src/sbin/newfs/mkfs.c
cvs rdiff -u -r1.21 -r1.22 src/sbin/newfs_ext2fs/mke2fs.c
cvs rdiff -u -r1.24 -r1.25 src/sbin/newfs_udf/udf_create.c
cvs rdiff -u -r1.3 -r1.4 src/sbin/newfs_v7fs/newfs_v7fs.c
cvs rdiff -u -r1.38 -r1.39 src/sbin/veriexecctl/veriexecctl.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/cgdconfig/params.c
diff -u src/sbin/cgdconfig/params.c:1.25 src/sbin/cgdconfig/params.c:1.26
--- src/sbin/cgdconfig/params.c:1.25 Sun Dec 14 07:31:39 2014
+++ src/sbin/cgdconfig/params.c Tue Jun 16 19:18:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: params.c,v 1.25 2014/12/14 12:31:39 mlelstv Exp $ */
+/* $NetBSD: params.c,v 1.26 2015/06/16 23:18:54 christos Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: params.c,v 1.25 2014/12/14 12:31:39 mlelstv Exp $);
+__RCSID($NetBSD: params.c,v 1.26 2015/06/16 23:18:54 christos Exp $);
#endif
#include sys/types.h
@@ -277,7 +277,7 @@ params_verify_method(string_t *in)
if (p-verify_method == VERIFY_UNKNOWN)
warnx(params_setverify_method: unrecognized
- verify method \%s\\n, vm);
+ verify method \%s\, vm);
return p;
}
@@ -515,7 +515,7 @@ keygen_method(string_t *in)
string_free(in);
if (kg-kg_method == KEYGEN_UNKNOWN)
- warnx(unrecognized key generation method \%s\\n, kgm);
+ warnx(unrecognized key generation method \%s\, kgm);
return kg;
}
Index: src/sbin/dmctl/dmctl.c
diff -u src/sbin/dmctl/dmctl.c:1.4 src/sbin/dmctl/dmctl.c:1.5
--- src/sbin/dmctl/dmctl.c:1.4 Fri Oct 18 21:09:58 2013
+++ src/sbin/dmctl/dmctl.c Tue Jun 16 19:18:54 2015
@@ -291,7 +291,7 @@ dmctl_get_device_info(int argc __unused,
libdm_task_set_name(dvname, task);
if (libdm_task_run(task) != 0)
- err(EXIT_FAILURE, dmctl_get_device_info: libdm_task_run failed.\n);
+ err(EXIT_FAILURE, %s: libdm_task_run failed, __func__);
printf(Printing Device info for:\n);
printf(Device name: \t\t%s\n, libdm_task_get_name(task));
@@ -559,7 +559,7 @@ parse_stdin(char *file_path)
if (file_path) {
if ((fp = fopen(file_path, r)) == NULL)
- err(ENOENT, Cannot open table file\n);
+ err(ENOENT, Cannot open table file);
} else
fp = stdin;
Index: src/sbin/fdisk/fdisk.c
diff -u src/sbin/fdisk/fdisk.c:1.150 src/sbin/fdisk/fdisk.c:1.151
--- src/sbin/fdisk/fdisk.c:1.150 Fri Apr 4 12:15:30 2014
+++ src/sbin/fdisk/fdisk.c Tue Jun 16 19:18:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fdisk.c,v 1.150 2014/04/04 16:15:30 christos Exp $ */
+/* $NetBSD: fdisk.c,v 1.151 2015/06/16 23:18:54 christos Exp $ */
/*
* Mach Operating System
@@ -39,7 +39,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: fdisk.c,v 1.150 2014/04/04 16:15:30 christos Exp $);
+__RCSID($NetBSD: fdisk.c,v 1.151 2015/06/16 23:18:54 christos Exp $);
#endif /* not lint */
#define MBRPTYPENAMES
@@ -2246,7 +2246,7 @@ change_part(int extended, int part, int
errtext = check_overlap(part, sysid, start, size, 0);
if (errtext != NULL !I_flag) {
if (f_flag)
- errx(2, %s\n, errtext);
+ errx(2, %s, errtext);
printf(%s\n, errtext);
return 0;
}
@@ -2264,7 +2264,7 @@ change_part(int extended, int part, int
else
errtext = check_overlap(part, sysid, start, size, 1);
if (errtext)
- errx(1, %s\n, errtext);
+ errx(1, %s, errtext);
}
Index: src/sbin/fsck_ffs/main.c
diff -u src/sbin/fsck_ffs/main.c:1.81 src/sbin/fsck_ffs/main.c:1.82
--- src/sbin/fsck_ffs/main.c:1.81 Tue Jan 22
CVS commit: src/usr.bin
Module Name:src
Committed By: christos
Date: Tue Jun 16 22:54:11 UTC 2015
Modified Files:
src/usr.bin/cal: cal.c
src/usr.bin/cksum: cksum.c
src/usr.bin/fsplit: fsplit.c
src/usr.bin/kdump: kdump.c
src/usr.bin/mkcsmapper: yacc.y
src/usr.bin/mkdep: mkdep.c
src/usr.bin/mkesdb: yacc.y
src/usr.bin/mklocale: mklocaledb.c
src/usr.bin/netstat: vtw.c
src/usr.bin/printf: printf.c
src/usr.bin/rump_dhcpclient: main.c
src/usr.bin/sdpquery: command.c
src/usr.bin/su: su.c
src/usr.bin/talk: get_addrs.c
src/usr.bin/tip: remote.c tip.c
src/usr.bin/utoppya: utoppya.c
Log Message:
fix some error handling.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/cal/cal.c
cvs rdiff -u -r1.47 -r1.48 src/usr.bin/cksum/cksum.c
cvs rdiff -u -r1.29 -r1.30 src/usr.bin/fsplit/fsplit.c
cvs rdiff -u -r1.118 -r1.119 src/usr.bin/kdump/kdump.c
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/mkcsmapper/yacc.y
cvs rdiff -u -r1.43 -r1.44 src/usr.bin/mkdep/mkdep.c
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/mkesdb/yacc.y
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/mklocale/mklocaledb.c
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/netstat/vtw.c
cvs rdiff -u -r1.36 -r1.37 src/usr.bin/printf/printf.c
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/rump_dhcpclient/main.c
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/sdpquery/command.c
cvs rdiff -u -r1.71 -r1.72 src/usr.bin/su/su.c
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/talk/get_addrs.c
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/tip/remote.c
cvs rdiff -u -r1.56 -r1.57 src/usr.bin/tip/tip.c
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/utoppya/utoppya.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/cal/cal.c
diff -u src/usr.bin/cal/cal.c:1.28 src/usr.bin/cal/cal.c:1.29
--- src/usr.bin/cal/cal.c:1.28 Wed Jan 7 22:56:33 2015
+++ src/usr.bin/cal/cal.c Tue Jun 16 18:54:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cal.c,v 1.28 2015/01/08 03:56:33 christos Exp $ */
+/* $NetBSD: cal.c,v 1.29 2015/06/16 22:54:10 christos Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -42,7 +42,7 @@ __COPYRIGHT(@(#) Copyright (c) 1989, 19
#if 0
static char sccsid[] = @(#)cal.c 8.4 (Berkeley) 4/2/94;
#else
-__RCSID($NetBSD: cal.c,v 1.28 2015/01/08 03:56:33 christos Exp $);
+__RCSID($NetBSD: cal.c,v 1.29 2015/06/16 22:54:10 christos Exp $);
#endif
#endif /* not lint */
@@ -377,7 +377,7 @@ monthrange(int month, int year, int befo
endmonth = (month + after) % 12;
if (startyear 0 || endyear ) {
- errx(1, year should be in 1-\n);
+ errx(1, year should be in 1-);
}
year = startyear;
Index: src/usr.bin/cksum/cksum.c
diff -u src/usr.bin/cksum/cksum.c:1.47 src/usr.bin/cksum/cksum.c:1.48
--- src/usr.bin/cksum/cksum.c:1.47 Sun Aug 31 03:05:33 2014
+++ src/usr.bin/cksum/cksum.c Tue Jun 16 18:54:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cksum.c,v 1.47 2014/08/31 07:05:33 christos Exp $ */
+/* $NetBSD: cksum.c,v 1.48 2015/06/16 22:54:10 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -81,7 +81,7 @@ __COPYRIGHT(@(#) Copyright (c) 1991, 19
#if 0
static char sccsid[] = @(#)cksum.c 8.2 (Berkeley) 4/28/95;
#endif
-__RCSID($NetBSD: cksum.c,v 1.47 2014/08/31 07:05:33 christos Exp $);
+__RCSID($NetBSD: cksum.c,v 1.48 2015/06/16 22:54:10 christos Exp $);
#endif /* not lint */
#include sys/types.h
@@ -194,7 +194,7 @@ main(int argc, char **argv)
switch(ch) {
case 'a':
if (hash) {
-warnx(illegal use of -a option\n);
+warnx(illegal use of -a option);
usage();
}
i = 0;
@@ -305,7 +305,7 @@ main(int argc, char **argv)
argc0?argv[0]:stdin);
while(fgets(buf, sizeof(buf), f) != NULL) {
- s=strrchr(buf, '\n');
+ s = strrchr(buf, '\n');
if (s)
*s = '\0';
Index: src/usr.bin/fsplit/fsplit.c
diff -u src/usr.bin/fsplit/fsplit.c:1.29 src/usr.bin/fsplit/fsplit.c:1.30
--- src/usr.bin/fsplit/fsplit.c:1.29 Wed Jan 23 15:39:46 2013
+++ src/usr.bin/fsplit/fsplit.c Tue Jun 16 18:54:10 2015
@@ -40,7 +40,7 @@ __COPYRIGHT(@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = from: @(#)fsplit.c 8.1 (Berkeley) 6/6/93;
#else
-__RCSID($NetBSD: fsplit.c,v 1.29 2013/01/23 20:39:46 riastradh Exp $);
+__RCSID($NetBSD: fsplit.c,v 1.30 2015/06/16 22:54:10 christos Exp $);
#endif
#endif /* not lint */
@@ -264,7 +264,7 @@ get_name(char *name, int letters)
*ptr = '0';
}
if (ptr name + letters) {
- errx(1, Ran out of file names.\n);
+ errx(1, Ran out of file names.);
}
}
}
Index: src/usr.bin/kdump/kdump.c
diff -u src/usr.bin/kdump/kdump.c:1.118 src/usr.bin/kdump/kdump.c:1.119
--- src/usr.bin/kdump/kdump.c:1.118 Wed Apr 30 07:51:51 2014
+++ src/usr.bin/kdump/kdump.c Tue Jun 16 18:54:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kdump.c,v 1.118 2014/04/30 11:51:51 njoly Exp $ */
+/* $NetBSD: kdump.c,v 1.119 2015/06/16 22:54:10 christos Exp $ */
/*-
*
CVS commit: src/usr.sbin
Module Name:src
Committed By: christos
Date: Tue Jun 16 23:04:14 UTC 2015
Modified Files:
src/usr.sbin/acpitools/acpidump: acpi.c
src/usr.sbin/altq/altqstat: quip_client.c
src/usr.sbin/btattach: btattach.c init_bcm2035.c init_digi.c
init_ericsson.c init_st.c init_swave.c init_unistone.c
src/usr.sbin/crash: Makefile crash.c
src/usr.sbin/makefs: cd9660.c udf.c
src/usr.sbin/ndiscvt: ndiscvt.c
src/usr.sbin/ndp: ndp.c
src/usr.sbin/npf/npftest: npftest.c
src/usr.sbin/pf/pfs: pfs.c
src/usr.sbin/quotacheck: quotacheck.c
src/usr.sbin/repquota: repquota.c
src/usr.sbin/timed/timed: timed.c
Log Message:
improve error messages (remove \n, use __func__, etc)
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/acpitools/acpidump/acpi.c
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/altq/altqstat/quip_client.c
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/btattach/btattach.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/btattach/init_bcm2035.c \
src/usr.sbin/btattach/init_digi.c src/usr.sbin/btattach/init_ericsson.c \
src/usr.sbin/btattach/init_st.c
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/btattach/init_swave.c
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/btattach/init_unistone.c
cvs rdiff -u -r1.29 -r1.30 src/usr.sbin/crash/Makefile
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/crash/crash.c
cvs rdiff -u -r1.47 -r1.48 src/usr.sbin/makefs/cd9660.c
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/makefs/udf.c
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/ndiscvt/ndiscvt.c
cvs rdiff -u -r1.43 -r1.44 src/usr.sbin/ndp/ndp.c
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/npf/npftest/npftest.c
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/pf/pfs/pfs.c
cvs rdiff -u -r1.48 -r1.49 src/usr.sbin/quotacheck/quotacheck.c
cvs rdiff -u -r1.44 -r1.45 src/usr.sbin/repquota/repquota.c
cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/timed/timed/timed.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.sbin/acpitools/acpidump/acpi.c
diff -u src/usr.sbin/acpitools/acpidump/acpi.c:1.9 src/usr.sbin/acpitools/acpidump/acpi.c:1.10
--- src/usr.sbin/acpitools/acpidump/acpi.c:1.9 Thu Mar 20 10:39:43 2014
+++ src/usr.sbin/acpitools/acpidump/acpi.c Tue Jun 16 19:04:13 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.9 2014/03/20 14:39:43 riastradh Exp $ */
+/* $NetBSD: acpi.c,v 1.10 2015/06/16 23:04:13 christos Exp $ */
/*-
* Copyright (c) 1998 Doug Rabson
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: acpi.c,v 1.9 2014/03/20 14:39:43 riastradh Exp $);
+__RCSID($NetBSD: acpi.c,v 1.10 2015/06/16 23:04:13 christos Exp $);
#include sys/param.h
#include sys/endian.h
@@ -2480,6 +2480,6 @@ dsdt_from_fadt(ACPI_TABLE_FADT *fadt)
else
sdt = (ACPI_TABLE_HEADER *)acpi_map_sdt(fadt-XDsdt);
if (acpi_checksum(sdt, sdt-Length))
- errx(EXIT_FAILURE, DSDT is corrupt\n);
+ errx(EXIT_FAILURE, DSDT is corrupt);
return (sdt);
}
Index: src/usr.sbin/altq/altqstat/quip_client.c
diff -u src/usr.sbin/altq/altqstat/quip_client.c:1.10 src/usr.sbin/altq/altqstat/quip_client.c:1.11
--- src/usr.sbin/altq/altqstat/quip_client.c:1.10 Sat Oct 19 13:16:37 2013
+++ src/usr.sbin/altq/altqstat/quip_client.c Tue Jun 16 19:04:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: quip_client.c,v 1.10 2013/10/19 17:16:37 christos Exp $ */
+/* $NetBSD: quip_client.c,v 1.11 2015/06/16 23:04:14 christos Exp $ */
/* $KAME: quip_client.c,v 1.9 2003/05/17 05:59:00 itojun Exp $ */
/*
* Copyright (C) 1999-2000
@@ -122,8 +122,7 @@ quip_openserver(void)
strlcpy(addr.sun_path, QUIP_PATH,sizeof(addr.sun_path));
if (connect(fd, (struct sockaddr *)addr, sizeof(addr)) 0) {
- fprintf(stderr, can't talk to altqd!\n
- probably, altqd is not running\n);
+ warnx(can't talk to altqd;probably, altqd is not running);
return (-1);
}
Index: src/usr.sbin/btattach/btattach.c
diff -u src/usr.sbin/btattach/btattach.c:1.12 src/usr.sbin/btattach/btattach.c:1.13
--- src/usr.sbin/btattach/btattach.c:1.12 Sat Aug 27 18:17:53 2011
+++ src/usr.sbin/btattach/btattach.c Tue Jun 16 19:04:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: btattach.c,v 1.12 2011/08/27 22:17:53 joerg Exp $ */
+/* $NetBSD: btattach.c,v 1.13 2015/06/16 23:04:14 christos Exp $ */
/*-
* Copyright (c) 2008 Iain Hibbert
@@ -27,7 +27,7 @@
#include sys/cdefs.h
__COPYRIGHT(@(#) Copyright (c) 2008 Iain Hibbert. All rights reserved.);
-__RCSID($NetBSD: btattach.c,v 1.12 2011/08/27 22:17:53 joerg Exp $);
+__RCSID($NetBSD: btattach.c,v 1.13 2015/06/16 23:04:14 christos Exp $);
#include sys/ioctl.h
#include sys/param.h
@@ -440,7 +440,7 @@ uart_recv_pkt(int fd, struct iovec *iov,
break;
default: /* out of sync? */
- errx(EXIT_FAILURE, unknown packet type 0x%2.2x\n, type);
+ errx(EXIT_FAILURE, unknown packet type 0x%2.2x, type);
}
while (want-- 0)
Index: src/usr.sbin/btattach/init_bcm2035.c
diff -u
CVS commit: src/usr.sbin/makefs
Module Name:src
Committed By: christos
Date: Wed Jun 17 01:05:41 UTC 2015
Modified Files:
src/usr.sbin/makefs: cd9660.c
Log Message:
more error normalization
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/usr.sbin/makefs/cd9660.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.sbin/makefs/cd9660.c
diff -u src/usr.sbin/makefs/cd9660.c:1.48 src/usr.sbin/makefs/cd9660.c:1.49
--- src/usr.sbin/makefs/cd9660.c:1.48 Tue Jun 16 19:04:14 2015
+++ src/usr.sbin/makefs/cd9660.c Tue Jun 16 21:05:41 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660.c,v 1.48 2015/06/16 23:04:14 christos Exp $ */
+/* $NetBSD: cd9660.c,v 1.49 2015/06/17 01:05:41 christos Exp $ */
/*
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -103,7 +103,7 @@
#include sys/cdefs.h
#if defined(__RCSID) !defined(__lint)
-__RCSID($NetBSD: cd9660.c,v 1.48 2015/06/16 23:04:14 christos Exp $);
+__RCSID($NetBSD: cd9660.c,v 1.49 2015/06/17 01:05:41 christos Exp $);
#endif /* !__lint */
#include string.h
@@ -499,7 +499,7 @@ cd9660_makefs(const char *image, const c
diskStructure-isoLevel);
if (diskStructure-isoLevel 2
diskStructure-allow_multidot)
- errx(1, allow-multidot requires iso level of 2);
+ errx(EXIT_FAILURE, allow-multidot requires iso level of 2);
assert(image != NULL);
assert(dir != NULL);
@@ -540,10 +540,10 @@ cd9660_makefs(const char *image, const c
numDirectories, error);
if (TAILQ_EMPTY(real_root-cn_children)) {
- errx(1, %s: converted directory is empty. , __func__,
- Tree conversion failed);
+ errx(EXIT_FAILURE, %s: converted directory is empty.
+ Tree conversion failed, __func__);
} else if (error != 0) {
- errx(1, cd9660_makefs: tree conversion failed);
+ errx(EXIT_FAILURE, %s: tree conversion failed, __func__);
} else {
if (diskStructure-verbose_level 0)
printf(%s: tree converted\n, __func__);
@@ -579,7 +579,7 @@ cd9660_makefs(const char *image, const c
firstAvailableSector = cd9660_setup_boot(diskStructure,
firstAvailableSector);
if (firstAvailableSector 0)
- errx(1, setup_boot failed);
+ errx(EXIT_FAILURE, setup_boot failed);
}
/* LE first, then BE */
diskStructure-primaryLittleEndianTableSector = firstAvailableSector;
@@ -1603,7 +1603,7 @@ cd9660_compute_full_filename(cd9660node
len = snprintf(buf, len, %s/%s/%s, node-node-root,
node-node-path, node-node-name);
if (len CD9660MAXPATH)
- errx(1, Pathname too long.);
+ errx(EXIT_FAILURE, Pathname too long.);
}
/* NEW filename conversion method */
CVS commit: src/usr.bin/tip
Module Name:src
Committed By: christos
Date: Wed Jun 17 01:38:02 UTC 2015
Modified Files:
src/usr.bin/tip: tip.c
Log Message:
add missing quote, remove some braces.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/usr.bin/tip/tip.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/tip/tip.c
diff -u src/usr.bin/tip/tip.c:1.57 src/usr.bin/tip/tip.c:1.58
--- src/usr.bin/tip/tip.c:1.57 Tue Jun 16 18:54:11 2015
+++ src/usr.bin/tip/tip.c Tue Jun 16 21:38:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tip.c,v 1.57 2015/06/16 22:54:11 christos Exp $ */
+/* $NetBSD: tip.c,v 1.58 2015/06/17 01:38:02 christos Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT(@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = @(#)tip.c 8.1 (Berkeley) 6/6/93;
#endif
-__RCSID($NetBSD: tip.c,v 1.57 2015/06/16 22:54:11 christos Exp $);
+__RCSID($NetBSD: tip.c,v 1.58 2015/06/17 01:38:02 christos Exp $);
#endif /* not lint */
/*
@@ -87,12 +87,11 @@ main(int argc, char *argv[])
goto cucommon;
}
- if (argc 4) {
+ if (argc 4)
tipusage();
- }
- if (!isatty(0)) {
- errx(EXIT_FAILURE, must be interactive);
- }
+
+ if (!isatty(0))
+ errx(EXIT_FAILURE, must be interactive);
cmdlineBR = 0;
while((c = getopt(argc, argv, v0123456789)) != -1) {
CVS commit: src/sys/dev/filemon
Module Name:src
Committed By: sjg
Date: Wed Jun 17 02:17:00 UTC 2015
Modified Files:
src/sys/dev/filemon: filemon.h
Log Message:
Bump version due to openat
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/filemon/filemon.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/filemon/filemon.h
diff -u src/sys/dev/filemon/filemon.h:1.5 src/sys/dev/filemon/filemon.h:1.6
--- src/sys/dev/filemon/filemon.h:1.5 Thu Mar 27 18:27:34 2014
+++ src/sys/dev/filemon/filemon.h Wed Jun 17 02:17:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: filemon.h,v 1.5 2014/03/27 18:27:34 christos Exp $ */
+/* $NetBSD: filemon.h,v 1.6 2015/06/17 02:17:00 sjg Exp $ */
/*
* Copyright (c) 2010, Juniper Networks, Inc.
*
@@ -31,7 +31,7 @@
#define FILEMON_SET_FD _IOWR('S', 1, int)
#define FILEMON_SET_PID _IOWR('S', 2, pid_t)
-#define FILEMON_VERSION 4
+#define FILEMON_VERSION 5
#ifdef _KERNEL
struct filemon {
CVS commit: src/usr.bin/mkesdb
Module Name:src
Committed By: christos
Date: Tue Jun 16 23:44:44 UTC 2015
Modified Files:
src/usr.bin/mkesdb: yacc.y
Log Message:
fix error statement
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/mkesdb/yacc.y
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/mkesdb/yacc.y
diff -u src/usr.bin/mkesdb/yacc.y:1.8 src/usr.bin/mkesdb/yacc.y:1.9
--- src/usr.bin/mkesdb/yacc.y:1.8 Tue Jun 16 19:42:08 2015
+++ src/usr.bin/mkesdb/yacc.y Tue Jun 16 19:44:44 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: yacc.y,v 1.8 2015/06/16 23:42:08 christos Exp $ */
+/* $NetBSD: yacc.y,v 1.9 2015/06/16 23:44:44 christos Exp $ */
%{
/*-
@@ -33,7 +33,7 @@
#include sys/cdefs.h
#if !defined(lint)
-__RCSID($NetBSD: yacc.y,v 1.8 2015/06/16 23:42:08 christos Exp $);
+__RCSID($NetBSD: yacc.y,v 1.9 2015/06/16 23:44:44 christos Exp $);
#endif /* not lint */
#include assert.h
@@ -284,7 +284,7 @@ do_mkdb(FILE *in)
if (ret output)
unlink(output); /* dump failure */
if (ret)
- errc(EXIT_FAILURE, c, );
+ errc(EXIT_FAILURE, ret, NULL);
}
__dead static void
CVS commit: src/usr.bin/mail
Module Name:src Committed By: christos Date: Wed Jun 17 00:03:42 UTC 2015 Modified Files: src/usr.bin/mail: mime_attach.c Log Message: one more stray \n To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/usr.bin/mail/mime_attach.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/mail/mime_attach.c diff -u src/usr.bin/mail/mime_attach.c:1.17 src/usr.bin/mail/mime_attach.c:1.18 --- src/usr.bin/mail/mime_attach.c:1.17 Fri Oct 18 16:47:06 2013 +++ src/usr.bin/mail/mime_attach.c Tue Jun 16 20:03:42 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: mime_attach.c,v 1.17 2013/10/18 20:47:06 christos Exp $ */ +/* $NetBSD: mime_attach.c,v 1.18 2015/06/17 00:03:42 christos Exp $ */ /*- * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ #include sys/cdefs.h #ifndef __lint__ -__RCSID($NetBSD: mime_attach.c,v 1.17 2013/10/18 20:47:06 christos Exp $); +__RCSID($NetBSD: mime_attach.c,v 1.18 2015/06/17 00:03:42 christos Exp $); #endif /* not __lint__ */ #include assert.h @@ -529,7 +529,7 @@ fput_body(FILE *fi, FILE *fo, struct Con enc = mime_fio_encoder(Cp-C_encoding); if (enc == NULL) - warnx(unknown transfer encoding type: %s\n, Cp-C_encoding); + warnx(unknown transfer encoding type: %s, Cp-C_encoding); else enc(fi, fo, 0); }
CVS commit: src/usr.bin
Module Name:src
Committed By: christos
Date: Wed Jun 17 00:01:59 UTC 2015
Modified Files:
src/usr.bin/cdplay: cdplay.c
src/usr.bin/chpass: pw_yp.c
src/usr.bin/kdump: kdump.c
Log Message:
more stray \n
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/usr.bin/cdplay/cdplay.c
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/chpass/pw_yp.c
cvs rdiff -u -r1.119 -r1.120 src/usr.bin/kdump/kdump.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/cdplay/cdplay.c
diff -u src/usr.bin/cdplay/cdplay.c:1.48 src/usr.bin/cdplay/cdplay.c:1.49
--- src/usr.bin/cdplay/cdplay.c:1.48 Mon Oct 7 11:17:24 2013
+++ src/usr.bin/cdplay/cdplay.c Tue Jun 16 20:01:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cdplay.c,v 1.48 2013/10/07 15:17:24 christos Exp $ */
+/* $NetBSD: cdplay.c,v 1.49 2015/06/17 00:01:59 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Andrew Doran.
@@ -40,7 +40,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: cdplay.c,v 1.48 2013/10/07 15:17:24 christos Exp $);
+__RCSID($NetBSD: cdplay.c,v 1.49 2015/06/17 00:01:59 christos Exp $);
#endif /* not lint */
#include sys/types.h
@@ -306,7 +306,7 @@ main(int argc, char **argv)
}
} else {
cmd = CMD_QUIT;
-warnx(\r\n);
+fprintf(stderr, \r\n);
arg = NULL;
break;
}
@@ -1463,7 +1463,7 @@ readaudio(int afd, int lba, int blocks,
rc = ioctl(afd, SCIOCCOMMAND, sc);
if (rc 0 || sc.retsts != SCCMD_OK) {
if (da.read_errors 10) {
- warnx(scsi cmd failed: retsts %d status %d\n,
+ warnx(scsi cmd failed: retsts %d status %d,
sc.retsts, sc.status);
}
da.read_errors++;
Index: src/usr.bin/chpass/pw_yp.c
diff -u src/usr.bin/chpass/pw_yp.c:1.22 src/usr.bin/chpass/pw_yp.c:1.23
--- src/usr.bin/chpass/pw_yp.c:1.22 Sat Apr 11 08:10:02 2009
+++ src/usr.bin/chpass/pw_yp.c Tue Jun 16 20:01:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pw_yp.c,v 1.22 2009/04/11 12:10:02 lukem Exp $ */
+/* $NetBSD: pw_yp.c,v 1.23 2015/06/17 00:01:59 christos Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -33,7 +33,7 @@
#if 0
static char sccsid[] = @(#)pw_yp.c 1.0 2/2/93;
#else
-__RCSID($NetBSD: pw_yp.c,v 1.22 2009/04/11 12:10:02 lukem Exp $);
+__RCSID($NetBSD: pw_yp.c,v 1.23 2015/06/17 00:01:59 christos Exp $);
#endif
#endif /* not lint */
@@ -136,7 +136,7 @@ pw_yp(struct passwd *pw, uid_t ypuid)
*/
if ((rpcport = getrpcport(master, YPPASSWDPROG, YPPASSWDPROC_UPDATE,
IPPROTO_UDP)) == 0) {
- warnx(master YP server not running yppasswd daemon.\n\t%s\n,
+ warnx(master YP server not running yppasswd daemon.\n\t%s,
Can't change password.);
return (1);
}
Index: src/usr.bin/kdump/kdump.c
diff -u src/usr.bin/kdump/kdump.c:1.119 src/usr.bin/kdump/kdump.c:1.120
--- src/usr.bin/kdump/kdump.c:1.119 Tue Jun 16 18:54:10 2015
+++ src/usr.bin/kdump/kdump.c Tue Jun 16 20:01:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kdump.c,v 1.119 2015/06/16 22:54:10 christos Exp $ */
+/* $NetBSD: kdump.c,v 1.120 2015/06/17 00:01:59 christos Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = @(#)kdump.c 8.4 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: kdump.c,v 1.119 2015/06/16 22:54:10 christos Exp $);
+__RCSID($NetBSD: kdump.c,v 1.120 2015/06/17 00:01:59 christos Exp $);
#endif
#endif /* not lint */
@@ -997,7 +997,7 @@ ktrpsig(void *v, int len)
}
/*NOTREACHED*/
default:
- warnx(Unhandled size %d for ktrpsig\n, len);
+ warnx(Unhandled size %d for ktrpsig, len);
break;
}
}
CVS commit: src/lib
Module Name:src
Committed By: christos
Date: Wed Jun 17 00:15:26 UTC 2015
Modified Files:
src/lib/libc/yp: yperr_string.c
src/lib/libcrypt: crypt.c
src/lib/libpuffs: puffs.c
src/lib/libukfs: ukfs.c
Log Message:
fix error messages
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/yp/yperr_string.c
cvs rdiff -u -r1.33 -r1.34 src/lib/libcrypt/crypt.c
cvs rdiff -u -r1.119 -r1.120 src/lib/libpuffs/puffs.c
cvs rdiff -u -r1.57 -r1.58 src/lib/libukfs/ukfs.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/yp/yperr_string.c
diff -u src/lib/libc/yp/yperr_string.c:1.8 src/lib/libc/yp/yperr_string.c:1.9
--- src/lib/libc/yp/yperr_string.c:1.8 Mon Jun 25 18:32:46 2012
+++ src/lib/libc/yp/yperr_string.c Tue Jun 16 20:15:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: yperr_string.c,v 1.8 2012/06/25 22:32:46 abs Exp $ */
+/* $NetBSD: yperr_string.c,v 1.9 2015/06/17 00:15:26 christos Exp $ */
/*
* Copyright (c) 1992, 1993 Theo de Raadt dera...@fsa.ca
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: yperr_string.c,v 1.8 2012/06/25 22:32:46 abs Exp $);
+__RCSID($NetBSD: yperr_string.c,v 1.9 2015/06/17 00:15:26 christos Exp $);
#endif
#include namespace.h
@@ -85,6 +85,6 @@ yperr_string(int incode)
case YPERR_BUSY:
return __UNCONST(Database is busy);
}
- (void) snprintf(err, sizeof(err), YP unknown error %d\n, incode);
+ (void) snprintf(err, sizeof(err), YP unknown error %d, incode);
return err;
}
Index: src/lib/libcrypt/crypt.c
diff -u src/lib/libcrypt/crypt.c:1.33 src/lib/libcrypt/crypt.c:1.34
--- src/lib/libcrypt/crypt.c:1.33 Tue Dec 27 22:13:09 2011
+++ src/lib/libcrypt/crypt.c Tue Jun 16 20:15:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: crypt.c,v 1.33 2011/12/28 03:13:09 christos Exp $ */
+/* $NetBSD: crypt.c,v 1.34 2015/06/17 00:15:26 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = @(#)crypt.c 8.1.1.1 (Berkeley) 8/18/93;
#else
-__RCSID($NetBSD: crypt.c,v 1.33 2011/12/28 03:13:09 christos Exp $);
+__RCSID($NetBSD: crypt.c,v 1.34 2015/06/17 00:15:26 christos Exp $);
#endif
#endif /* not lint */
@@ -1013,10 +1013,12 @@ prtab(const char *s, unsigned char *t, i
int
main(int argc, char *argv[])
{
-if (argc 2)
- errx(1, Usage: %s password [salt]\n, argv[0]);
+ if (argc 2) {
+ fprintf(stderr, Usage: %s password [salt]\n, getprogname());
+ return EXIT_FAILURE;
+ }
-printf(%s\n, crypt(argv[1], (argc 2) ? argv[2] : argv[1]));
-exit(0);
+ printf(%s\n, crypt(argv[1], (argc 2) ? argv[2] : argv[1]));
+ return EXIT_SUCCESS;
}
#endif
Index: src/lib/libpuffs/puffs.c
diff -u src/lib/libpuffs/puffs.c:1.119 src/lib/libpuffs/puffs.c:1.120
--- src/lib/libpuffs/puffs.c:1.119 Mon Dec 22 03:16:21 2014
+++ src/lib/libpuffs/puffs.c Tue Jun 16 20:15:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs.c,v 1.119 2014/12/22 08:16:21 manu Exp $ */
+/* $NetBSD: puffs.c,v 1.120 2015/06/17 00:15:26 christos Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#if !defined(lint)
-__RCSID($NetBSD: puffs.c,v 1.119 2014/12/22 08:16:21 manu Exp $);
+__RCSID($NetBSD: puffs.c,v 1.120 2015/06/17 00:15:26 christos Exp $);
#endif /* !lint */
#include sys/param.h
@@ -134,7 +134,7 @@ puffs_kernerr_abort(struct puffs_usermou
int error, const char *str, puffs_cookie_t cookie)
{
- fprintf(stderr, abort: type %d, error %d, cookie %p (%s)\n,
+ warnx(abort: type %d, error %d, cookie %p (%s),
type, error, cookie, str);
abort();
}
@@ -145,7 +145,7 @@ puffs_kernerr_log(struct puffs_usermount
int error, const char *str, puffs_cookie_t cookie)
{
- syslog(LOG_WARNING, kernel: type %d, error %d, cookie %p (%s)\n,
+ syslog(LOG_WARNING, kernel: type %d, error %d, cookie %p (%s),
type, error, cookie, str);
}
@@ -213,8 +213,8 @@ puffs_setstacksize(struct puffs_usermoun
minsize = 4*psize;
if (ss (size_t)minsize || ss == PUFFS_STACKSIZE_MIN) {
if (ss != PUFFS_STACKSIZE_MIN)
- fprintf(stderr, puffs_setstacksize: adjusting
- stacksize to minimum %ld\n, minsize);
+ warnx(%s: adjusting stacksize to minimum %ld,
+ __func__, minsize);
ss = 4*psize;
}
@@ -228,8 +228,8 @@ puffs_setstacksize(struct puffs_usermoun
}
if (bonus 1) {
stackshift++;
- fprintf(stderr, puffs_setstacksize: using next power of two:
- %d\n, 1stackshift);
+ warnx(%s: using next power of two: %d, __func__,
+ 1 stackshift);
}
pu-pu_cc_stackshift = stackshift;
@@ -270,8 +270,7 @@ puffs_setrootinfo(struct puffs_usermount
struct puffs_kargs *pargs = pu-pu_kargp;
if (puffs_getstate(pu) != PUFFS_STATE_BEFOREMOUNT) {
- warnx(puffs_setrootinfo: call has effect only
- before mount\n);
+ warnx(%s: call has effect only before mount, __func__);
CVS commit: src/sbin/fsck_lfs
Module Name:src Committed By: christos Date: Wed Jun 17 00:18:35 UTC 2015 Modified Files: src/sbin/fsck_lfs: segwrite.c Log Message: add missing ; To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sbin/fsck_lfs/segwrite.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/fsck_lfs/segwrite.c diff -u src/sbin/fsck_lfs/segwrite.c:1.30 src/sbin/fsck_lfs/segwrite.c:1.31 --- src/sbin/fsck_lfs/segwrite.c:1.30 Tue Jun 16 19:18:55 2015 +++ src/sbin/fsck_lfs/segwrite.c Tue Jun 16 20:18:35 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: segwrite.c,v 1.30 2015/06/16 23:18:55 christos Exp $ */ +/* $NetBSD: segwrite.c,v 1.31 2015/06/17 00:18:35 christos Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. * All rights reserved. @@ -905,7 +905,7 @@ lfs_seglock(struct lfs * fs, unsigned lo sp-bpp = emalloc(fs-lfs_ssize * sizeof(struct ubuf *)); if (!sp-bpp) err(!preen, Could not allocate %zu bytes, - (size_t)(fs-lfs_ssize * sizeof(struct ubuf *))) + (size_t)(fs-lfs_ssize * sizeof(struct ubuf *))); sp-seg_flags = flags; sp-vp = NULL; sp-seg_iocount = 0;
CVS commit: src/usr.bin/mkesdb
Module Name:src
Committed By: christos
Date: Tue Jun 16 23:42:08 UTC 2015
Modified Files:
src/usr.bin/mkesdb: yacc.y
Log Message:
fix printf statement
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/mkesdb/yacc.y
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/mkesdb/yacc.y
diff -u src/usr.bin/mkesdb/yacc.y:1.7 src/usr.bin/mkesdb/yacc.y:1.8
--- src/usr.bin/mkesdb/yacc.y:1.7 Tue Jun 16 18:54:10 2015
+++ src/usr.bin/mkesdb/yacc.y Tue Jun 16 19:42:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: yacc.y,v 1.7 2015/06/16 22:54:10 christos Exp $ */
+/* $NetBSD: yacc.y,v 1.8 2015/06/16 23:42:08 christos Exp $ */
%{
/*-
@@ -33,7 +33,7 @@
#include sys/cdefs.h
#if !defined(lint)
-__RCSID($NetBSD: yacc.y,v 1.7 2015/06/16 22:54:10 christos Exp $);
+__RCSID($NetBSD: yacc.y,v 1.8 2015/06/16 23:42:08 christos Exp $);
#endif /* not lint */
#include assert.h
@@ -290,7 +290,8 @@ do_mkdb(FILE *in)
__dead static void
usage(void)
{
- fprintf(Usage: %s [-m] [-o outfile] [infile]\n, getprogname());
+ fprintf(stderr, Usage: %s [-m] [-o outfile] [infile]\n,
+ getprogname());
exit(EXIT_FAILURE);
}
CVS commit: src/usr.sbin/crash
Module Name:src
Committed By: christos
Date: Tue Jun 16 23:48:20 UTC 2015
Modified Files:
src/usr.sbin/crash: Makefile crash.c
Log Message:
revert kernhist patch accidentally committed
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/usr.sbin/crash/Makefile
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/crash/crash.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.sbin/crash/Makefile
diff -u src/usr.sbin/crash/Makefile:1.30 src/usr.sbin/crash/Makefile:1.31
--- src/usr.sbin/crash/Makefile:1.30 Tue Jun 16 19:04:14 2015
+++ src/usr.sbin/crash/Makefile Tue Jun 16 19:48:20 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2015/06/16 23:04:14 christos Exp $
+# $NetBSD: Makefile,v 1.31 2015/06/16 23:48:20 christos Exp $
PROG= crash
MAN= crash.8
@@ -34,7 +34,7 @@ S= ${.CURDIR}/../../sys
CPPFLAGS+= -I${.CURDIR} -I${.OBJDIR} -I${S} -fno-strict-aliasing
CPPFLAGS+= -DDDB_VERBOSE_HELP -DDB_MAX_LINE=1000 -D_KMEMUSER
-CPPFLAGS+= -UDB_MACHINE_COMMANDS -DKERNHIST -DDDB
+CPPFLAGS+= -UDB_MACHINE_COMMANDS
# ddb files from kernel
.PATH: $S/ddb
Index: src/usr.sbin/crash/crash.c
diff -u src/usr.sbin/crash/crash.c:1.9 src/usr.sbin/crash/crash.c:1.10
--- src/usr.sbin/crash/crash.c:1.9 Tue Jun 16 19:04:14 2015
+++ src/usr.sbin/crash/crash.c Tue Jun 16 19:48:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: crash.c,v 1.9 2015/06/16 23:04:14 christos Exp $ */
+/* $NetBSD: crash.c,v 1.10 2015/06/16 23:48:20 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: crash.c,v 1.9 2015/06/16 23:04:14 christos Exp $);
+__RCSID($NetBSD: crash.c,v 1.10 2015/06/16 23:48:20 christos Exp $);
#endif /* not lint */
#include ddb/ddb.h
@@ -39,7 +39,6 @@ __RCSID($NetBSD: crash.c,v 1.9 2015/06/
#include sys/fcntl.h
#include sys/mman.h
#include sys/ioctl.h
-#include sys/kernhist.h
#include machine/frame.h
@@ -73,8 +72,6 @@ static struct nlist nl[] = {
{ .n_name = _osrelease },
#define X_PANICSTR 1
{ .n_name = _panicstr },
-#define X_KERN_HISTORIES 2
- { .n_name = _kern_histories },
{ .n_name = NULL },
};
@@ -304,50 +301,6 @@ cnputc(int c)
putc(c, ofp);
}
-#define FMTLEN 1024
-#define FNLEN 128
-
-void
-kernhist_dump(struct kern_history *l)
-{
- unsigned int lcv;
- struct kern_history kh;
- struct kern_history_ent ke;
- char fmt[FMTLEN];
- char fn[FNLEN];
-
- db_read_bytes((db_addr_t)l, sizeof(kh), (char *)kh);
- lcv = kh.f;
- do {
- db_read_bytes((db_addr_t)kh.e[lcv], sizeof(ke), (char *)ke);
- if (ke.fmt) {
- db_read_bytes((db_addr_t)ke.fmt, sizeof(fmt), fmt);
- db_read_bytes((db_addr_t)ke.fn, sizeof(fn), fn);
- fmt[sizeof(fmt) - 1] = '\0';
- fn[sizeof(fmt) - 1] = '\0';
- ke.fmt = fmt;
- ke.fn = fn;
- kernhist_entry_print(ke);
- }
- lcv = (lcv + 1) % kh.n;
- } while (lcv != kh.f);
-}
-
-void
-kernhist_print(void (*pr)(const char *, ...))
-{
- struct kern_history_head khh;
-
- if (nl[X_KERN_HISTORIES].n_value == 0) {
- warnx(kernhist is not available);
- return;
- }
-
- db_read_bytes(nl[X_KERN_HISTORIES].n_value, sizeof(khh), (char *)khh);
-
- kernhist_dump(LIST_FIRST(khh));
-}
-
__dead static void
usage(void)
{
CVS commit: src/usr.sbin/btattach
Module Name:src Committed By: christos Date: Tue Jun 16 23:54:58 UTC 2015 Modified Files: src/usr.sbin/btattach: init_unistone.c Log Message: a couple more stray \n To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/btattach/init_unistone.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.sbin/btattach/init_unistone.c diff -u src/usr.sbin/btattach/init_unistone.c:1.2 src/usr.sbin/btattach/init_unistone.c:1.3 --- src/usr.sbin/btattach/init_unistone.c:1.2 Tue Jun 16 19:04:14 2015 +++ src/usr.sbin/btattach/init_unistone.c Tue Jun 16 19:54:58 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: init_unistone.c,v 1.2 2015/06/16 23:04:14 christos Exp $ */ +/* $NetBSD: init_unistone.c,v 1.3 2015/06/16 23:54:58 christos Exp $ */ /* * Copyright (c) 2009 KIYOHARA Takashi * All rights reserved. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__RCSID($NetBSD: init_unistone.c,v 1.2 2015/06/16 23:04:14 christos Exp $); +__RCSID($NetBSD: init_unistone.c,v 1.3 2015/06/16 23:54:58 christos Exp $); #include bluetooth.h #include err.h @@ -106,7 +106,7 @@ init_unistone(int fd, unsigned int speed if (n != sizeof(cs) || cs.status != 0x00 || cs.opcode != HCI_CMD_INFINEON_SET_UART_BAUDRATE) - errx(EXIT_FAILURE, Set_UART_Baudrate failed\n); + errx(EXIT_FAILURE, Set_UART_Baudrate failed); if (cfsetspeed(tio, speed) != 0 || tcsetattr(fd, TCSANOW, tio) != 0) @@ -116,7 +116,7 @@ init_unistone(int fd, unsigned int speed if (n != sizeof(v) || v[0] != 0x12 || v[1] != 0x00) - errx(EXIT_FAILURE, Set_UART_Baudrate not complete\n); + errx(EXIT_FAILURE, Set_UART_Baudrate not complete); infineon_manufacturer_mode(fd, 0); }
CVS commit: src/sbin
Module Name:src
Committed By: christos
Date: Tue Jun 16 23:58:30 UTC 2015
Modified Files:
src/sbin/fdisk: fdisk.c
src/sbin/fsck_ffs: main.c
src/sbin/fsck_lfs: pass2.c utilities.c
Log Message:
a few more \n's in errors
To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 src/sbin/fdisk/fdisk.c
cvs rdiff -u -r1.82 -r1.83 src/sbin/fsck_ffs/main.c
cvs rdiff -u -r1.24 -r1.25 src/sbin/fsck_lfs/pass2.c
cvs rdiff -u -r1.36 -r1.37 src/sbin/fsck_lfs/utilities.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/fdisk/fdisk.c
diff -u src/sbin/fdisk/fdisk.c:1.151 src/sbin/fdisk/fdisk.c:1.152
--- src/sbin/fdisk/fdisk.c:1.151 Tue Jun 16 19:18:54 2015
+++ src/sbin/fdisk/fdisk.c Tue Jun 16 19:58:30 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fdisk.c,v 1.151 2015/06/16 23:18:54 christos Exp $ */
+/* $NetBSD: fdisk.c,v 1.152 2015/06/16 23:58:30 christos Exp $ */
/*
* Mach Operating System
@@ -39,7 +39,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: fdisk.c,v 1.151 2015/06/16 23:18:54 christos Exp $);
+__RCSID($NetBSD: fdisk.c,v 1.152 2015/06/16 23:58:30 christos Exp $);
#endif /* not lint */
#define MBRPTYPENAMES
@@ -1200,7 +1200,7 @@ get_extended_ptn(void)
break;
}
- warnx(Extended partition table is corrupt\n);
+ warnx(Extended partition table is corrupt);
ext.is_corrupt = 1;
ext.num_ptn = 0;
}
Index: src/sbin/fsck_ffs/main.c
diff -u src/sbin/fsck_ffs/main.c:1.82 src/sbin/fsck_ffs/main.c:1.83
--- src/sbin/fsck_ffs/main.c:1.82 Tue Jun 16 19:18:55 2015
+++ src/sbin/fsck_ffs/main.c Tue Jun 16 19:58:30 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.82 2015/06/16 23:18:55 christos Exp $ */
+/* $NetBSD: main.c,v 1.83 2015/06/16 23:58:30 christos Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = @(#)main.c 8.6 (Berkeley) 5/14/95;
#else
-__RCSID($NetBSD: main.c,v 1.82 2015/06/16 23:18:55 christos Exp $);
+__RCSID($NetBSD: main.c,v 1.83 2015/06/16 23:58:30 christos Exp $);
#endif
#endif /* not lint */
@@ -123,7 +123,7 @@ main(int argc, char *argv[])
cvtlevel = argtoi('c', conversion level, optarg, 10);
if (cvtlevel 4) {
cvtlevel = 4;
-warnx(Using maximum conversion level of %d\n,
+warnx(Using maximum conversion level of %d,
cvtlevel);
}
break;
Index: src/sbin/fsck_lfs/pass2.c
diff -u src/sbin/fsck_lfs/pass2.c:1.24 src/sbin/fsck_lfs/pass2.c:1.25
--- src/sbin/fsck_lfs/pass2.c:1.24 Tue Jun 16 19:18:55 2015
+++ src/sbin/fsck_lfs/pass2.c Tue Jun 16 19:58:30 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pass2.c,v 1.24 2015/06/16 23:18:55 christos Exp $ */
+/* $NetBSD: pass2.c,v 1.25 2015/06/16 23:58:30 christos Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -74,7 +74,7 @@ pass2(void)
if (reply(ALLOCATE) == 0)
err(EEXIT, %s, );
if (allocdir(ULFS_ROOTINO, ULFS_ROOTINO, 0755) != ULFS_ROOTINO)
- err(EEXIT, CANNOT ALLOCATE ROOT INODE\n);
+ err(EEXIT, CANNOT ALLOCATE ROOT INODE);
break;
case DCLEAR:
Index: src/sbin/fsck_lfs/utilities.c
diff -u src/sbin/fsck_lfs/utilities.c:1.36 src/sbin/fsck_lfs/utilities.c:1.37
--- src/sbin/fsck_lfs/utilities.c:1.36 Tue Jun 16 19:18:55 2015
+++ src/sbin/fsck_lfs/utilities.c Tue Jun 16 19:58:30 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: utilities.c,v 1.36 2015/06/16 23:18:55 christos Exp $ */
+/* $NetBSD: utilities.c,v 1.37 2015/06/16 23:58:30 christos Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -274,7 +274,7 @@ dofix(struct inodesc * idesc, const char
return (0);
default:
- err(EEXIT, UNKNOWN INODESC FIX MODE %d\n, idesc-id_fix);
+ err(EEXIT, UNKNOWN INODESC FIX MODE %d, idesc-id_fix);
}
/* NOTREACHED */
}
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Tue Jun 16 06:11:01 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: 843 To generate a diff of this commit: cvs rdiff -u -r1.1.2.330 -r1.1.2.331 src/doc/CHANGES-7.0 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-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.330 src/doc/CHANGES-7.0:1.1.2.331 --- src/doc/CHANGES-7.0:1.1.2.330 Fri Jun 12 16:35:49 2015 +++ src/doc/CHANGES-7.0 Tue Jun 16 06:11:01 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.330 2015/06/12 16:35:49 snj Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.331 2015/06/16 06:11:01 snj Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -32135,3 +32135,10 @@ sys/arch/arm/omap/am335x_trng.c patch Fix build. [jmcneill, ticket #839] +lib/libc/Makefile1.169 via patch + + Only create and install the tags file for the normal libc (not any + of the compat copies), because we don't want it to be overwritten + by the compat copies. + [martin, ticket #843] +
CVS commit: [netbsd-7] src/lib/libc
Module Name:src
Committed By: snj
Date: Tue Jun 16 06:08:47 UTC 2015
Modified Files:
src/lib/libc [netbsd-7]: Makefile
Log Message:
Pull up following revision(s) (requested by martin in ticket #843):
lib/libc/Makefile: revision 1.169 via patch
Only create and install the tags file for the normal libc (not any of the
compat copies), because we don't want it to be overwritten by the compat
copies. This was detected by the evbarm mkimage complaining.
To generate a diff of this commit:
cvs rdiff -u -r1.166 -r1.166.2.1 src/lib/libc/Makefile
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/Makefile
diff -u src/lib/libc/Makefile:1.166 src/lib/libc/Makefile:1.166.2.1
--- src/lib/libc/Makefile:1.166 Sun Aug 10 23:39:08 2014
+++ src/lib/libc/Makefile Tue Jun 16 06:08:47 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.166 2014/08/10 23:39:08 matt Exp $
+# $NetBSD: Makefile,v 1.166.2.1 2015/06/16 06:08:47 snj Exp $
# @(#)Makefile 8.2 (Berkeley) 2/3/94
#
# All library objects contain sccsid strings by default; they may be
@@ -128,6 +128,7 @@ REGEX_SPECIALS=[][)(^$$.?*\\;]
MKREPRO_SED= -e 's;${NETBSDSRCDIR:C/${REGEX_SPECIALS}//g};/usr/src;'
.endif
+.if !defined(MLIBDIR)
realall: tags
tags: ${SRCS}
${_MKTARGET_CREATE}
@@ -145,7 +146,7 @@ tags: ${SRCS}
FILES= tags
FILESNAME= libc.tags
FILESDIR= /var/db
-
+.endif
# workaround for I18N stuffs: build singlebyte setlocale() for libc.a,
# multibyte for libc.so. the quirk should be removed when we support
CVS commit: src/sys/arch/powerpc/include/booke
Module Name:src
Committed By: matt
Date: Tue Jun 16 06:51:16 UTC 2015
Modified Files:
src/sys/arch/powerpc/include/booke: cpuvar.h
Log Message:
This needs to define PRIxPTE too.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/powerpc/include/booke/cpuvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/include/booke/cpuvar.h
diff -u src/sys/arch/powerpc/include/booke/cpuvar.h:1.17 src/sys/arch/powerpc/include/booke/cpuvar.h:1.18
--- src/sys/arch/powerpc/include/booke/cpuvar.h:1.17 Tue Oct 2 23:51:39 2012
+++ src/sys/arch/powerpc/include/booke/cpuvar.h Tue Jun 16 06:51:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuvar.h,v 1.17 2012/10/02 23:51:39 christos Exp $ */
+/* $NetBSD: cpuvar.h,v 1.18 2015/06/16 06:51:16 matt Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -107,6 +107,7 @@ struct generic_attach_args {
#ifndef __BSD_PT_ENTRY_T
#define __BSD_PT_ENTRY_T __uint32_t
typedef __BSD_PT_ENTRY_T pt_entry_t;
+#define PRIxPTE PRIx32
#endif
#include uvm/pmap/tlb.h
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: matt
Date: Tue Jun 16 07:29:46 UTC 2015
Modified Files:
src/sys/compat/netbsd32: netbsd32_netbsd.c
Log Message:
Fix a comment.
To generate a diff of this commit:
cvs rdiff -u -r1.193 -r1.194 src/sys/compat/netbsd32/netbsd32_netbsd.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/compat/netbsd32/netbsd32_netbsd.c
diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.193 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.194
--- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.193 Thu Jul 31 12:35:33 2014
+++ src/sys/compat/netbsd32/netbsd32_netbsd.c Tue Jun 16 07:29:46 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_netbsd.c,v 1.193 2014/07/31 12:35:33 maxv Exp $ */
+/* $NetBSD: netbsd32_netbsd.c,v 1.194 2015/06/16 07:29:46 matt Exp $ */
/*
* Copyright (c) 1998, 2001, 2008 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: netbsd32_netbsd.c,v 1.193 2014/07/31 12:35:33 maxv Exp $);
+__KERNEL_RCSID(0, $NetBSD: netbsd32_netbsd.c,v 1.194 2015/06/16 07:29:46 matt Exp $);
#if defined(_KERNEL_OPT)
#include opt_ddb.h
@@ -1417,7 +1417,7 @@ int
netbsd32_pathconf(struct lwp *l, const struct netbsd32_pathconf_args *uap, register_t *retval)
{
/* {
- syscallarg(int) fd;
+ syscallarg(netbsd32_charp) path;
syscallarg(int) name;
} */
struct sys_pathconf_args ua;
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: martin
Date: Tue Jun 16 10:41:34 UTC 2015
Modified Files:
src/sys/compat/netbsd32: syscalls.master
Log Message:
Add posix_fallocate and fdiscard
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/sys/compat/netbsd32/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.102 src/sys/compat/netbsd32/syscalls.master:1.103
--- src/sys/compat/netbsd32/syscalls.master:1.102 Wed Feb 25 13:16:33 2015
+++ src/sys/compat/netbsd32/syscalls.master Tue Jun 16 10:41:34 2015
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.102 2015/02/25 13:16:33 christos Exp $
+ $NetBSD: syscalls.master,v 1.103 2015/06/16 10:41:34 martin Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -1043,3 +1043,8 @@
int flags, const netbsd32_timespecp_t ts, \
lwpid_t unpark, netbsd32_voidp hint, \
netbsd32_voidp unparkhint); }
+479 NOERR { int|netbsd32||posix_fallocate(int fd, int PAD, \
+ netbsd32_off_t pos, netbsd32_off_t len); }
+480 STD { int|netbsd32||fdiscard(int fd, int PAD, \
+ netbsd32_off_t pos, netbsd32_off_t len); }
+
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: martin
Date: Tue Jun 16 10:42:13 UTC 2015
Modified Files:
src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h
netbsd32_syscalls.c netbsd32_sysent.c netbsd32_systrace_args.c
Log Message:
Regen for posix_fallocate and fdiscard
To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/sys/compat/netbsd32/netbsd32_syscall.h \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.110 -r1.111 src/sys/compat/netbsd32/netbsd32_syscalls.c \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.1 -r1.2 src/sys/compat/netbsd32/netbsd32_systrace_args.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/compat/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.111 src/sys/compat/netbsd32/netbsd32_syscall.h:1.112
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.111 Sat Mar 7 16:41:53 2015
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Tue Jun 16 10:42:13 2015
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.111 2015/03/07 16:41:53 christos Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.112 2015/06/16 10:42:13 martin Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.102 2015/02/25 13:16:33 christos Exp
+ * created from NetBSD: syscalls.master,v 1.103 2015/06/16 10:41:34 martin Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -1248,6 +1248,12 @@
/* syscall: netbsd32lwp_park60 ret: int args: netbsd32_clockid_t int const netbsd32_timespecp_t lwpid_t netbsd32_voidp netbsd32_voidp */
#define NETBSD32_SYS_netbsd32lwp_park60 478
-#define NETBSD32_SYS_MAXSYSCALL 479
+/* syscall: netbsd32_posix_fallocate ret: int args: int int netbsd32_off_t netbsd32_off_t */
+#define NETBSD32_SYS_netbsd32_posix_fallocate 479
+
+/* syscall: netbsd32_fdiscard ret: int args: int int netbsd32_off_t netbsd32_off_t */
+#define NETBSD32_SYS_netbsd32_fdiscard 480
+
+#define NETBSD32_SYS_MAXSYSCALL 481
#define NETBSD32_SYS_NSYSENT 512
#endif /* _NETBSD32_SYS_SYSCALL_H_ */
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.111 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.112
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.111 Sat Mar 7 16:41:53 2015
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Tue Jun 16 10:42:13 2015
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.111 2015/03/07 16:41:53 christos Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.112 2015/06/16 10:42:13 martin Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.102 2015/02/25 13:16:33 christos Exp
+ * created from NetBSD: syscalls.master,v 1.103 2015/06/16 10:41:34 martin Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -2465,6 +2465,22 @@ struct netbsd32lwp_park60_args {
};
check_syscall_args(netbsd32lwp_park60)
+struct netbsd32_posix_fallocate_args {
+ syscallarg(int) fd;
+ syscallarg(int) PAD;
+ syscallarg(netbsd32_off_t) pos;
+ syscallarg(netbsd32_off_t) len;
+};
+check_syscall_args(netbsd32_posix_fallocate)
+
+struct netbsd32_fdiscard_args {
+ syscallarg(int) fd;
+ syscallarg(int) PAD;
+ syscallarg(netbsd32_off_t) pos;
+ syscallarg(netbsd32_off_t) len;
+};
+check_syscall_args(netbsd32_fdiscard)
+
/*
* System call prototypes.
*/
@@ -3276,4 +3292,8 @@ int netbsd32_clock_nanosleep(struct lwp
int netbsd32lwp_park60(struct lwp *, const struct netbsd32lwp_park60_args *, register_t *);
+int netbsd32_posix_fallocate(struct lwp *, const struct netbsd32_posix_fallocate_args *, register_t *);
+
+int netbsd32_fdiscard(struct lwp *, const struct netbsd32_fdiscard_args *, register_t *);
+
#endif /* _NETBSD32_SYS_SYSCALLARGS_H_ */
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.110 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.111
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.110 Sat Mar 7 16:41:53 2015
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Tue Jun 16 10:42:13 2015
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.110 2015/03/07 16:41:53 christos Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.111 2015/06/16 10:42:13 martin Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.102 2015/02/25 13:16:33 christos Exp
+ * created from NetBSD: syscalls.master,v 1.103 2015/06/16 10:41:34 martin Exp
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: netbsd32_syscalls.c,v 1.110 2015/03/07 16:41:53 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: netbsd32_syscalls.c,v 1.111 2015/06/16 10:42:13 martin Exp $);
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -576,8 +576,8 @@
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: martin
Date: Tue Jun 16 10:42:38 UTC 2015
Modified Files:
src/sys/compat/netbsd32: netbsd32_netbsd.c
Log Message:
Implement posix_fallocate and fdiscard compat
To generate a diff of this commit:
cvs rdiff -u -r1.194 -r1.195 src/sys/compat/netbsd32/netbsd32_netbsd.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/compat/netbsd32/netbsd32_netbsd.c
diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.194 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.195
--- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.194 Tue Jun 16 07:29:46 2015
+++ src/sys/compat/netbsd32/netbsd32_netbsd.c Tue Jun 16 10:42:38 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_netbsd.c,v 1.194 2015/06/16 07:29:46 matt Exp $ */
+/* $NetBSD: netbsd32_netbsd.c,v 1.195 2015/06/16 10:42:38 martin Exp $ */
/*
* Copyright (c) 1998, 2001, 2008 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: netbsd32_netbsd.c,v 1.194 2015/06/16 07:29:46 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: netbsd32_netbsd.c,v 1.195 2015/06/16 10:42:38 martin Exp $);
#if defined(_KERNEL_OPT)
#include opt_ddb.h
@@ -2762,6 +2762,44 @@ netbsd32_paccept(struct lwp *l, const st
return sys_paccept(l, ua, retval);
}
+int
+netbsd32_fdiscard(struct lwp *l, const struct netbsd32_fdiscard_args *uap,
+ register_t *retval)
+{
+ /* {
+ syscallarg(int) fd;
+ syscallarg(netbsd32_off_t) pos;
+ syscallarg(netbsd32_off_t) len;
+ } */
+ struct sys_fdiscard_args ua;
+
+ NETBSD32TO64_UAP(fd);
+ NETBSD32TO64_UAP(pos);
+ NETBSD32TO64_UAP(len);
+
+ return sys_fdiscard(l, ua, retval);
+}
+
+int
+netbsd32_posix_fallocate(struct lwp *l, const struct netbsd32_posix_fallocate_args *uap,
+ register_t *retval)
+{
+ /* {
+ syscallarg(int) fd;
+ syscallarg(netbsd32_off_t) pos;
+ syscallarg(netbsd32_off_t) len;
+ } */
+ struct sys_posix_fallocate_args ua;
+
+ NETBSD32TO64_UAP(fd);
+ NETBSD32TO64_UAP(pos);
+ NETBSD32TO64_UAP(len);
+
+ return sys_posix_fallocate(l, ua, retval);
+}
+
+
+
/*
* MI indirect system call support.
* Only used if the MD netbsd32_syscall.c doesn't intercept the calls.
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: martin Date: Tue Jun 16 09:37:48 UTC 2015 Modified Files: src/sys/arch/evbmips/conf: ERLITE Log Message: Remove options NFS_V2_ONLY To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbmips/conf/ERLITE 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/evbmips/conf/ERLITE diff -u src/sys/arch/evbmips/conf/ERLITE:1.10 src/sys/arch/evbmips/conf/ERLITE:1.11 --- src/sys/arch/evbmips/conf/ERLITE:1.10 Mon Jun 8 14:42:38 2015 +++ src/sys/arch/evbmips/conf/ERLITE Tue Jun 16 09:37:48 2015 @@ -1,11 +1,11 @@ -# $NetBSD: ERLITE,v 1.10 2015/06/08 14:42:38 matt Exp $ +# $NetBSD: ERLITE,v 1.11 2015/06/16 09:37:48 martin Exp $ include arch/mips/conf/std.octeon include arch/evbmips/conf/files.octeon #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident ERLITE-$Revision: 1.10 $ +#ident ERLITE-$Revision: 1.11 $ maxusers 32 @@ -113,7 +113,6 @@ options MIIVERBOSE # verbose PHY autoco #options PCI_NETBSD_ENABLE_IDE=0x1 options NFS_BOOT_DHCP -options NFS_V2_ONLY config netbsd root on ? type ? #config netbsd root on cnmac0 type nfs
