CVS commit: [tls-earlyentropy] src/sys/fs
Module Name:src Committed By: tls Date: Sun Aug 10 06:55:54 UTC 2014 Modified Files: src/sys/fs [tls-earlyentropy]: unicode.h src/sys/fs/adosfs [tls-earlyentropy]: adosfs.h adutil.c advfsops.c advnops.c src/sys/fs/cd9660 [tls-earlyentropy]: cd9660_bmap.c cd9660_lookup.c cd9660_node.c cd9660_node.h cd9660_util.c cd9660_vfsops.c cd9660_vnops.c src/sys/fs/efs [tls-earlyentropy]: efs_vfsops.c efs_vnops.c files.efs src/sys/fs/filecorefs [tls-earlyentropy]: filecore_lookup.c filecore_vfsops.c filecore_vnops.c src/sys/fs/hfs [tls-earlyentropy]: hfs_vfsops.c hfs_vnops.c src/sys/fs/msdosfs [tls-earlyentropy]: denode.h msdosfs_denode.c msdosfs_lookup.c msdosfs_vfsops.c msdosfs_vnops.c msdosfsmount.h src/sys/fs/nilfs [tls-earlyentropy]: nilfs_vfsops.c nilfs_vnops.c src/sys/fs/ntfs [tls-earlyentropy]: ntfs_vfsops.c ntfs_vnops.c src/sys/fs/ptyfs [tls-earlyentropy]: ptyfs_vfsops.c ptyfs_vnops.c src/sys/fs/puffs [tls-earlyentropy]: puffs_vfsops.c puffs_vnops.c src/sys/fs/smbfs [tls-earlyentropy]: smbfs_vfsops.c smbfs_vnops.c src/sys/fs/sysvbfs [tls-earlyentropy]: sysvbfs.c sysvbfs_vfsops.c sysvbfs_vnops.c src/sys/fs/tmpfs [tls-earlyentropy]: tmpfs.h tmpfs_fifoops.c tmpfs_mem.c tmpfs_specops.c tmpfs_vfsops.c tmpfs_vnops.c src/sys/fs/udf [tls-earlyentropy]: udf_subr.c udf_vfsops.c udf_vnops.c src/sys/fs/union [tls-earlyentropy]: union_subr.c union_vfsops.c union_vnops.c src/sys/fs/unionfs [tls-earlyentropy]: unionfs_vfsops.c unionfs_vnops.c src/sys/fs/v7fs [tls-earlyentropy]: v7fs_extern.c v7fs_vfsops.c v7fs_vnops.c Removed Files: src/sys/fs/efs [tls-earlyentropy]: efs_ihash.c efs_ihash.h Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.6.60.1 src/sys/fs/unicode.h cvs rdiff -u -r1.12 -r1.12.10.1 src/sys/fs/adosfs/adosfs.h cvs rdiff -u -r1.16 -r1.16.2.1 src/sys/fs/adosfs/adutil.c cvs rdiff -u -r1.69 -r1.69.2.1 src/sys/fs/adosfs/advfsops.c cvs rdiff -u -r1.43 -r1.43.2.1 src/sys/fs/adosfs/advnops.c cvs rdiff -u -r1.4 -r1.4.64.1 src/sys/fs/cd9660/cd9660_bmap.c cvs rdiff -u -r1.26 -r1.26.2.1 src/sys/fs/cd9660/cd9660_lookup.c cvs rdiff -u -r1.30 -r1.30.2.1 src/sys/fs/cd9660/cd9660_node.c cvs rdiff -u -r1.14 -r1.14.64.1 src/sys/fs/cd9660/cd9660_node.h cvs rdiff -u -r1.10 -r1.10.26.1 src/sys/fs/cd9660/cd9660_util.c cvs rdiff -u -r1.83 -r1.83.2.1 src/sys/fs/cd9660/cd9660_vfsops.c cvs rdiff -u -r1.47 -r1.47.2.1 src/sys/fs/cd9660/cd9660_vnops.c cvs rdiff -u -r1.10 -r0 src/sys/fs/efs/efs_ihash.c cvs rdiff -u -r1.1 -r0 src/sys/fs/efs/efs_ihash.h cvs rdiff -u -r1.24 -r1.24.10.1 src/sys/fs/efs/efs_vfsops.c cvs rdiff -u -r1.31 -r1.31.2.1 src/sys/fs/efs/efs_vnops.c cvs rdiff -u -r1.1 -r1.1.98.1 src/sys/fs/efs/files.efs cvs rdiff -u -r1.19 -r1.19.2.1 src/sys/fs/filecorefs/filecore_lookup.c cvs rdiff -u -r1.75 -r1.75.2.1 src/sys/fs/filecorefs/filecore_vfsops.c cvs rdiff -u -r1.41 -r1.41.2.1 src/sys/fs/filecorefs/filecore_vnops.c cvs rdiff -u -r1.30 -r1.30.2.1 src/sys/fs/hfs/hfs_vfsops.c cvs rdiff -u -r1.29 -r1.29.2.1 src/sys/fs/hfs/hfs_vnops.c cvs rdiff -u -r1.23 -r1.23.10.1 src/sys/fs/msdosfs/denode.h cvs rdiff -u -r1.48 -r1.48.10.1 src/sys/fs/msdosfs/msdosfs_denode.c cvs rdiff -u -r1.32 -r1.32.2.1 src/sys/fs/msdosfs/msdosfs_lookup.c cvs rdiff -u -r1.106 -r1.106.2.1 src/sys/fs/msdosfs/msdosfs_vfsops.c cvs rdiff -u -r1.89 -r1.89.2.1 src/sys/fs/msdosfs/msdosfs_vnops.c cvs rdiff -u -r1.19 -r1.19.10.1 src/sys/fs/msdosfs/msdosfsmount.h cvs rdiff -u -r1.15 -r1.15.2.1 src/sys/fs/nilfs/nilfs_vfsops.c cvs rdiff -u -r1.27 -r1.27.2.1 src/sys/fs/nilfs/nilfs_vnops.c cvs rdiff -u -r1.93 -r1.93.2.1 src/sys/fs/ntfs/ntfs_vfsops.c cvs rdiff -u -r1.56 -r1.56.2.1 src/sys/fs/ntfs/ntfs_vnops.c cvs rdiff -u -r1.49 -r1.49.2.1 src/sys/fs/ptyfs/ptyfs_vfsops.c cvs rdiff -u -r1.46 -r1.46.2.1 src/sys/fs/ptyfs/ptyfs_vnops.c cvs rdiff -u -r1.109 -r1.109.2.1 src/sys/fs/puffs/puffs_vfsops.c cvs rdiff -u -r1.181 -r1.181.2.1 src/sys/fs/puffs/puffs_vnops.c cvs rdiff -u -r1.99 -r1.99.2.1 src/sys/fs/smbfs/smbfs_vfsops.c cvs rdiff -u -r1.89 -r1.89.2.1 src/sys/fs/smbfs/smbfs_vnops.c cvs rdiff -u -r1.13 -r1.13.2.1 src/sys/fs/sysvbfs/sysvbfs.c cvs rdiff -u -r1.42 -r1.42.2.1 src/sys/fs/sysvbfs/sysvbfs_vfsops.c cvs rdiff -u -r1.53 -r1.53.2.1 src/sys/fs/sysvbfs/sysvbfs_vnops.c cvs rdiff -u -r1.48 -r1.48.2.1 src/sys/fs/tmpfs/tmpfs.h cvs rdiff -u -r1.10 -r1.10.2.1 src/sys/fs/tmpfs/tmpfs_fifoops.c cvs rdiff -u -r1.4 -r1.4.28.1 src/sys/fs/tmpfs/tmpfs_mem.c cvs rdiff -u -r1.11 -r1.11.2.1 src/sys/fs/tmpfs/tmpfs_specops.c cvs rdiff -u -r1.58 -r1.58.2.1 src/sys/fs/tmpfs/tmpfs_vfsops.c cvs rdiff -u -r1.118 -r1.118.2.1 src/sys/fs/tmpfs/tmpfs_vnops.c cvs rdiff -u -r1.124 -r1.124.2.1 src/sys/fs/udf/udf_subr.c cvs rdiff -u -r1.66 -r1.66.2.1 src/sys/fs/udf/udf_vfsops.c cvs rdiff -u -r1.91
CVS commit: [tls-earlyentropy] src/sys/modules
Module Name:src Committed By: tls Date: Sun Aug 10 06:56:11 UTC 2014 Modified Files: src/sys/modules [tls-earlyentropy]: Makefile src/sys/modules/arch/powerpc/powerpc-booke [tls-earlyentropy]: bsd.powerpc-booke.mk src/sys/modules/drmkms [tls-earlyentropy]: Makefile Makefile.inc src/sys/modules/drmkms_linux [tls-earlyentropy]: Makefile src/sys/modules/efs [tls-earlyentropy]: Makefile src/sys/modules/ffs [tls-earlyentropy]: Makefile src/sys/modules/i915drmkms [tls-earlyentropy]: Makefile i915drmkms.ioconf src/sys/modules/kernfs [tls-earlyentropy]: Makefile src/sys/modules/lfs [tls-earlyentropy]: Makefile src/sys/modules/lua [tls-earlyentropy]: Makefile lua.c luavar.h test.lua src/sys/modules/luapmf [tls-earlyentropy]: Makefile luapmf.c src/sys/modules/luasystm [tls-earlyentropy]: Makefile luasystm.c test.lua src/sys/modules/npf [tls-earlyentropy]: Makefile src/sys/modules/uatp [tls-earlyentropy]: uatp.ioconf src/sys/modules/zfs [tls-earlyentropy]: Makefile.zfsmod Added Files: src/sys/modules/hythygtemp [tls-earlyentropy]: Makefile hythygtemp.ioconf Removed Files: src/sys/modules/drmkms [tls-earlyentropy]: drmkms.ioconf src/sys/modules/lua [tls-earlyentropy]: assert.h ctype.h errno.h inttypes.h limits.h locale.h math.h setjmp.h signal.h stdarg.h stddef.h stdio.h stdlib.h string.h Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.135 -r1.135.2.1 src/sys/modules/Makefile cvs rdiff -u -r1.1 -r1.1.26.1 \ src/sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk cvs rdiff -u -r1.2 -r1.2.2.1 src/sys/modules/drmkms/Makefile cvs rdiff -u -r1.3 -r1.3.2.1 src/sys/modules/drmkms/Makefile.inc cvs rdiff -u -r1.2 -r0 src/sys/modules/drmkms/drmkms.ioconf cvs rdiff -u -r1.2 -r1.2.2.1 src/sys/modules/drmkms_linux/Makefile cvs rdiff -u -r1.1 -r1.1.64.1 src/sys/modules/efs/Makefile cvs rdiff -u -r1.8 -r1.8.12.1 src/sys/modules/ffs/Makefile cvs rdiff -u -r0 -r1.1.4.2 src/sys/modules/hythygtemp/Makefile \ src/sys/modules/hythygtemp/hythygtemp.ioconf cvs rdiff -u -r1.2 -r1.2.2.1 src/sys/modules/i915drmkms/Makefile \ src/sys/modules/i915drmkms/i915drmkms.ioconf cvs rdiff -u -r1.1 -r1.1.64.1 src/sys/modules/kernfs/Makefile cvs rdiff -u -r1.6 -r1.6.2.1 src/sys/modules/lfs/Makefile cvs rdiff -u -r1.6 -r1.6.2.1 src/sys/modules/lua/Makefile cvs rdiff -u -r1.1 -r0 src/sys/modules/lua/assert.h \ src/sys/modules/lua/ctype.h src/sys/modules/lua/errno.h \ src/sys/modules/lua/inttypes.h src/sys/modules/lua/limits.h \ src/sys/modules/lua/locale.h src/sys/modules/lua/math.h \ src/sys/modules/lua/setjmp.h src/sys/modules/lua/signal.h \ src/sys/modules/lua/stdarg.h src/sys/modules/lua/stddef.h \ src/sys/modules/lua/stdlib.h src/sys/modules/lua/string.h cvs rdiff -u -r1.8 -r1.8.2.1 src/sys/modules/lua/lua.c cvs rdiff -u -r1.1 -r1.1.2.1 src/sys/modules/lua/luavar.h \ src/sys/modules/lua/test.lua cvs rdiff -u -r1.2 -r0 src/sys/modules/lua/stdio.h cvs rdiff -u -r1.2 -r1.2.2.1 src/sys/modules/luapmf/Makefile cvs rdiff -u -r1.3 -r1.3.2.1 src/sys/modules/luapmf/luapmf.c cvs rdiff -u -r1.1 -r1.1.2.1 src/sys/modules/luasystm/Makefile \ src/sys/modules/luasystm/test.lua cvs rdiff -u -r1.2 -r1.2.2.1 src/sys/modules/luasystm/luasystm.c cvs rdiff -u -r1.16 -r1.16.2.1 src/sys/modules/npf/Makefile cvs rdiff -u -r1.1 -r1.1.14.1 src/sys/modules/uatp/uatp.ioconf cvs rdiff -u -r1.4 -r1.4.10.1 src/sys/modules/zfs/Makefile.zfsmod Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/Makefile diff -u src/sys/modules/Makefile:1.135 src/sys/modules/Makefile:1.135.2.1 --- src/sys/modules/Makefile:1.135 Fri Jan 3 16:16:10 2014 +++ src/sys/modules/Makefile Sun Aug 10 06:56:10 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.135 2014/01/03 16:16:10 pgoyette Exp $ +# $NetBSD: Makefile,v 1.135.2.1 2014/08/10 06:56:10 tls Exp $ .include bsd.own.mk @@ -39,6 +39,7 @@ SUBDIR+= gpioiic SUBDIR+= gpioow SUBDIR+= gpiosim SUBDIR+= hfs +SUBDIR+= hythygtemp SUBDIR+= if_axe SUBDIR+= if_axen SUBDIR+= if_npflog Index: src/sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk diff -u src/sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk:1.1 src/sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk:1.1.26.1 --- src/sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk:1.1 Wed Jun 15 09:45:59 2011 +++ src/sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk Sun Aug 10 06:56:10 2014 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.powerpc-booke.mk,v 1.1 2011/06/15 09:45:59 mrg Exp $ +# $NetBSD: bsd.powerpc-booke.mk,v 1.1.26.1 2014/08/10 06:56:10 tls Exp $ .ifndef _BSD_POWERPC_BOOKE_MK_ _BSD_POWERPC_BOOKE_MK_=1 @@ -7,7 +7,7 @@ KMODULEARCHDIR:=
CVS commit: [tls-earlyentropy] src/sys/netatalk
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:56:21 UTC 2014
Modified Files:
src/sys/netatalk [tls-earlyentropy]: at_control.c at_extern.h
at_proto.c ddp_usrreq.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.34.26.1 src/sys/netatalk/at_control.c
cvs rdiff -u -r1.16 -r1.16.76.1 src/sys/netatalk/at_extern.h
cvs rdiff -u -r1.17 -r1.17.28.1 src/sys/netatalk/at_proto.c
cvs rdiff -u -r1.41 -r1.41.2.1 src/sys/netatalk/ddp_usrreq.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/netatalk/at_control.c
diff -u src/sys/netatalk/at_control.c:1.34 src/sys/netatalk/at_control.c:1.34.26.1
--- src/sys/netatalk/at_control.c:1.34 Wed Oct 19 01:50:27 2011
+++ src/sys/netatalk/at_control.c Sun Aug 10 06:56:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: at_control.c,v 1.34 2011/10/19 01:50:27 dyoung Exp $ */
+/* $NetBSD: at_control.c,v 1.34.26.1 2014/08/10 06:56:21 tls Exp $ */
/*
* Copyright (c) 1990,1994 Regents of The University of Michigan.
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: at_control.c,v 1.34 2011/10/19 01:50:27 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: at_control.c,v 1.34.26.1 2014/08/10 06:56:21 tls Exp $);
#include sys/param.h
#include sys/systm.h
@@ -72,7 +72,7 @@ static void aa_clean(void);
(a)-sat_addr.s_node == (b)-sat_addr.s_node )
int
-at_control(u_long cmd, void * data, struct ifnet *ifp, struct lwp *l)
+at_control(u_long cmd, void *data, struct ifnet *ifp)
{
struct ifreq *ifr = (struct ifreq *) data;
const struct sockaddr_at *csat;
@@ -125,7 +125,7 @@ at_control(u_long cmd, void * data, stru
* If we are not superuser, then we don't get to do these
* ops.
*/
- if (l kauth_authorize_network(l-l_cred,
+ if (kauth_authorize_network(curlwp-l_cred,
KAUTH_NETWORK_INTERFACE,
KAUTH_REQ_NETWORK_INTERFACE_SETPRIV, ifp, (void *)cmd,
NULL) != 0)
Index: src/sys/netatalk/at_extern.h
diff -u src/sys/netatalk/at_extern.h:1.16 src/sys/netatalk/at_extern.h:1.16.76.1
--- src/sys/netatalk/at_extern.h:1.16 Wed Dec 5 23:47:18 2007
+++ src/sys/netatalk/at_extern.h Sun Aug 10 06:56:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: at_extern.h,v 1.16 2007/12/05 23:47:18 dyoung Exp $ */
+/* $NetBSD: at_extern.h,v 1.16.76.1 2014/08/10 06:56:21 tls Exp $ */
/*
* Copyright (c) 1990,1994 Regents of The University of Michigan.
@@ -41,6 +41,8 @@ struct socket;
extern struct mowner atalk_rx_mowner;
extern struct mowner atalk_tx_mowner;
+extern const struct pr_usrreqs ddp_usrreqs;
+
void atintr(void);
void aarpprobe(void *);
int aarpresolve(struct ifnet *, struct mbuf *, const struct sockaddr_at *,
@@ -48,14 +50,12 @@ int aarpresolve(struct ifnet *, struct m
void aarpinput(struct ifnet *, struct mbuf *);
int at_broadcast(const struct sockaddr_at *);
void aarp_clean(void);
-int at_control(u_long, void *, struct ifnet *, struct lwp *);
+int at_control(u_long, void *, struct ifnet *);
int at_inithead(void **, int);
void at_purgeaddr(struct ifaddr *);
void at_purgeif(struct ifnet *);
u_int16_t
at_cksum(struct mbuf *, int);
-int ddp_usrreq(struct socket *, int, struct mbuf *, struct mbuf *,
-struct mbuf *, struct lwp *);
void ddp_init(void);
struct ifaddr *
at_ifawithnet(const struct sockaddr_at *, struct ifnet *);
Index: src/sys/netatalk/at_proto.c
diff -u src/sys/netatalk/at_proto.c:1.17 src/sys/netatalk/at_proto.c:1.17.28.1
--- src/sys/netatalk/at_proto.c:1.17 Thu Mar 31 19:40:52 2011
+++ src/sys/netatalk/at_proto.c Sun Aug 10 06:56:21 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: at_proto.c,v 1.17 2011/03/31 19:40:52 dyoung Exp $ */
+/* $NetBSD: at_proto.c,v 1.17.28.1 2014/08/10 06:56:21 tls Exp $ */
/*
* Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: at_proto.c,v 1.17 2011/03/31 19:40:52 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: at_proto.c,v 1.17.28.1 2014/08/10 06:56:21 tls Exp $);
#include sys/param.h
#include sys/systm.h
@@ -37,7 +37,6 @@ __KERNEL_RCSID(0, $NetBSD: at_proto.c,v
#include sys/kernel.h
#include net/if.h
-#include net/radix.h
#include net/if_ether.h
#include netinet/in.h
#include net/route.h
@@ -50,9 +49,6 @@ __KERNEL_RCSID(0, $NetBSD: at_proto.c,v
DOMAIN_DEFINE(atalkdomain); /* forward declare and add to link set */
-PR_WRAP_USRREQ(ddp_usrreq)
-#define ddp_usrreq ddp_usrreq_wrapper
-
const struct protosw atalksw[] = {
{
.pr_type = SOCK_DGRAM,
@@ -60,7 +56,7 @@ const struct protosw atalksw[] = {
.pr_protocol = ATPROTO_DDP,
.pr_flags = PR_ATOMIC|PR_ADDR,
.pr_output = ddp_output,
- .pr_usrreq = ddp_usrreq,
+ .pr_usrreqs = ddp_usrreqs,
.pr_init = ddp_init,
},
};
Index: src/sys/netatalk/ddp_usrreq.c
diff -u src/sys/netatalk/ddp_usrreq.c:1.41 src/sys/netatalk/ddp_usrreq.c:1.41.2.1
--- src/sys/netatalk/ddp_usrreq.c:1.41 Tue
CVS commit: [tls-earlyentropy] src/sys/miscfs
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:56:06 UTC 2014
Modified Files:
src/sys/miscfs/deadfs [tls-earlyentropy]: dead_vnops.c
src/sys/miscfs/fdesc [tls-earlyentropy]: fdesc.h fdesc_vfsops.c
fdesc_vnops.c
src/sys/miscfs/fifofs [tls-earlyentropy]: fifo_vnops.c
src/sys/miscfs/genfs [tls-earlyentropy]: layer.h layer_extern.h
layer_subr.c layer_vfsops.c layer_vnops.c
src/sys/miscfs/kernfs [tls-earlyentropy]: files.kernfs kernfs.h
kernfs_vfsops.c kernfs_vnops.c
src/sys/miscfs/nullfs [tls-earlyentropy]: null_vfsops.c
src/sys/miscfs/overlay [tls-earlyentropy]: overlay_vfsops.c
src/sys/miscfs/procfs [tls-earlyentropy]: procfs.h procfs_linux.c
procfs_subr.c procfs_vfsops.c procfs_vnops.c
src/sys/miscfs/specfs [tls-earlyentropy]: spec_vnops.c specdev.h
src/sys/miscfs/umapfs [tls-earlyentropy]: umap_vfsops.c
Removed Files:
src/sys/miscfs/kernfs [tls-earlyentropy]: kernfs_subr.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.56.2.1 src/sys/miscfs/deadfs/dead_vnops.c
cvs rdiff -u -r1.21 -r1.21.26.1 src/sys/miscfs/fdesc/fdesc.h
cvs rdiff -u -r1.88 -r1.88.2.1 src/sys/miscfs/fdesc/fdesc_vfsops.c
cvs rdiff -u -r1.119 -r1.119.2.1 src/sys/miscfs/fdesc/fdesc_vnops.c
cvs rdiff -u -r1.74 -r1.74.2.1 src/sys/miscfs/fifofs/fifo_vnops.c
cvs rdiff -u -r1.14 -r1.14.32.1 src/sys/miscfs/genfs/layer.h
cvs rdiff -u -r1.35 -r1.35.2.1 src/sys/miscfs/genfs/layer_extern.h \
src/sys/miscfs/genfs/layer_subr.c
cvs rdiff -u -r1.43 -r1.43.2.1 src/sys/miscfs/genfs/layer_vfsops.c
cvs rdiff -u -r1.57 -r1.57.2.1 src/sys/miscfs/genfs/layer_vnops.c
cvs rdiff -u -r1.4 -r1.4.34.1 src/sys/miscfs/kernfs/files.kernfs
cvs rdiff -u -r1.37 -r1.37.12.1 src/sys/miscfs/kernfs/kernfs.h
cvs rdiff -u -r1.26 -r0 src/sys/miscfs/kernfs/kernfs_subr.c
cvs rdiff -u -r1.93 -r1.93.2.1 src/sys/miscfs/kernfs/kernfs_vfsops.c
cvs rdiff -u -r1.150 -r1.150.2.1 src/sys/miscfs/kernfs/kernfs_vnops.c
cvs rdiff -u -r1.87 -r1.87.2.1 src/sys/miscfs/nullfs/null_vfsops.c
cvs rdiff -u -r1.60 -r1.60.2.1 src/sys/miscfs/overlay/overlay_vfsops.c
cvs rdiff -u -r1.69 -r1.69.2.1 src/sys/miscfs/procfs/procfs.h
cvs rdiff -u -r1.67 -r1.67.2.1 src/sys/miscfs/procfs/procfs_linux.c
cvs rdiff -u -r1.104 -r1.104.2.1 src/sys/miscfs/procfs/procfs_subr.c
cvs rdiff -u -r1.90 -r1.90.2.1 src/sys/miscfs/procfs/procfs_vfsops.c
cvs rdiff -u -r1.189 -r1.189.2.1 src/sys/miscfs/procfs/procfs_vnops.c
cvs rdiff -u -r1.143 -r1.143.2.1 src/sys/miscfs/specfs/spec_vnops.c
cvs rdiff -u -r1.42 -r1.42.2.1 src/sys/miscfs/specfs/specdev.h
cvs rdiff -u -r1.91 -r1.91.2.1 src/sys/miscfs/umapfs/umap_vfsops.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/miscfs/deadfs/dead_vnops.c
diff -u src/sys/miscfs/deadfs/dead_vnops.c:1.56 src/sys/miscfs/deadfs/dead_vnops.c:1.56.2.1
--- src/sys/miscfs/deadfs/dead_vnops.c:1.56 Thu Feb 27 16:51:38 2014
+++ src/sys/miscfs/deadfs/dead_vnops.c Sun Aug 10 06:56:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dead_vnops.c,v 1.56 2014/02/27 16:51:38 hannken Exp $ */
+/* $NetBSD: dead_vnops.c,v 1.56.2.1 2014/08/10 06:56:05 tls Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dead_vnops.c,v 1.56 2014/02/27 16:51:38 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: dead_vnops.c,v 1.56.2.1 2014/08/10 06:56:05 tls Exp $);
#include sys/param.h
#include sys/systm.h
@@ -87,6 +87,8 @@ const struct vnodeopv_entry_desc dead_vn
{ vop_close_desc, dead_close }, /* close */
{ vop_read_desc, dead_read }, /* read */
{ vop_write_desc, dead_write }, /* write */
+ { vop_fallocate_desc, genfs_eopnotsupp }, /* fallocate */
+ { vop_fdiscard_desc, genfs_eopnotsupp }, /* fdiscard */
{ vop_fcntl_desc, dead_fcntl }, /* fcntl */
{ vop_ioctl_desc, dead_ioctl }, /* ioctl */
{ vop_poll_desc, dead_poll }, /* poll */
Index: src/sys/miscfs/fdesc/fdesc.h
diff -u src/sys/miscfs/fdesc/fdesc.h:1.21 src/sys/miscfs/fdesc/fdesc.h:1.21.26.1
--- src/sys/miscfs/fdesc/fdesc.h:1.21 Tue Sep 27 01:22:12 2011
+++ src/sys/miscfs/fdesc/fdesc.h Sun Aug 10 06:56:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fdesc.h,v 1.21 2011/09/27 01:22:12 christos Exp $ */
+/* $NetBSD: fdesc.h,v 1.21.26.1 2014/08/10 06:56:05 tls Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -56,11 +56,10 @@ typedef enum {
} fdntype;
struct fdescnode {
- LIST_ENTRY(fdescnode) fd_hash; /* Hash list */
struct vnode *fd_vnode; /* Back ptr to vnode */
fdntype fd_type; /* Type of this node */
unsigned fd_fd; /* Fd to be dup'ed */
- char *fd_link; /* Link to fd/n */
+ const char *fd_link; /* Link to fd/n */
int fd_ix; /* filesystem index */
};
Index: src/sys/miscfs/fdesc/fdesc_vfsops.c
diff -u src/sys/miscfs/fdesc/fdesc_vfsops.c:1.88 src/sys/miscfs/fdesc/fdesc_vfsops.c:1.88.2.1
---
CVS commit: [tls-earlyentropy] src/sys/netbt
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:56:23 UTC 2014
Modified Files:
src/sys/netbt [tls-earlyentropy]: bluetooth.h bt_proto.c hci.h
hci_ioctl.c hci_link.c hci_socket.c hci_unit.c l2cap.h
l2cap_lower.c l2cap_socket.c l2cap_upper.c rfcomm.h rfcomm_dlc.c
rfcomm_session.c rfcomm_socket.c rfcomm_upper.c sco.h sco_socket.c
sco_upper.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.28.1 src/sys/netbt/bluetooth.h
cvs rdiff -u -r1.12 -r1.12.36.1 src/sys/netbt/bt_proto.c
cvs rdiff -u -r1.35 -r1.35.26.1 src/sys/netbt/hci.h
cvs rdiff -u -r1.10 -r1.10.32.1 src/sys/netbt/hci_ioctl.c
cvs rdiff -u -r1.23 -r1.23.26.1 src/sys/netbt/hci_link.c
cvs rdiff -u -r1.20 -r1.20.28.1 src/sys/netbt/hci_socket.c
cvs rdiff -u -r1.13 -r1.13.26.1 src/sys/netbt/hci_unit.c
cvs rdiff -u -r1.10 -r1.10.28.1 src/sys/netbt/l2cap.h
cvs rdiff -u -r1.9 -r1.9.54.1 src/sys/netbt/l2cap_lower.c
cvs rdiff -u -r1.10 -r1.10.2.1 src/sys/netbt/l2cap_socket.c
cvs rdiff -u -r1.11 -r1.11.36.1 src/sys/netbt/l2cap_upper.c
cvs rdiff -u -r1.9 -r1.9.36.1 src/sys/netbt/rfcomm.h \
src/sys/netbt/sco_upper.c
cvs rdiff -u -r1.7 -r1.7.26.1 src/sys/netbt/rfcomm_dlc.c
cvs rdiff -u -r1.18 -r1.18.26.1 src/sys/netbt/rfcomm_session.c
cvs rdiff -u -r1.11 -r1.11.2.1 src/sys/netbt/rfcomm_socket.c
cvs rdiff -u -r1.13 -r1.13.36.1 src/sys/netbt/rfcomm_upper.c
cvs rdiff -u -r1.3 -r1.3.54.1 src/sys/netbt/sco.h
cvs rdiff -u -r1.12 -r1.12.2.1 src/sys/netbt/sco_socket.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/netbt/bluetooth.h
diff -u src/sys/netbt/bluetooth.h:1.11 src/sys/netbt/bluetooth.h:1.11.28.1
--- src/sys/netbt/bluetooth.h:1.11 Wed Apr 27 00:36:48 2011
+++ src/sys/netbt/bluetooth.h Sun Aug 10 06:56:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bluetooth.h,v 1.11 2011/04/27 00:36:48 rmind Exp $ */
+/* $NetBSD: bluetooth.h,v 1.11.28.1 2014/08/10 06:56:23 tls Exp $ */
/*-
* Copyright (c) 2005 Iain Hibbert.
@@ -103,6 +103,8 @@ struct sockaddr_bt {
#ifdef _KERNEL
+#include sys/protosw.h
+
#include sys/mallocvar.h
MALLOC_DECLARE(M_BLUETOOTH);
@@ -120,6 +122,13 @@ struct btproto {
void (*input)(void *, struct mbuf *);
};
+extern const struct pr_usrreqs hci_usrreqs;
+extern const struct pr_usrreqs sco_usrreqs;
+extern const struct pr_usrreqs l2cap_usrreqs;
+extern const struct pr_usrreqs rfcomm_usrreqs;
+
+extern kmutex_t *bt_lock;
+
/*
* Debugging stuff
*/
@@ -147,8 +156,6 @@ extern int bluetooth_debug;
# define UNKNOWN(x) ((void)0)
#endif /* BLUETOOTH_DEBUG */
-extern kmutex_t *bt_lock;
-
#endif /* _KERNEL */
#endif /* _NETBT_BLUETOOTH_H_ */
Index: src/sys/netbt/bt_proto.c
diff -u src/sys/netbt/bt_proto.c:1.12 src/sys/netbt/bt_proto.c:1.12.36.1
--- src/sys/netbt/bt_proto.c:1.12 Sun Sep 13 18:45:11 2009
+++ src/sys/netbt/bt_proto.c Sun Aug 10 06:56:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bt_proto.c,v 1.12 2009/09/13 18:45:11 pooka Exp $ */
+/* $NetBSD: bt_proto.c,v 1.12.36.1 2014/08/10 06:56:23 tls Exp $ */
/*-
* Copyright (c) 2005 Iain Hibbert.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bt_proto.c,v 1.12 2009/09/13 18:45:11 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: bt_proto.c,v 1.12.36.1 2014/08/10 06:56:23 tls Exp $);
#include sys/param.h
#include sys/domain.h
@@ -62,17 +62,7 @@ PR_WRAP_CTLOUTPUT(rfcomm_ctloutput)
#define l2cap_ctloutput l2cap_ctloutput_wrapper
#define rfcomm_ctloutput rfcomm_ctloutput_wrapper
-PR_WRAP_USRREQ(hci_usrreq)
-PR_WRAP_USRREQ(sco_usrreq)
-PR_WRAP_USRREQ(l2cap_usrreq)
-PR_WRAP_USRREQ(rfcomm_usrreq)
-
-#define hci_usrreq hci_usrreq_wrapper
-#define sco_usrreq sco_usrreq_wrapper
-#define l2cap_usrreq l2cap_usrreq_wrapper
-#define rfcomm_usrreq rfcomm_usrreq_wrapper
-
-const struct protosw btsw[] = {
+static const struct protosw btsw[] = {
{ /* raw HCI commands */
.pr_type = SOCK_RAW,
.pr_domain = btdomain,
@@ -80,7 +70,7 @@ const struct protosw btsw[] = {
.pr_flags = (PR_ADDR | PR_ATOMIC),
.pr_init = hci_init,
.pr_ctloutput = hci_ctloutput,
- .pr_usrreq = hci_usrreq,
+ .pr_usrreqs = hci_usrreqs,
},
{ /* HCI SCO data (audio) */
.pr_type = SOCK_SEQPACKET,
@@ -88,7 +78,7 @@ const struct protosw btsw[] = {
.pr_protocol = BTPROTO_SCO,
.pr_flags = (PR_CONNREQUIRED | PR_ATOMIC | PR_LISTEN),
.pr_ctloutput = sco_ctloutput,
- .pr_usrreq = sco_usrreq,
+ .pr_usrreqs = sco_usrreqs,
},
{ /* L2CAP Connection Oriented */
.pr_type = SOCK_SEQPACKET,
@@ -96,7 +86,7 @@ const struct protosw btsw[] = {
.pr_protocol = BTPROTO_L2CAP,
.pr_flags = (PR_CONNREQUIRED | PR_ATOMIC | PR_LISTEN),
.pr_ctloutput = l2cap_ctloutput,
- .pr_usrreq = l2cap_usrreq,
+ .pr_usrreqs = l2cap_usrreqs,
.pr_init = l2cap_init,
},
{ /* RFCOMM */
@@ -105,7 +95,7 @@ const struct protosw btsw[] = {
.pr_protocol = BTPROTO_RFCOMM,
.pr_flags =
CVS commit: [tls-earlyentropy] src/sys/netinet6
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:56:30 UTC 2014
Modified Files:
src/sys/netinet6 [tls-earlyentropy]: icmp6.c in6.c in6.h in6_gif.c
in6_ifattach.c in6_pcb.c in6_pcb.h in6_proto.c in6_src.c in6_var.h
ip6_flow.c ip6_forward.c ip6_input.c ip6_mroute.c ip6_output.c
ip6_var.h ip6protosw.h mld6.c nd6.c nd6.h nd6_nbr.c nd6_rtr.c
raw_ip6.c scope6.c udp6_usrreq.c udp6_var.h
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.165.2.1 src/sys/netinet6/icmp6.c
cvs rdiff -u -r1.169 -r1.169.2.1 src/sys/netinet6/in6.c
cvs rdiff -u -r1.75 -r1.75.2.1 src/sys/netinet6/in6.h
cvs rdiff -u -r1.59 -r1.59.10.1 src/sys/netinet6/in6_gif.c
cvs rdiff -u -r1.89 -r1.89.2.1 src/sys/netinet6/in6_ifattach.c
cvs rdiff -u -r1.124 -r1.124.2.1 src/sys/netinet6/in6_pcb.c
cvs rdiff -u -r1.37 -r1.37.12.1 src/sys/netinet6/in6_pcb.h
cvs rdiff -u -r1.100 -r1.100.2.1 src/sys/netinet6/in6_proto.c
cvs rdiff -u -r1.53 -r1.53.12.1 src/sys/netinet6/in6_src.c
cvs rdiff -u -r1.68 -r1.68.2.1 src/sys/netinet6/in6_var.h
cvs rdiff -u -r1.22 -r1.22.2.1 src/sys/netinet6/ip6_flow.c
cvs rdiff -u -r1.72 -r1.72.4.1 src/sys/netinet6/ip6_forward.c
cvs rdiff -u -r1.145 -r1.145.2.1 src/sys/netinet6/ip6_input.c
cvs rdiff -u -r1.106 -r1.106.2.1 src/sys/netinet6/ip6_mroute.c
cvs rdiff -u -r1.155 -r1.155.2.1 src/sys/netinet6/ip6_output.c
cvs rdiff -u -r1.59 -r1.59.12.1 src/sys/netinet6/ip6_var.h
cvs rdiff -u -r1.21 -r1.21.54.1 src/sys/netinet6/ip6protosw.h
cvs rdiff -u -r1.55 -r1.55.22.1 src/sys/netinet6/mld6.c
cvs rdiff -u -r1.148 -r1.148.2.1 src/sys/netinet6/nd6.c
cvs rdiff -u -r1.58 -r1.58.6.1 src/sys/netinet6/nd6.h
cvs rdiff -u -r1.99 -r1.99.2.1 src/sys/netinet6/nd6_nbr.c
cvs rdiff -u -r1.90 -r1.90.2.1 src/sys/netinet6/nd6_rtr.c
cvs rdiff -u -r1.113 -r1.113.2.1 src/sys/netinet6/raw_ip6.c
cvs rdiff -u -r1.8 -r1.8.36.1 src/sys/netinet6/scope6.c
cvs rdiff -u -r1.93 -r1.93.2.1 src/sys/netinet6/udp6_usrreq.c
cvs rdiff -u -r1.25 -r1.25.12.1 src/sys/netinet6/udp6_var.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/netinet6/icmp6.c
diff -u src/sys/netinet6/icmp6.c:1.165 src/sys/netinet6/icmp6.c:1.165.2.1
--- src/sys/netinet6/icmp6.c:1.165 Tue Feb 25 18:30:12 2014
+++ src/sys/netinet6/icmp6.c Sun Aug 10 06:56:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp6.c,v 1.165 2014/02/25 18:30:12 pooka Exp $ */
+/* $NetBSD: icmp6.c,v 1.165.2.1 2014/08/10 06:56:30 tls Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -62,14 +62,14 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: icmp6.c,v 1.165 2014/02/25 18:30:12 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: icmp6.c,v 1.165.2.1 2014/08/10 06:56:30 tls Exp $);
#include opt_inet.h
#include opt_ipsec.h
#include sys/param.h
#include sys/systm.h
-#include sys/malloc.h
+#include sys/kmem.h
#include sys/mbuf.h
#include sys/protosw.h
#include sys/socket.h
@@ -253,10 +253,7 @@ icmp6_mtudisc_callback_register(void (*f
return;
}
- mc = malloc(sizeof(*mc), M_PCB, M_NOWAIT);
- if (mc == NULL)
- panic(icmp6_mtudisc_callback_register);
-
+ mc = kmem_alloc(sizeof(*mc), KM_SLEEP);
mc-mc_func = func;
LIST_INSERT_HEAD(icmp6_mtudisc_callbacks, mc, mc_list);
}
@@ -1135,8 +1132,8 @@ icmp6_mtudisc_update(struct ip6ctlparam
rt-rt_rmx.rmx_mtu = mtu;
}
}
- if (rt) { /* XXX: need braces to avoid conflict with else in RTFREE. */
- RTFREE(rt);
+ if (rt) {
+ rtfree(rt);
}
/*
@@ -1717,7 +1714,7 @@ ni6_store_addrs(struct icmp6_nodeinfo *n
struct icmp6_nodeinfo *nni6, struct ifnet *ifp0,
int resid)
{
- struct ifnet *ifp = ifp0 ? ifp0 : TAILQ_FIRST(ifnet);
+ struct ifnet *ifp = ifp0 ? ifp0 : IFNET_FIRST();
struct in6_ifaddr *ifa6;
struct ifaddr *ifa;
struct ifnet *ifp_dep = NULL;
@@ -2191,7 +2188,7 @@ icmp6_redirect_input(struct mbuf *m, int
ICMP6 redirect rejected; no route
with inet6 gateway found for redirect dst: %s\n,
icmp6_redirect_diag(src6, reddst6, redtgt6)));
- RTFREE(rt);
+ rtfree(rt);
goto bad;
}
@@ -2203,7 +2200,7 @@ icmp6_redirect_input(struct mbuf *m, int
%s\n,
ip6_sprintf(gw6),
icmp6_redirect_diag(src6, reddst6, redtgt6)));
- RTFREE(rt);
+ rtfree(rt);
goto bad;
}
} else {
@@ -2213,7 +2210,7 @@ icmp6_redirect_input(struct mbuf *m, int
icmp6_redirect_diag(src6, reddst6, redtgt6)));
goto bad;
}
- RTFREE(rt);
+ rtfree(rt);
rt = NULL;
}
if (IN6_IS_ADDR_MULTICAST(reddst6)) {
@@ -2319,7 +2316,8 @@ icmp6_redirect_input(struct mbuf *m, int
sockaddr_in6_init(sdst, reddst6, 0, 0, 0);
pfctlinput(PRC_REDIRECT_HOST, (struct sockaddr *)sdst);
#if defined(IPSEC)
- key_sa_routechange((struct sockaddr *)sdst);
+ if (ipsec_used)
+ key_sa_routechange((struct sockaddr *)sdst);
#endif
}
Index: src/sys/netinet6/in6.c
diff -u src/sys/netinet6/in6.c:1.169
CVS commit: [tls-earlyentropy] src/sys/net80211
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:56:18 UTC 2014
Modified Files:
src/sys/net80211 [tls-earlyentropy]: ieee80211_netbsd.c
ieee80211_netbsd.h ieee80211_rssadapt.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.25.2.1 src/sys/net80211/ieee80211_netbsd.c
cvs rdiff -u -r1.18 -r1.18.6.1 src/sys/net80211/ieee80211_netbsd.h
cvs rdiff -u -r1.18 -r1.18.2.1 src/sys/net80211/ieee80211_rssadapt.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/net80211/ieee80211_netbsd.c
diff -u src/sys/net80211/ieee80211_netbsd.c:1.25 src/sys/net80211/ieee80211_netbsd.c:1.25.2.1
--- src/sys/net80211/ieee80211_netbsd.c:1.25 Tue Feb 25 18:30:12 2014
+++ src/sys/net80211/ieee80211_netbsd.c Sun Aug 10 06:56:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_netbsd.c,v 1.25 2014/02/25 18:30:12 pooka Exp $ */
+/* $NetBSD: ieee80211_netbsd.c,v 1.25.2.1 2014/08/10 06:56:18 tls Exp $ */
/*-
* Copyright (c) 2003-2005 Sam Leffler, Errno Consulting
* All rights reserved.
@@ -30,7 +30,7 @@
#ifdef __FreeBSD__
__FBSDID($FreeBSD: src/sys/net80211/ieee80211_freebsd.c,v 1.8 2005/08/08 18:46:35 sam Exp $);
#else
-__KERNEL_RCSID(0, $NetBSD: ieee80211_netbsd.c,v 1.25 2014/02/25 18:30:12 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: ieee80211_netbsd.c,v 1.25.2.1 2014/08/10 06:56:18 tls Exp $);
#endif
/*
@@ -68,6 +68,8 @@ static struct ieee80211_node *ieee80211_
struct ieee80211_node_walk *, u_short);
static int ieee80211_sysctl_node(SYSCTLFN_ARGS);
+static void ieee80211_sysctl_setup(void);
+
#ifdef IEEE80211_DEBUG
int ieee80211_debug = 0;
#endif
@@ -81,6 +83,8 @@ ieee80211_init0(void)
{
ieee80211_setup_func * const *ieee80211_setup, f;
+ ieee80211_sysctl_setup();
+
if (max_linkhdr ALIGN(sizeof(struct ieee80211_qosframe_addr4))) {
max_linkhdr = ALIGN(sizeof(struct ieee80211_qosframe_addr4));
}
@@ -459,28 +463,32 @@ cleanup:
*
* TBD condition CTLFLAG_PERMANENT on being a module or not
*/
-SYSCTL_SETUP(sysctl_ieee80211, sysctl ieee80211 subtree setup)
+static struct sysctllog *ieee80211_sysctllog;
+static void
+ieee80211_sysctl_setup(void)
{
int rc;
const struct sysctlnode *cnode, *rnode;
- if ((rnode = ieee80211_sysctl_treetop(clog)) == NULL)
+ if ((rnode = ieee80211_sysctl_treetop(ieee80211_sysctllog)) == NULL)
return;
- if ((rc = sysctl_createv(clog, 0, rnode, NULL,
+ if ((rc = sysctl_createv(ieee80211_sysctllog, 0, rnode, NULL,
CTLFLAG_PERMANENT, CTLTYPE_NODE, nodes, client/peer stations,
ieee80211_sysctl_node, 0, NULL, 0, CTL_CREATE, CTL_EOL)) != 0)
goto err;
#ifdef IEEE80211_DEBUG
/* control debugging printfs */
- if ((rc = sysctl_createv(clog, 0, rnode, cnode,
+ if ((rc = sysctl_createv(ieee80211_sysctllog, 0, rnode, cnode,
CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT,
debug, SYSCTL_DESCR(control debugging printfs),
NULL, 0, ieee80211_debug, 0, CTL_CREATE, CTL_EOL)) != 0)
goto err;
#endif /* IEEE80211_DEBUG */
+ ieee80211_rssadapt_sysctl_setup(ieee80211_sysctllog);
+
return;
err:
printf(%s: sysctl_createv failed (rc = %d)\n, __func__, rc);
Index: src/sys/net80211/ieee80211_netbsd.h
diff -u src/sys/net80211/ieee80211_netbsd.h:1.18 src/sys/net80211/ieee80211_netbsd.h:1.18.6.1
--- src/sys/net80211/ieee80211_netbsd.h:1.18 Thu Jun 27 17:47:18 2013
+++ src/sys/net80211/ieee80211_netbsd.h Sun Aug 10 06:56:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_netbsd.h,v 1.18 2013/06/27 17:47:18 christos Exp $ */
+/* $NetBSD: ieee80211_netbsd.h,v 1.18.6.1 2014/08/10 06:56:18 tls Exp $ */
/*-
* Copyright (c) 2003-2005 Sam Leffler, Errno Consulting
* All rights reserved.
@@ -240,6 +240,8 @@ void ieee80211_sysctl_attach(struct ieee
void ieee80211_sysctl_detach(struct ieee80211com *);
void ieee80211_load_module(const char *);
+void ieee80211_rssadapt_sysctl_setup(struct sysctllog **);
+
void ieee80211_init(void);
#define IEEE80211_CRYPTO_SETUP(name)\
static void name(void); \
Index: src/sys/net80211/ieee80211_rssadapt.c
diff -u src/sys/net80211/ieee80211_rssadapt.c:1.18 src/sys/net80211/ieee80211_rssadapt.c:1.18.2.1
--- src/sys/net80211/ieee80211_rssadapt.c:1.18 Tue Feb 25 18:30:12 2014
+++ src/sys/net80211/ieee80211_rssadapt.c Sun Aug 10 06:56:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_rssadapt.c,v 1.18 2014/02/25 18:30:12 pooka Exp $ */
+/* $NetBSD: ieee80211_rssadapt.c,v 1.18.2.1 2014/08/10 06:56:18 tls Exp $ */
/*-
* Copyright (c) 2003, 2004 David Young. All rights reserved.
*
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#ifdef __NetBSD__
-__KERNEL_RCSID(0, $NetBSD: ieee80211_rssadapt.c,v 1.18 2014/02/25 18:30:12 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: ieee80211_rssadapt.c,v 1.18.2.1 2014/08/10 06:56:18 tls Exp $);
#endif
#include sys/param.h
@@ -141,8 +141,8 @@ sysctl_ieee80211_rssadapt_expavgctl(SYSC
*
* TBD condition CTLFLAG_PERMANENT on
CVS commit: [tls-earlyentropy] src/sys/netmpls
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:56:38 UTC 2014
Modified Files:
src/sys/netmpls [tls-earlyentropy]: mpls_proto.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.2.1 src/sys/netmpls/mpls_proto.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/netmpls/mpls_proto.c
diff -u src/sys/netmpls/mpls_proto.c:1.6 src/sys/netmpls/mpls_proto.c:1.6.2.1
--- src/sys/netmpls/mpls_proto.c:1.6 Tue Feb 25 18:30:12 2014
+++ src/sys/netmpls/mpls_proto.c Sun Aug 10 06:56:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mpls_proto.c,v 1.6 2014/02/25 18:30:12 pooka Exp $ */
+/* $NetBSD: mpls_proto.c,v 1.6.2.1 2014/08/10 06:56:38 tls Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mpls_proto.c,v 1.6 2014/02/25 18:30:12 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: mpls_proto.c,v 1.6.2.1 2014/08/10 06:56:38 tls Exp $);
#include opt_inet.h
#include opt_mbuftrace.h
@@ -49,8 +49,7 @@ __KERNEL_RCSID(0, $NetBSD: mpls_proto.c
struct ifqueue mplsintrq;
-static int mpls_usrreq(struct socket *, int, struct mbuf *, struct mbuf *,
- struct mbuf *, struct lwp *);
+static int mpls_attach(struct socket *, int);
static void sysctl_net_mpls_setup(struct sysctllog **);
#ifdef MBUFTRACE
@@ -62,7 +61,7 @@ int mpls_mapttl_inet = 1;
int mpls_mapttl_inet6 = 1;
int mpls_icmp_respond = 0;
int mpls_forwarding = 0;
-int mpls_accept = 0;
+int mpls_frame_accept = 0;
int mpls_mapprec_inet = 1;
int mpls_mapclass_inet6 = 1;
int mpls_rfc4182 = 1;
@@ -78,63 +77,184 @@ void mpls_init(void)
sysctl_net_mpls_setup(NULL);
}
-DOMAIN_DEFINE(mplsdomain);
-
-const struct protosw mplssw[] = {
- { .pr_domain = mplsdomain,
- .pr_init = mpls_init,
- },
- {
- .pr_type = SOCK_DGRAM,
- .pr_domain = mplsdomain,
- .pr_flags = PR_ATOMIC | PR_ADDR,
- .pr_usrreq = mpls_usrreq,
- },
- {
- .pr_type = SOCK_RAW,
- .pr_domain = mplsdomain,
- .pr_flags = PR_ATOMIC | PR_ADDR,
- .pr_usrreq = mpls_usrreq,
- },
-};
-
-struct domain mplsdomain = {
- .dom_family = PF_MPLS,
- .dom_name = MPLS,
- .dom_init = NULL,
- .dom_externalize = NULL,
- .dom_dispose = NULL,
- .dom_protosw = mplssw,
- .dom_protoswNPROTOSW = mplssw[__arraycount(mplssw)],
- .dom_rtattach = rt_inithead,
- .dom_rtoffset = offsetof(struct sockaddr_mpls, smpls_addr) 3,
- .dom_maxrtkey = sizeof(union mpls_shim),
- .dom_ifattach = NULL,
- .dom_ifdetach = NULL,
- .dom_ifqueues = { mplsintrq, NULL },
- .dom_link = { NULL },
- .dom_mowner = MOWNER_INIT(MPLS, ),
- .dom_sa_cmpofs = offsetof(struct sockaddr_mpls, smpls_addr),
- .dom_sa_cmplen = sizeof(union mpls_shim),
- .dom_rtcache = LIST_HEAD_INITIALIZER(mplsdomain.dom_rtcache)
-};
-
static int
-mpls_usrreq(struct socket *so, int req, struct mbuf *m,
-struct mbuf *nam, struct mbuf *control, struct lwp *l)
+mpls_attach(struct socket *so, int proto)
{
int error = EOPNOTSUPP;
- if ((req == PRU_ATTACH)
- (so-so_snd.sb_hiwat == 0 || so-so_rcv.sb_hiwat == 0)) {
- int s = splsoftnet();
+ sosetlock(so);
+ if (so-so_snd.sb_hiwat == 0 || so-so_rcv.sb_hiwat == 0) {
error = soreserve(so, 8192, 8192);
- splx(s);
}
-
return error;
}
+static void
+mpls_detach(struct socket *so)
+{
+}
+
+static int
+mpls_accept(struct socket *so, struct mbuf *nam)
+{
+ KASSERT(solocked(so));
+
+ return EOPNOTSUPP;
+}
+
+static int
+mpls_bind(struct socket *so, struct mbuf *nam, struct lwp *l)
+{
+ KASSERT(solocked(so));
+
+ return EOPNOTSUPP;
+}
+
+static int
+mpls_listen(struct socket *so, struct lwp *l)
+{
+ KASSERT(solocked(so));
+
+ return EOPNOTSUPP;
+}
+
+static int
+mpls_connect(struct socket *so, struct mbuf *nam, struct lwp *l)
+{
+ KASSERT(solocked(so));
+
+ return EOPNOTSUPP;
+}
+
+static int
+mpls_connect2(struct socket *so, struct socket *so2)
+{
+ KASSERT(solocked(so));
+
+ return EOPNOTSUPP;
+}
+
+static int
+mpls_disconnect(struct socket *so)
+{
+ KASSERT(solocked(so));
+
+ return EOPNOTSUPP;
+}
+
+static int
+mpls_shutdown(struct socket *so)
+{
+ KASSERT(solocked(so));
+
+ return EOPNOTSUPP;
+}
+
+static int
+mpls_abort(struct socket *so)
+{
+ KASSERT(solocked(so));
+
+ return EOPNOTSUPP;
+}
+
+static int
+mpls_ioctl(struct socket *so, u_long cmd, void *nam, struct ifnet *ifp)
+{
+ return EOPNOTSUPP;
+}
+
+static int
+mpls_stat(struct socket *so, struct stat *ub)
+{
+ KASSERT(solocked(so));
+
+ return EOPNOTSUPP;
+}
+
+static int
+mpls_peeraddr(struct socket *so, struct mbuf *nam)
+{
+ KASSERT(solocked(so));
+
+ return EOPNOTSUPP;
+}
+
+static int
+mpls_sockaddr(struct socket *so, struct mbuf *nam)
+{
+ KASSERT(solocked(so));
+
+ return EOPNOTSUPP;
+}
+
+static int
+mpls_rcvd(struct socket *so, int flags, struct lwp *l)
+{
+ KASSERT(solocked(so));
+
+ return EOPNOTSUPP;
+}
+
+static int
+mpls_recvoob(struct socket *so, struct mbuf *m, int flags)
+{
+ KASSERT(solocked(so));
+
+ return
CVS commit: [tls-earlyentropy] src/sys/netisdn
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:56:36 UTC 2014
Modified Files:
src/sys/netisdn [tls-earlyentropy]: i4b_ctl.c i4b_i4bdrv.c i4b_ipr.c
i4b_rbch.c i4b_tel.c i4b_trace.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.2.1 src/sys/netisdn/i4b_ctl.c
cvs rdiff -u -r1.38 -r1.38.2.1 src/sys/netisdn/i4b_i4bdrv.c
cvs rdiff -u -r1.35 -r1.35.32.1 src/sys/netisdn/i4b_ipr.c
cvs rdiff -u -r1.27 -r1.27.2.1 src/sys/netisdn/i4b_rbch.c
cvs rdiff -u -r1.26 -r1.26.2.1 src/sys/netisdn/i4b_tel.c
cvs rdiff -u -r1.21 -r1.21.2.1 src/sys/netisdn/i4b_trace.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/netisdn/i4b_ctl.c
diff -u src/sys/netisdn/i4b_ctl.c:1.23 src/sys/netisdn/i4b_ctl.c:1.23.2.1
--- src/sys/netisdn/i4b_ctl.c:1.23 Sun Mar 16 05:20:30 2014
+++ src/sys/netisdn/i4b_ctl.c Sun Aug 10 06:56:36 2014
@@ -27,7 +27,7 @@
* i4b_ctl.c - i4b system control port driver
* --
*
- * $Id: i4b_ctl.c,v 1.23 2014/03/16 05:20:30 dholland Exp $
+ * $Id: i4b_ctl.c,v 1.23.2.1 2014/08/10 06:56:36 tls Exp $
*
* $FreeBSD$
*
@@ -36,7 +36,7 @@
*---*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: i4b_ctl.c,v 1.23 2014/03/16 05:20:30 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: i4b_ctl.c,v 1.23.2.1 2014/08/10 06:56:36 tls Exp $);
#include isdnctl.h
@@ -164,6 +164,7 @@ const struct cdevsw isdnctl_cdevsw = {
.d_poll = nopoll,
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
+ .d_discard = nodiscard,
.d_flag = D_OTHER
};
#endif /* __NetBSD__ */
Index: src/sys/netisdn/i4b_i4bdrv.c
diff -u src/sys/netisdn/i4b_i4bdrv.c:1.38 src/sys/netisdn/i4b_i4bdrv.c:1.38.2.1
--- src/sys/netisdn/i4b_i4bdrv.c:1.38 Sun Mar 16 05:20:30 2014
+++ src/sys/netisdn/i4b_i4bdrv.c Sun Aug 10 06:56:36 2014
@@ -27,7 +27,7 @@
* i4b_i4bdrv.c - i4b userland interface driver
*
*
- * $Id: i4b_i4bdrv.c,v 1.38 2014/03/16 05:20:30 dholland Exp $
+ * $Id: i4b_i4bdrv.c,v 1.38.2.1 2014/08/10 06:56:36 tls Exp $
*
* $FreeBSD$
*
@@ -36,7 +36,7 @@
*---*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: i4b_i4bdrv.c,v 1.38 2014/03/16 05:20:30 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: i4b_i4bdrv.c,v 1.38.2.1 2014/08/10 06:56:36 tls Exp $);
#include isdn.h
@@ -206,6 +206,7 @@ const struct cdevsw isdn_cdevsw = {
.d_poll = isdnpoll,
.d_mmap = nommap,
.d_kqfilter = isdnkqfilter,
+ .d_discard = nodiscard,
.d_flag = D_OTHER
};
#endif /* __NetBSD__ */
Index: src/sys/netisdn/i4b_ipr.c
diff -u src/sys/netisdn/i4b_ipr.c:1.35 src/sys/netisdn/i4b_ipr.c:1.35.32.1
--- src/sys/netisdn/i4b_ipr.c:1.35 Mon Apr 5 07:22:50 2010
+++ src/sys/netisdn/i4b_ipr.c Sun Aug 10 06:56:36 2014
@@ -27,7 +27,7 @@
* i4b_ipr.c - isdn4bsd IP over raw HDLC ISDN network driver
* -
*
- * $Id: i4b_ipr.c,v 1.35 2010/04/05 07:22:50 joerg Exp $
+ * $Id: i4b_ipr.c,v 1.35.32.1 2014/08/10 06:56:36 tls Exp $
*
* $FreeBSD$
*
@@ -59,7 +59,7 @@
*---*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: i4b_ipr.c,v 1.35 2010/04/05 07:22:50 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: i4b_ipr.c,v 1.35.32.1 2014/08/10 06:56:36 tls Exp $);
#include irip.h
#include opt_irip.h
@@ -1074,20 +1074,11 @@ error:
}
#endif /* NBPFILTER 0 || NBPF 0 */
- if(IF_QFULL(ipintrq))
- {
- NDBGL4(L4_IPRDBG, %s: ipintrq full!, sc-sc_if.if_xname);
-
- IF_DROP(ipintrq);
+ if (__predict_false(!pktq_enqueue(ip_pktq, m, 0))) {
sc-sc_if.if_ierrors++;
sc-sc_if.if_iqdrops++;
m_freem(m);
}
- else
- {
- IF_ENQUEUE(ipintrq, m);
- schednetisr(NETISR_IP);
- }
}
/*---*
Index: src/sys/netisdn/i4b_rbch.c
diff -u src/sys/netisdn/i4b_rbch.c:1.27 src/sys/netisdn/i4b_rbch.c:1.27.2.1
--- src/sys/netisdn/i4b_rbch.c:1.27 Sun Mar 16 05:20:30 2014
+++ src/sys/netisdn/i4b_rbch.c Sun Aug 10 06:56:36 2014
@@ -27,7 +27,7 @@
* i4b_rbch.c - device driver for raw B channel data
* ---
*
- * $Id: i4b_rbch.c,v 1.27 2014/03/16 05:20:30 dholland Exp $
+ * $Id: i4b_rbch.c,v 1.27.2.1 2014/08/10 06:56:36 tls Exp $
*
* $FreeBSD$
*
@@ -36,7 +36,7 @@
*---*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: i4b_rbch.c,v 1.27 2014/03/16 05:20:30 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: i4b_rbch.c,v 1.27.2.1 2014/08/10 06:56:36 tls Exp $);
#include isdnbchan.h
@@ -200,6 +200,7 @@ const struct cdevsw isdnbchan_cdevsw = {
.d_poll = isdnbchanpoll,
.d_mmap =
CVS commit: [tls-earlyentropy] src/sys/netipsec
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:56:34 UTC 2014
Modified Files:
src/sys/netipsec [tls-earlyentropy]: ipsec.c ipsec.h ipsec_netbsd.c
key.c key.h keysock.c keysock.h xform_ipip.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.62.2.1 src/sys/netipsec/ipsec.c
cvs rdiff -u -r1.34 -r1.34.6.1 src/sys/netipsec/ipsec.h
cvs rdiff -u -r1.36 -r1.36.2.1 src/sys/netipsec/ipsec_netbsd.c
cvs rdiff -u -r1.86 -r1.86.2.1 src/sys/netipsec/key.c
cvs rdiff -u -r1.12 -r1.12.6.1 src/sys/netipsec/key.h
cvs rdiff -u -r1.21 -r1.21.26.1 src/sys/netipsec/keysock.c
cvs rdiff -u -r1.6 -r1.6.62.1 src/sys/netipsec/keysock.h
cvs rdiff -u -r1.29 -r1.29.6.1 src/sys/netipsec/xform_ipip.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/netipsec/ipsec.c
diff -u src/sys/netipsec/ipsec.c:1.62 src/sys/netipsec/ipsec.c:1.62.2.1
--- src/sys/netipsec/ipsec.c:1.62 Tue Dec 24 15:48:53 2013
+++ src/sys/netipsec/ipsec.c Sun Aug 10 06:56:34 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.c,v 1.62 2013/12/24 15:48:53 christos Exp $ */
+/* $NetBSD: ipsec.c,v 1.62.2.1 2014/08/10 06:56:34 tls Exp $ */
/* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $ */
/* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ipsec.c,v 1.62 2013/12/24 15:48:53 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: ipsec.c,v 1.62.2.1 2014/08/10 06:56:34 tls Exp $);
/*
* IPsec controller part.
@@ -106,6 +106,9 @@ __KERNEL_RCSID(0, $NetBSD: ipsec.c,v 1.
#include net/net_osdep.h
+int ipsec_used = 0;
+int ipsec_enabled = 1;
+
#ifdef IPSEC_DEBUG
int ipsec_debug = 1;
Index: src/sys/netipsec/ipsec.h
diff -u src/sys/netipsec/ipsec.h:1.34 src/sys/netipsec/ipsec.h:1.34.6.1
--- src/sys/netipsec/ipsec.h:1.34 Sat Jun 8 13:50:22 2013
+++ src/sys/netipsec/ipsec.h Sun Aug 10 06:56:34 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.h,v 1.34 2013/06/08 13:50:22 rmind Exp $ */
+/* $NetBSD: ipsec.h,v 1.34.6.1 2014/08/10 06:56:34 tls Exp $ */
/* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.h,v 1.2.4.2 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: ipsec.h,v 1.53 2001/11/20 08:32:38 itojun Exp $ */
@@ -354,6 +354,7 @@ int ipsec_clear_socket_cache(struct mbuf
void nat_t_ports_get(struct mbuf *, u_int16_t *, u_int16_t *);
+extern int ipsec_used __read_mostly, ipsec_enabled __read_mostly;
#endif /* _KERNEL */
Index: src/sys/netipsec/ipsec_netbsd.c
diff -u src/sys/netipsec/ipsec_netbsd.c:1.36 src/sys/netipsec/ipsec_netbsd.c:1.36.2.1
--- src/sys/netipsec/ipsec_netbsd.c:1.36 Tue Feb 25 18:30:12 2014
+++ src/sys/netipsec/ipsec_netbsd.c Sun Aug 10 06:56:34 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec_netbsd.c,v 1.36 2014/02/25 18:30:12 pooka Exp $ */
+/* $NetBSD: ipsec_netbsd.c,v 1.36.2.1 2014/08/10 06:56:34 tls Exp $ */
/* $KAME: esp_input.c,v 1.60 2001/09/04 08:43:19 itojun Exp $ */
/* $KAME: ah_input.c,v 1.64 2001/09/04 08:43:19 itojun Exp $ */
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ipsec_netbsd.c,v 1.36 2014/02/25 18:30:12 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: ipsec_netbsd.c,v 1.36.2.1 2014/08/10 06:56:34 tls Exp $);
#include opt_inet.h
#include opt_ipsec.h
@@ -473,6 +473,34 @@ sysctl_net_inet_ipip_stats(SYSCTLFN_ARGS
return (NETSTAT_SYSCTL(ipipstat_percpu, IPIP_NSTATS));
}
+static int
+sysctl_net_ipsec_enabled(SYSCTLFN_ARGS)
+{
+ int newenabled, error;
+ struct sysctlnode node;
+ node = *rnode;
+ node.sysctl_data = newenabled;
+
+ newenabled = ipsec_enabled;
+ error = sysctl_lookup(SYSCTLFN_CALL(node));
+ if (error || newp == NULL)
+ return error;
+
+ switch (newenabled) {
+ case 0:
+ if (key_get_used())
+ return EBUSY;
+ /*FALLTHROUGH*/
+ case 1:
+ case 2:
+ ipsec_enabled = newenabled;
+ key_update_used();
+ return 0;
+ default:
+ return EINVAL;
+ }
+}
+
/* XXX will need a different oid at parent */
SYSCTL_SETUP(sysctl_net_inet_ipsec_setup, sysctl net.inet.ipsec subtree setup)
{
@@ -660,6 +688,20 @@ SYSCTL_SETUP(sysctl_net_inet_ipsec_setup
sysctl_net_inet_ipsec_stats, 0, NULL, 0,
CTL_NET, PF_INET, ipproto_ipsec,
CTL_CREATE, CTL_EOL);
+ sysctl_createv(clog, 0, NULL, NULL,
+ CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
+ CTLTYPE_INT, enabled,
+ SYSCTL_DESCR(Enable IPSec processing),
+ sysctl_net_ipsec_enabled, 0, NULL, 0,
+ CTL_NET, PF_INET, ipproto_ipsec,
+ CTL_CREATE, CTL_EOL);
+ sysctl_createv(clog, 0, NULL, NULL,
+ CTLFLAG_PERMANENT|CTLFLAG_READONLY,
+ CTLTYPE_INT, used,
+ SYSCTL_DESCR(Is IPSec active?),
+ NULL, 0, ipsec_used, 0,
+ CTL_NET, PF_INET, ipproto_ipsec,
+ CTL_CREATE, CTL_EOL);
#ifdef IPSEC_DEBUG
sysctl_createv(clog, 0, NULL, NULL,
CVS commit: [tls-earlyentropy] src/sys/nfs
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:56:45 UTC 2014
Modified Files:
src/sys/nfs [tls-earlyentropy]: nfs.h nfs_node.c nfs_socket.c
nfs_subs.c nfs_var.h nfs_vfsops.c nfs_vnops.c nfsmount.h nfsnode.h
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.73.10.1 src/sys/nfs/nfs.h
cvs rdiff -u -r1.117 -r1.117.2.1 src/sys/nfs/nfs_node.c
cvs rdiff -u -r1.190 -r1.190.2.1 src/sys/nfs/nfs_socket.c
cvs rdiff -u -r1.225.2.1 -r1.225.2.2 src/sys/nfs/nfs_subs.c
cvs rdiff -u -r1.91 -r1.91.2.1 src/sys/nfs/nfs_var.h
cvs rdiff -u -r1.226 -r1.226.2.1 src/sys/nfs/nfs_vfsops.c
cvs rdiff -u -r1.304 -r1.304.2.1 src/sys/nfs/nfs_vnops.c
cvs rdiff -u -r1.51 -r1.51.28.1 src/sys/nfs/nfsmount.h
cvs rdiff -u -r1.72 -r1.72.32.1 src/sys/nfs/nfsnode.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/nfs/nfs.h
diff -u src/sys/nfs/nfs.h:1.73 src/sys/nfs/nfs.h:1.73.10.1
--- src/sys/nfs/nfs.h:1.73 Fri Mar 1 18:26:10 2013
+++ src/sys/nfs/nfs.h Sun Aug 10 06:56:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs.h,v 1.73 2013/03/01 18:26:10 joerg Exp $ */
+/* $NetBSD: nfs.h,v 1.73.10.1 2014/08/10 06:56:45 tls Exp $ */
/*
* Copyright (c) 1989, 1993, 1995
* The Regents of the University of California. All rights reserved.
@@ -238,39 +238,39 @@ struct mountd_exports_list {
* Stats structure
*/
struct nfsstats {
- int attrcache_hits;
- int attrcache_misses;
- int lookupcache_hits;
- int lookupcache_misses;
- int direofcache_hits;
- int direofcache_misses;
- int biocache_reads;
- int read_bios;
- int read_physios;
- int biocache_writes;
- int write_bios;
- int write_physios;
- int biocache_readlinks;
- int readlink_bios;
- int biocache_readdirs;
- int readdir_bios;
- int rpccnt[NFSSTATS_NPROCS];
- int rpcretries;
- int srvrpccnt[NFSSTATS_NPROCS];
- int srvrpc_errs;
- int srv_errs;
- int rpcrequests;
- int rpctimeouts;
- int rpcunexpected;
- int rpcinvalid;
- int srvcache_inproghits;
- int srvcache_idemdonehits;
- int srvcache_nonidemdonehits;
- int srvcache_misses;
- int __srvnqnfs_leases; /* unused */
- int __srvnqnfs_maxleases; /* unused */
- int __srvnqnfs_getleases; /* unused */
- int srvvop_writes;
+ uint32_t attrcache_hits;
+ uint32_t attrcache_misses;
+ uint32_t lookupcache_hits;
+ uint32_t lookupcache_misses;
+ uint32_t direofcache_hits;
+ uint32_t direofcache_misses;
+ uint32_t biocache_reads;
+ uint32_t read_bios;
+ uint32_t read_physios;
+ uint32_t biocache_writes;
+ uint32_t write_bios;
+ uint32_t write_physios;
+ uint32_t biocache_readlinks;
+ uint32_t readlink_bios;
+ uint32_t biocache_readdirs;
+ uint32_t readdir_bios;
+ uint32_t rpccnt[NFSSTATS_NPROCS];
+ uint32_t rpcretries;
+ uint32_t srvrpccnt[NFSSTATS_NPROCS];
+ uint32_t srvrpc_errs;
+ uint32_t srv_errs;
+ uint32_t rpcrequests;
+ uint32_t rpctimeouts;
+ uint32_t rpcunexpected;
+ uint32_t rpcinvalid;
+ uint32_t srvcache_inproghits;
+ uint32_t srvcache_idemdonehits;
+ uint32_t srvcache_nonidemdonehits;
+ uint32_t srvcache_misses;
+ uint32_t __srvnqnfs_leases; /* unused */
+ uint32_t __srvnqnfs_maxleases; /* unused */
+ uint32_t __srvnqnfs_getleases; /* unused */
+ uint32_t srvvop_writes;
};
/*
Index: src/sys/nfs/nfs_node.c
diff -u src/sys/nfs/nfs_node.c:1.117 src/sys/nfs/nfs_node.c:1.117.2.1
--- src/sys/nfs/nfs_node.c:1.117 Thu Feb 27 16:51:38 2014
+++ src/sys/nfs/nfs_node.c Sun Aug 10 06:56:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_node.c,v 1.117 2014/02/27 16:51:38 hannken Exp $ */
+/* $NetBSD: nfs_node.c,v 1.117.2.1 2014/08/10 06:56:45 tls Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nfs_node.c,v 1.117 2014/02/27 16:51:38 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: nfs_node.c,v 1.117.2.1 2014/08/10 06:56:45 tls Exp $);
#ifdef _KERNEL_OPT
#include opt_nfs.h
@@ -106,120 +106,36 @@ nfs_node_done(void)
workqueue_destroy(nfs_sillyworkq);
}
-struct fh_match {
- nfsfh_t *fhm_fhp;
- size_t fhm_fhsize;
- size_t fhm_fhoffset;
-};
-
-static int
-nfs_compare_nodes(void *ctx, const void *parent, const void *node)
-{
- const struct nfsnode * const pnp = parent;
- const struct nfsnode * const np = node;
-
- if (pnp-n_fhsize != np-n_fhsize)
- return np-n_fhsize - pnp-n_fhsize;
-
- return memcmp(np-n_fhp, pnp-n_fhp, np-n_fhsize);
-}
-
-static int
-nfs_compare_node_fh(void *ctx, const void *b, const void *key)
-{
- const struct nfsnode * const pnp = b;
- const struct fh_match * const fhm = key;
-
- if (pnp-n_fhsize != fhm-fhm_fhsize)
- return fhm-fhm_fhsize - pnp-n_fhsize;
-
- return memcmp(fhm-fhm_fhp, pnp-n_fhp, pnp-n_fhsize);
-}
-
-static const rb_tree_ops_t nfs_node_rbtree_ops = {
- .rbto_compare_nodes = nfs_compare_nodes,
- .rbto_compare_key = nfs_compare_node_fh,
- .rbto_node_offset = offsetof(struct nfsnode, n_rbnode),
- .rbto_context = NULL
-};
-
-void
-nfs_rbtinit(struct nfsmount *nmp)
-{
-
- rb_tree_init(nmp-nm_rbtree,
CVS commit: [tls-earlyentropy] src/sys/netnatm
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:56:41 UTC 2014
Modified Files:
src/sys/netnatm [tls-earlyentropy]: natm.c natm.h natm_pcb.c
natm_proto.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.28.1 src/sys/netnatm/natm.c
cvs rdiff -u -r1.11 -r1.11.28.1 src/sys/netnatm/natm.h
cvs rdiff -u -r1.14 -r1.14.28.1 src/sys/netnatm/natm_pcb.c \
src/sys/netnatm/natm_proto.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/netnatm/natm.c
diff -u src/sys/netnatm/natm.c:1.24 src/sys/netnatm/natm.c:1.24.28.1
--- src/sys/netnatm/natm.c:1.24 Wed Mar 9 22:06:42 2011
+++ src/sys/netnatm/natm.c Sun Aug 10 06:56:41 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: natm.c,v 1.24 2011/03/09 22:06:42 dyoung Exp $ */
+/* $NetBSD: natm.c,v 1.24.28.1 2014/08/10 06:56:41 tls Exp $ */
/*
* Copyright (c) 1996 Charles D. Cranor and Washington University.
@@ -30,14 +30,14 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: natm.c,v 1.24 2011/03/09 22:06:42 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: natm.c,v 1.24.28.1 2014/08/10 06:56:41 tls Exp $);
#include sys/param.h
+#include sys/kmem.h
#include sys/systm.h
#include sys/kernel.h
#include sys/domain.h
#include sys/ioctl.h
-#include sys/proc.h
#include sys/protosw.h
#include sys/mbuf.h
#include sys/socket.h
@@ -46,7 +46,6 @@ __KERNEL_RCSID(0, $NetBSD: natm.c,v 1.2
#include net/if.h
#include net/if_atm.h
#include net/netisr.h
-#include net/radix.h
#include net/route.h
#include netinet/in.h
@@ -59,252 +58,421 @@ u_long natm5_recvspace = 16*1024;
u_long natm0_sendspace = 16*1024;
u_long natm0_recvspace = 16*1024;
-/*
- * user requests
- */
+static int
+natm_attach(struct socket *so, int proto)
+{
+ int error = 0;
+ struct natmpcb *npcb;
-int natm_usrreq(so, req, m, nam, control, l)
+ KASSERT(so-so_pcb == NULL);
+ sosetlock(so);
-struct socket *so;
-int req;
-struct mbuf *m, *nam, *control;
-struct lwp *l;
+ if (so-so_snd.sb_hiwat == 0 || so-so_rcv.sb_hiwat == 0) {
+ if (proto == PROTO_NATMAAL5)
+ error = soreserve(so, natm5_sendspace, natm5_recvspace);
+ else
+ error = soreserve(so, natm0_sendspace, natm0_recvspace);
+ if (error)
+ return error;
+ }
+ npcb = npcb_alloc(true);
+ npcb-npcb_socket = so;
+ so-so_pcb = npcb;
+ return error;
+}
+static void
+natm_detach(struct socket *so)
{
- int error = 0, s, s2;
+ struct natmpcb *npcb = (struct natmpcb *)so-so_pcb;
+
+ /*
+ * we turn on 'drain' *before* we sofree.
+ */
+
+ npcb_free(npcb, NPCB_DESTROY); /* drain */
+ so-so_pcb = NULL;
+ /* sofree drops the lock */
+ sofree(so);
+ mutex_enter(softnet_lock);
+}
+
+static int
+natm_accept(struct socket *so, struct mbuf *nam)
+{
+ KASSERT(solocked(so));
+
+ return EOPNOTSUPP;
+}
+
+static int
+natm_bind(struct socket *so, struct mbuf *nam, struct lwp *l)
+{
+ KASSERT(solocked(so));
+
+ return EOPNOTSUPP;
+}
+
+static int
+natm_listen(struct socket *so, struct lwp *l)
+{
+ KASSERT(solocked(so));
+
+ return EOPNOTSUPP;
+}
+
+static int
+natm_connect(struct socket *so, struct mbuf *nam, struct lwp *l)
+{
+ int error = 0, s2;
+ struct natmpcb *npcb;
+ struct sockaddr_natm *snatm;
+ struct atm_pseudoioctl api;
+ struct atm_pseudohdr *aph;
+ struct ifnet *ifp;
+ int proto = so-so_proto-pr_protocol;
+
+ KASSERT(solocked(so));
+
+ /*
+ * validate nam and npcb
+ */
+
+ if (nam-m_len != sizeof(*snatm))
+ return EINVAL;
+ snatm = mtod(nam, struct sockaddr_natm *);
+ if (snatm-snatm_len != sizeof(*snatm) ||
+ (npcb-npcb_flags NPCB_FREE) == 0)
+ return EINVAL;
+ if (snatm-snatm_family != AF_NATM)
+ return EAFNOSUPPORT;
+
+ snatm-snatm_if[IFNAMSIZ-1] = '\0'; /* XXX ensure null termination
+ since ifunit() uses strcmp */
+
+ /*
+ * convert interface string to ifp, validate.
+ */
+
+ ifp = ifunit(snatm-snatm_if);
+ if (ifp == NULL || (ifp-if_flags IFF_RUNNING) == 0) {
+ return ENXIO;
+ }
+ if (ifp-if_output != atm_output) {
+ return EAFNOSUPPORT;
+ }
+
+ /*
+ * register us with the NATM PCB layer
+ */
+
+ if (npcb_add(npcb, ifp, snatm-snatm_vci, snatm-snatm_vpi) != npcb)
+ return EADDRINUSE;
+
+ /*
+ * enable rx
+ */
+
+ ATM_PH_FLAGS(api.aph) = (proto == PROTO_NATMAAL5) ? ATM_PH_AAL5 : 0;
+ ATM_PH_VPI(api.aph) = npcb-npcb_vpi;
+ ATM_PH_SETVCI(api.aph, npcb-npcb_vci);
+ api.rxhand = npcb;
+ s2 = splnet();
+ if (ifp-if_ioctl(ifp, SIOCATMENA, api) != 0) {
+ splx(s2);
+ npcb_free(npcb, NPCB_REMOVE);
+ return EIO;
+ }
+ splx(s2);
+
+ soisconnected(so);
+ return error;
+}
+
+static int
+natm_connect2(struct socket *so, struct socket *so2)
+{
+ KASSERT(solocked(so));
+
+ return EOPNOTSUPP;
+}
+
+static int
+natm_disconnect(struct socket *so)
+{
+ struct natmpcb *npcb = (struct natmpcb *)so-so_pcb;
+
+ KASSERT(solocked(so));
+ KASSERT(npcb != NULL);
+
+ if ((npcb-npcb_flags NPCB_CONNECTED) == 0) {
+ printf(natm: disconnected check\n);
+ return EIO;
+ }
+ ifp =
CVS commit: [tls-earlyentropy] src/sys/opencrypto
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:56:47 UTC 2014
Modified Files:
src/sys/opencrypto [tls-earlyentropy]: cryptodev.c cryptosoft.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.78.2.1 src/sys/opencrypto/cryptodev.c
cvs rdiff -u -r1.44 -r1.44.2.1 src/sys/opencrypto/cryptosoft.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/opencrypto/cryptodev.c
diff -u src/sys/opencrypto/cryptodev.c:1.78 src/sys/opencrypto/cryptodev.c:1.78.2.1
--- src/sys/opencrypto/cryptodev.c:1.78 Sun Mar 16 05:20:30 2014
+++ src/sys/opencrypto/cryptodev.c Sun Aug 10 06:56:47 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptodev.c,v 1.78 2014/03/16 05:20:30 dholland Exp $ */
+/* $NetBSD: cryptodev.c,v 1.78.2.1 2014/08/10 06:56:47 tls Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */
/* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */
@@ -64,7 +64,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cryptodev.c,v 1.78 2014/03/16 05:20:30 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: cryptodev.c,v 1.78.2.1 2014/08/10 06:56:47 tls Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1119,6 +1119,7 @@ struct cdevsw crypto_cdevsw = {
.d_poll = cryptoselect /*nopoll*/,
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
+ .d_discard = nodiscard,
.d_flag = D_OTHER
};
@@ -2084,6 +2085,8 @@ void cryptoattach(int);
void
cryptoattach(int num)
{
+ crypto_init();
+
pool_init(fcrpl, sizeof(struct fcrypt), 0, 0, 0, fcrpl,
NULL, IPL_NET); /* XXX IPL_NET (splcrypto) */
pool_init(csepl, sizeof(struct csession), 0, 0, 0, csepl,
Index: src/sys/opencrypto/cryptosoft.c
diff -u src/sys/opencrypto/cryptosoft.c:1.44 src/sys/opencrypto/cryptosoft.c:1.44.2.1
--- src/sys/opencrypto/cryptosoft.c:1.44 Wed Jan 1 16:06:01 2014
+++ src/sys/opencrypto/cryptosoft.c Sun Aug 10 06:56:47 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptosoft.c,v 1.44 2014/01/01 16:06:01 pgoyette Exp $ */
+/* $NetBSD: cryptosoft.c,v 1.44.2.1 2014/08/10 06:56:47 tls Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptosoft.c,v 1.2.2.1 2002/11/21 23:34:23 sam Exp $ */
/* $OpenBSD: cryptosoft.c,v 1.35 2002/04/26 08:43:50 deraadt Exp $ */
@@ -24,7 +24,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cryptosoft.c,v 1.44 2014/01/01 16:06:01 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: cryptosoft.c,v 1.44.2.1 2014/08/10 06:56:47 tls Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1333,6 +1333,9 @@ swcrypto_attach(device_t parent, device_
{
swcr_init();
+
+ if (!pmf_device_register(self, NULL, NULL))
+ aprint_error_dev(self, couldn't establish power handler\n);
}
int swcrypto_detach(device_t, int);
@@ -1340,6 +1343,7 @@ int swcrypto_detach(device_t, int);
int
swcrypto_detach(device_t self, int flag)
{
+ pmf_device_deregister(self);
if (swcr_id = 0)
crypto_unregister_all(swcr_id);
return 0;
CVS commit: [tls-earlyentropy] src/sys/netsmb
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:56:43 UTC 2014
Modified Files:
src/sys/netsmb [tls-earlyentropy]: smb_dev.c smb_trantcp.c
smb_trantcp.h
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.41.2.1 src/sys/netsmb/smb_dev.c
cvs rdiff -u -r1.44 -r1.44.26.1 src/sys/netsmb/smb_trantcp.c
cvs rdiff -u -r1.6 -r1.6.56.1 src/sys/netsmb/smb_trantcp.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/netsmb/smb_dev.c
diff -u src/sys/netsmb/smb_dev.c:1.41 src/sys/netsmb/smb_dev.c:1.41.2.1
--- src/sys/netsmb/smb_dev.c:1.41 Sun Mar 16 05:20:30 2014
+++ src/sys/netsmb/smb_dev.c Sun Aug 10 06:56:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: smb_dev.c,v 1.41 2014/03/16 05:20:30 dholland Exp $ */
+/* $NetBSD: smb_dev.c,v 1.41.2.1 2014/08/10 06:56:43 tls Exp $ */
/*
* Copyright (c) 2000-2001 Boris Popov
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: smb_dev.c,v 1.41 2014/03/16 05:20:30 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: smb_dev.c,v 1.41.2.1 2014/08/10 06:56:43 tls Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -95,6 +95,7 @@ const struct cdevsw nsmb_cdevsw = {
.d_poll = nopoll,
.d_mmap = nommap,
.d_kqfilter = nokqfilter,
+ .d_discard = nodiscard,
.d_flag = D_OTHER,
};
Index: src/sys/netsmb/smb_trantcp.c
diff -u src/sys/netsmb/smb_trantcp.c:1.44 src/sys/netsmb/smb_trantcp.c:1.44.26.1
--- src/sys/netsmb/smb_trantcp.c:1.44 Wed Aug 31 18:31:04 2011
+++ src/sys/netsmb/smb_trantcp.c Sun Aug 10 06:56:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: smb_trantcp.c,v 1.44 2011/08/31 18:31:04 plunky Exp $ */
+/* $NetBSD: smb_trantcp.c,v 1.44.26.1 2014/08/10 06:56:43 tls Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -61,12 +61,12 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: smb_trantcp.c,v 1.44 2011/08/31 18:31:04 plunky Exp $);
+__KERNEL_RCSID(0, $NetBSD: smb_trantcp.c,v 1.44.26.1 2014/08/10 06:56:43 tls Exp $);
#include sys/param.h
#include sys/systm.h
#include sys/kernel.h
-#include sys/malloc.h
+#include sys/kmem.h
#include sys/mbuf.h
#include sys/proc.h
#include sys/protosw.h
@@ -92,17 +92,14 @@ __KERNEL_RCSID(0, $NetBSD: smb_trantcp.
#include netsmb/smb_trantcp.h
#include netsmb/smb_subr.h
-#define M_NBDATA M_PCB
-
static int nb_tcpsndbuf = NB_SNDQ;
static int nb_tcprcvbuf = NB_RCVQ;
-static const struct timespec nb_timo = { 15, 0 }; /* XXX sysctl? */
#define nb_sosend(so,m,flags,l) (*(so)-so_send)(so, NULL, (struct uio *)0, \
m, (struct mbuf *)0, flags, l)
static int nbssn_recv(struct nbpcb *nbp, struct mbuf **mpp, int *lenp,
- u_int8_t *rpcodep, struct lwp *l);
+ u_int8_t *rpcodep, bool firstwait, struct lwp *l);
static int smb_nbst_disconnect(struct smb_vc *vcp, struct lwp *l);
static int
@@ -113,14 +110,6 @@ nb_setsockopt_int(struct socket *so, int
}
static int
-nbssn_rselect(struct nbpcb *nbp, const struct timespec *ts, int events,
- struct lwp *l)
-{
-
- return pollsock(nbp-nbp_tso, ts, events);
-}
-
-static int
nb_intr(struct nbpcb *nbp, struct lwp *l)
{
return 0;
@@ -184,8 +173,8 @@ nb_connect_in(struct nbpcb *nbp, struct
so-so_rcv.sb_flags |= SB_UPCALL;
so-so_rcv.sb_flags = ~SB_NOINTR;
so-so_snd.sb_flags = ~SB_NOINTR;
- so-so_rcv.sb_timeo = NB_SNDTIMEO;
- so-so_snd.sb_timeo = NB_RCVTIMEO;
+ so-so_rcv.sb_timeo = NB_RCVTIMEO * hz;
+ so-so_snd.sb_timeo = NB_RCVTIMEO * hz;
error = soreserve(so, nb_tcpsndbuf, nb_tcprcvbuf);
sounlock(so);
if (error)
@@ -250,15 +239,12 @@ nbssn_rq_request(struct nbpcb *nbp, stru
mb_done(mbp);
if (error)
return error;
- error = nbssn_rselect(nbp, nb_timo, POLLIN, l);
- if (error == EWOULDBLOCK) { /* Timeout */
- NBDEBUG((initial request timeout\n));
- return ETIMEDOUT;
- }
- if (error) /* restart or interrupt */
- return error;
- error = nbssn_recv(nbp, m0, rplen, rpcode, l);
+ error = nbssn_recv(nbp, m0, rplen, rpcode, true, l);
if (error) {
+ if (error == EWOULDBLOCK) { /* Timeout */
+ NBDEBUG((initial request timeout\n));
+ return ETIMEDOUT;
+ }
NBDEBUG((recv() error %d\n, error));
return error;
}
@@ -338,7 +324,7 @@ nbssn_recvhdr(struct nbpcb *nbp, int *le
static int
nbssn_recv(struct nbpcb *nbp, struct mbuf **mpp, int *lenp,
- u_int8_t *rpcodep, struct lwp *l)
+ u_int8_t *rpcodep, bool dowait, struct lwp *l)
{
struct socket *so = nbp-nbp_tso;
struct uio auio;
@@ -356,12 +342,13 @@ nbssn_recv(struct nbpcb *nbp, struct mbu
if (mpp)
*mpp = NULL;
m = NULL;
- for(;;) {
+ for(;; dowait = false) {
/*
* Poll for a response header.
* If we don't have one waiting, return.
*/
- error = nbssn_recvhdr(nbp, len, rpcode, MSG_DONTWAIT, l);
+ error = nbssn_recvhdr(nbp, len, rpcode,
+ dowait ? 0 : MSG_DONTWAIT, l);
if (so-so_state
(SS_ISDISCONNECTING | SS_ISDISCONNECTED | SS_CANTRCVMORE)) {
nbp-nbp_state =
CVS commit: [tls-earlyentropy] src/tests/dev
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:57:05 UTC 2014
Modified Files:
src/tests/dev/md [tls-earlyentropy]: Makefile
src/tests/dev/scsipi [tls-earlyentropy]: Makefile t_cd.c
src/tests/dev/sysmon [tls-earlyentropy]: Makefile
Added Files:
src/tests/dev/scsipi/libscsitest [tls-earlyentropy]: Makefile
SCSITEST.ioconf scsitest.c scsitest.h scsitest_component.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.6.1 src/tests/dev/md/Makefile
cvs rdiff -u -r1.3 -r1.3.22.1 src/tests/dev/scsipi/Makefile
cvs rdiff -u -r1.6 -r1.6.6.1 src/tests/dev/scsipi/t_cd.c
cvs rdiff -u -r0 -r1.3.4.2 src/tests/dev/scsipi/libscsitest/Makefile
cvs rdiff -u -r0 -r1.1.4.2 src/tests/dev/scsipi/libscsitest/SCSITEST.ioconf \
src/tests/dev/scsipi/libscsitest/scsitest.h \
src/tests/dev/scsipi/libscsitest/scsitest_component.c
cvs rdiff -u -r0 -r1.2.4.2 src/tests/dev/scsipi/libscsitest/scsitest.c
cvs rdiff -u -r1.2 -r1.2.22.1 src/tests/dev/sysmon/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/dev/md/Makefile
diff -u src/tests/dev/md/Makefile:1.3 src/tests/dev/md/Makefile:1.3.6.1
--- src/tests/dev/md/Makefile:1.3 Sun Dec 2 18:39:53 2012
+++ src/tests/dev/md/Makefile Sun Aug 10 06:57:05 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/12/02 18:39:53 pgoyette Exp $
+# $NetBSD: Makefile,v 1.3.6.1 2014/08/10 06:57:05 tls Exp $
#
.include bsd.own.mk
@@ -16,6 +16,7 @@ PROGS= h_mdserv
LDADD+= -lrumpdev_md -lrumpdev_disk -lrumpdev -lrumpvfs
LDADD+= -lrump
LDADD+= -lrumpuser
+LDADD+= -lrump
LDADD+= -lpthread
WARNS= 4
Index: src/tests/dev/scsipi/Makefile
diff -u src/tests/dev/scsipi/Makefile:1.3 src/tests/dev/scsipi/Makefile:1.3.22.1
--- src/tests/dev/scsipi/Makefile:1.3 Sat Sep 11 16:03:41 2010
+++ src/tests/dev/scsipi/Makefile Sun Aug 10 06:57:05 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/09/11 16:03:41 martin Exp $
+# $NetBSD: Makefile,v 1.3.22.1 2014/08/10 06:57:05 tls Exp $
#
.include bsd.own.mk
@@ -7,9 +7,18 @@ TESTSDIR= ${TESTSBASE}/dev/scsipi
TESTS_C= t_cd
-LDADD+= -lrumpdev_scsitest -lrumpdev_scsipi -lrumpdev_disk -lrumpdev -lrumpvfs
+CPPFLAGS+= -I${.CURDIR}/libscsitest
+
+# kernel component required by test
+SUBDIR= libscsitest
+SCSITESTDIR!= cd ${.CURDIR}/libscsitest ${PRINTOBJDIR}
+LDFLAGS+= -L${SCSITESTDIR}
+LDADD+= -Wl,--whole-archive -lrumpdev_scsitest -Wl,--no-whole-archive
+
+LDADD+= -lrumpdev_scsipi -lrumpdev_disk -lrumpdev -lrumpvfs
LDADD+= -lrump -lutil
LDADD+= -lrumpuser -lpthread
+LDADD+= -lrump
WARNS= 4
Index: src/tests/dev/scsipi/t_cd.c
diff -u src/tests/dev/scsipi/t_cd.c:1.6 src/tests/dev/scsipi/t_cd.c:1.6.6.1
--- src/tests/dev/scsipi/t_cd.c:1.6 Fri Mar 15 16:18:49 2013
+++ src/tests/dev/scsipi/t_cd.c Sun Aug 10 06:57:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_cd.c,v 1.6 2013/03/15 16:18:49 martin Exp $ */
+/* $NetBSD: t_cd.c,v 1.6.6.1 2014/08/10 06:57:05 tls Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -36,7 +36,8 @@
#include rump/rump.h
#include rump/rump_syscalls.h
-#include rump/scsitest.h
+
+#include scsitest.h
#include ../../h_macros.h
Index: src/tests/dev/sysmon/Makefile
diff -u src/tests/dev/sysmon/Makefile:1.2 src/tests/dev/sysmon/Makefile:1.2.22.1
--- src/tests/dev/sysmon/Makefile:1.2 Mon Dec 20 04:56:18 2010
+++ src/tests/dev/sysmon/Makefile Sun Aug 10 06:57:05 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/12/20 04:56:18 pgoyette Exp $
+# $NetBSD: Makefile,v 1.2.22.1 2014/08/10 06:57:05 tls Exp $
#
.include bsd.own.mk
@@ -9,7 +9,9 @@ TESTS_C= t_swwdog
LDADD+= -lrumpdev_sysmon -lrumpdev -lrumpvfs
LDADD+= -lrump
-LDADD+= -lrumpuser -lpthread
+LDADD+= -lrumpuser
+LDADD+= -lrump
+LDADD+= -lpthread
WARNS= 4
Added files:
Index: src/tests/dev/scsipi/libscsitest/Makefile
diff -u /dev/null src/tests/dev/scsipi/libscsitest/Makefile:1.3.4.2
--- /dev/null Sun Aug 10 06:57:05 2014
+++ src/tests/dev/scsipi/libscsitest/Makefile Sun Aug 10 06:57:05 2014
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.3.4.2 2014/08/10 06:57:05 tls Exp $
+#
+
+.include bsd.own.mk
+
+RUMPTOP= ${NETBSDSRCDIR}/sys/rump
+
+LIB= rumpdev_scsitest
+IOCONF= SCSITEST.ioconf
+LIBISPRIVATE= #defined
+
+SRCS= scsitest.c
+SRCS+= scsitest_component.c
+
+CPPFLAGS+= -I${.CURDIR} -I${RUMPTOP}/librump/rumpkern
+
+.include ${RUMPTOP}/Makefile.rump
+.include bsd.lib.mk
+.include bsd.klinks.mk
Index: src/tests/dev/scsipi/libscsitest/SCSITEST.ioconf
diff -u /dev/null src/tests/dev/scsipi/libscsitest/SCSITEST.ioconf:1.1.4.2
--- /dev/null Sun Aug 10 06:57:05 2014
+++ src/tests/dev/scsipi/libscsitest/SCSITEST.ioconf Sun Aug 10 06:57:05 2014
@@ -0,0 +1,12 @@
+# $NetBSD: SCSITEST.ioconf,v 1.1.4.2 2014/08/10 06:57:05 tls Exp $
+#
+
+ioconf scsitest
+
+include conf/files
+include dev/scsipi/files.scsipi
+include rump/dev/files.rump
+
+pseudo-root mainbus*
+
CVS commit: [tls-earlyentropy] src/sys/uvm
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:57:00 UTC 2014
Modified Files:
src/sys/uvm [tls-earlyentropy]: uvm_aobj.c uvm_bio.c uvm_extern.h
uvm_map.c uvm_page.c uvm_pglist.c uvm_swap.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.120.2.1 src/sys/uvm/uvm_aobj.c
cvs rdiff -u -r1.80 -r1.80.2.1 src/sys/uvm/uvm_bio.c
cvs rdiff -u -r1.189 -r1.189.2.1 src/sys/uvm/uvm_extern.h
cvs rdiff -u -r1.328 -r1.328.2.1 src/sys/uvm/uvm_map.c
cvs rdiff -u -r1.183.2.1 -r1.183.2.2 src/sys/uvm/uvm_page.c
cvs rdiff -u -r1.63 -r1.63.2.1 src/sys/uvm/uvm_pglist.c
cvs rdiff -u -r1.168 -r1.168.2.1 src/sys/uvm/uvm_swap.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/uvm/uvm_aobj.c
diff -u src/sys/uvm/uvm_aobj.c:1.120 src/sys/uvm/uvm_aobj.c:1.120.2.1
--- src/sys/uvm/uvm_aobj.c:1.120 Fri Oct 25 20:22:55 2013
+++ src/sys/uvm/uvm_aobj.c Sun Aug 10 06:57:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_aobj.c,v 1.120 2013/10/25 20:22:55 martin Exp $ */
+/* $NetBSD: uvm_aobj.c,v 1.120.2.1 2014/08/10 06:57:00 tls Exp $ */
/*
* Copyright (c) 1998 Chuck Silvers, Charles D. Cranor and
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_aobj.c,v 1.120 2013/10/25 20:22:55 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_aobj.c,v 1.120.2.1 2014/08/10 06:57:00 tls Exp $);
#include opt_uvmhist.h
@@ -146,6 +146,7 @@ struct uvm_aobj {
struct uao_swhash *u_swhash;
u_long u_swhashmask; /* mask for hashtable */
LIST_ENTRY(uvm_aobj) u_list; /* global list of aobjs */
+ int u_freelist; /* freelist to allocate pages from */
};
static void uao_free(struct uvm_aobj *);
@@ -161,6 +162,8 @@ static bool uao_pagein(struct uvm_aobj *
static bool uao_pagein_page(struct uvm_aobj *, int);
#endif /* defined(VMSWAP) */
+static struct vm_page *uao_pagealloc(struct uvm_object *, voff_t, int);
+
/*
* aobj_pager
*
@@ -436,6 +439,12 @@ uao_create(vsize_t size, int flags)
}
/*
+ * no freelist by default
+ */
+
+ aobj-u_freelist = VM_NFREELIST;
+
+ /*
* allocate hash/array if necessary
*
* note: in the KERNSWAP case no need to worry about locking since
@@ -490,6 +499,41 @@ uao_create(vsize_t size, int flags)
}
/*
+ * uao_set_pgfl: allocate pages only from the specified freelist.
+ *
+ * = must be called before any pages are allocated for the object.
+ * = reset by setting it to VM_NFREELIST, meaning any freelist.
+ */
+
+void
+uao_set_pgfl(struct uvm_object *uobj, int freelist)
+{
+ struct uvm_aobj *aobj = (struct uvm_aobj *)uobj;
+
+ KASSERTMSG((0 = freelist), invalid freelist %d, freelist);
+ KASSERTMSG((freelist = VM_NFREELIST), invalid freelist %d,
+ freelist);
+
+ aobj-u_freelist = freelist;
+}
+
+/*
+ * uao_pagealloc: allocate a page for aobj.
+ */
+
+static inline struct vm_page *
+uao_pagealloc(struct uvm_object *uobj, voff_t offset, int flags)
+{
+ struct uvm_aobj *aobj = (struct uvm_aobj *)uobj;
+
+ if (__predict_true(aobj-u_freelist == VM_NFREELIST))
+ return uvm_pagealloc(uobj, offset, NULL, flags);
+ else
+ return uvm_pagealloc_strat(uobj, offset, NULL, flags,
+ UVM_PGA_STRAT_ONLY, aobj-u_freelist);
+}
+
+/*
* uao_init: set up aobj pager subsystem
*
* = called at boot time from uvm_pager_init()
@@ -864,8 +908,8 @@ uao_get(struct uvm_object *uobj, voff_t
if (ptmp == NULL uao_find_swslot(uobj,
current_offset PAGE_SHIFT) == 0) {
-ptmp = uvm_pagealloc(uobj, current_offset,
-NULL, UVM_FLAG_COLORMATCH|UVM_PGA_ZERO);
+ptmp = uao_pagealloc(uobj, current_offset,
+UVM_FLAG_COLORMATCH|UVM_PGA_ZERO);
if (ptmp) {
/* new page */
ptmp-flags = ~(PG_FAKE);
@@ -959,8 +1003,7 @@ gotpage:
/* not resident? allocate one now (if we can) */
if (ptmp == NULL) {
-ptmp = uvm_pagealloc(uobj, current_offset,
-NULL, 0);
+ptmp = uao_pagealloc(uobj, current_offset, 0);
/* out of RAM? */
if (ptmp == NULL) {
Index: src/sys/uvm/uvm_bio.c
diff -u src/sys/uvm/uvm_bio.c:1.80 src/sys/uvm/uvm_bio.c:1.80.2.1
--- src/sys/uvm/uvm_bio.c:1.80 Fri Oct 25 20:23:33 2013
+++ src/sys/uvm/uvm_bio.c Sun Aug 10 06:57:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_bio.c,v 1.80 2013/10/25 20:23:33 martin Exp $ */
+/* $NetBSD: uvm_bio.c,v 1.80.2.1 2014/08/10 06:57:00 tls Exp $ */
/*
* Copyright (c) 1998 Chuck Silvers.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_bio.c,v 1.80 2013/10/25 20:23:33 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_bio.c,v 1.80.2.1 2014/08/10 06:57:00 tls Exp $);
#include opt_uvmhist.h
#include opt_ubc.h
@@ -210,6 +210,12 @@ ubc_init(void)
UVM_ADV_RANDOM, UVM_FLAG_NOMERGE)) != 0) {
panic(ubc_init: failed to map ubc_object);
}
+}
+
+void
+ubchist_init(void)
+{
+
UVMHIST_INIT(ubchist, 300);
}
Index: src/sys/uvm/uvm_extern.h
diff -u src/sys/uvm/uvm_extern.h:1.189
CVS commit: [tls-earlyentropy] src/sys/sys
Module Name:src Committed By: tls Date: Sun Aug 10 06:56:55 UTC 2014 Modified Files: src/sys/sys [tls-earlyentropy]: Makefile cdefs.h cdefs_elf.h conf.h cpu.h cpu_data.h dkio.h envsys.h exec_elf.h intr.h kcpuset.h lua.h lwp.h malloc.h mbuf.h mman.h module.h mount.h namei.h namei.src param.h pcq.h pcu.h pool.h protosw.h queue.h quotactl.h select.h signalvar.h sleepq.h socket.h socketvar.h syscall.h syscallargs.h sysctl.h syslog.h systm.h time.h tty.h ttydev.h un.h vnode.h vnode_if.h Added Files: src/sys/sys [tls-earlyentropy]: common_int_const.h common_int_fmtio.h common_int_limits.h common_int_mwgwtypes.h common_int_types.h ipi.h Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.148 -r1.148.2.1 src/sys/sys/Makefile cvs rdiff -u -r1.119 -r1.119.2.1 src/sys/sys/cdefs.h cvs rdiff -u -r1.43 -r1.43.10.1 src/sys/sys/cdefs_elf.h cvs rdiff -u -r0 -r1.1.2.2 src/sys/sys/common_int_const.h \ src/sys/sys/common_int_fmtio.h src/sys/sys/common_int_limits.h \ src/sys/sys/common_int_mwgwtypes.h src/sys/sys/common_int_types.h cvs rdiff -u -r1.144 -r1.144.10.1 src/sys/sys/conf.h cvs rdiff -u -r1.40 -r1.40.2.1 src/sys/sys/cpu.h cvs rdiff -u -r1.36 -r1.36.2.1 src/sys/sys/cpu_data.h cvs rdiff -u -r1.18 -r1.18.10.1 src/sys/sys/dkio.h cvs rdiff -u -r1.33 -r1.33.10.1 src/sys/sys/envsys.h cvs rdiff -u -r1.140 -r1.140.2.1 src/sys/sys/exec_elf.h cvs rdiff -u -r1.16 -r1.16.2.1 src/sys/sys/intr.h cvs rdiff -u -r0 -r1.2.2.2 src/sys/sys/ipi.h cvs rdiff -u -r1.10 -r1.10.2.1 src/sys/sys/kcpuset.h cvs rdiff -u -r1.3 -r1.3.2.1 src/sys/sys/lua.h cvs rdiff -u -r1.168 -r1.168.8.1 src/sys/sys/lwp.h cvs rdiff -u -r1.114 -r1.114.12.1 src/sys/sys/malloc.h cvs rdiff -u -r1.154 -r1.154.2.1 src/sys/sys/mbuf.h cvs rdiff -u -r1.45 -r1.45.2.1 src/sys/sys/mman.h cvs rdiff -u -r1.34 -r1.34.2.1 src/sys/sys/module.h cvs rdiff -u -r1.212 -r1.212.2.1 src/sys/sys/mount.h cvs rdiff -u -r1.87 -r1.87.10.1 src/sys/sys/namei.h cvs rdiff -u -r1.31 -r1.31.10.1 src/sys/sys/namei.src cvs rdiff -u -r1.450 -r1.450.2.1 src/sys/sys/param.h cvs rdiff -u -r1.1 -r1.1.48.1 src/sys/sys/pcq.h cvs rdiff -u -r1.11 -r1.11.2.1 src/sys/sys/pcu.h cvs rdiff -u -r1.75 -r1.75.12.1 src/sys/sys/pool.h cvs rdiff -u -r1.44 -r1.44.54.1 src/sys/sys/protosw.h cvs rdiff -u -r1.65 -r1.65.2.1 src/sys/sys/queue.h cvs rdiff -u -r1.36 -r1.36.10.1 src/sys/sys/quotactl.h cvs rdiff -u -r1.36 -r1.36.36.1 src/sys/sys/select.h cvs rdiff -u -r1.85 -r1.85.2.1 src/sys/sys/signalvar.h cvs rdiff -u -r1.22 -r1.22.12.1 src/sys/sys/sleepq.h cvs rdiff -u -r1.108 -r1.108.10.1 src/sys/sys/socket.h cvs rdiff -u -r1.131 -r1.131.2.1 src/sys/sys/socketvar.h cvs rdiff -u -r1.268 -r1.268.2.1 src/sys/sys/syscall.h cvs rdiff -u -r1.251 -r1.251.2.1 src/sys/sys/syscallargs.h cvs rdiff -u -r1.211 -r1.211.2.1 src/sys/sys/sysctl.h cvs rdiff -u -r1.35 -r1.35.10.1 src/sys/sys/syslog.h cvs rdiff -u -r1.263 -r1.263.2.1 src/sys/sys/systm.h cvs rdiff -u -r1.65 -r1.65.26.1 src/sys/sys/time.h cvs rdiff -u -r1.91 -r1.91.10.1 src/sys/sys/tty.h cvs rdiff -u -r1.9 -r1.9.136.1 src/sys/sys/ttydev.h cvs rdiff -u -r1.46 -r1.46.26.1 src/sys/sys/un.h cvs rdiff -u -r1.246 -r1.246.2.1 src/sys/sys/vnode.h cvs rdiff -u -r1.87 -r1.87.2.1 src/sys/sys/vnode_if.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/Makefile diff -u src/sys/sys/Makefile:1.148 src/sys/sys/Makefile:1.148.2.1 --- src/sys/sys/Makefile:1.148 Thu Mar 20 06:50:54 2014 +++ src/sys/sys/Makefile Sun Aug 10 06:56:54 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.148 2014/03/20 06:50:54 skrll Exp $ +# $NetBSD: Makefile,v 1.148.2.1 2014/08/10 06:56:54 tls Exp $ .include bsd.own.mk @@ -7,7 +7,10 @@ INCSDIR= /usr/include/sys INCS= acct.h agpio.h aio.h ansi.h aout_mids.h ataio.h atomic.h audioio.h \ bitops.h bootblock.h bswap.h buf.h \ callback.h callout.h cdbr.h cdefs.h cdefs_aout.h \ - cdefs_elf.h cdio.h chio.h clockctl.h condvar.h conf.h core.h \ + cdefs_elf.h cdio.h chio.h clockctl.h \ + common_int_const.h common_int_fmtio.h common_int_limits.h \ + common_int_mwgwtypes.h common_int_types.h \ + condvar.h conf.h core.h \ cpufreq.h cpuio.h ctype_bits.h ctype_inline.h \ device.h device_if.h \ dir.h dirent.h \ Index: src/sys/sys/cdefs.h diff -u src/sys/sys/cdefs.h:1.119 src/sys/sys/cdefs.h:1.119.2.1 --- src/sys/sys/cdefs.h:1.119 Thu Mar 13 20:36:01 2014 +++ src/sys/sys/cdefs.h Sun Aug 10 06:56:54 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: cdefs.h,v 1.119 2014/03/13 20:36:01 pooka Exp $ */ +/* $NetBSD: cdefs.h,v 1.119.2.1 2014/08/10 06:56:54 tls Exp $ */ /* * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. @@ -296,6 +296,12 @@ #define __noprofile /* nothing */ #endif +#if __GNUC_PREREQ__(4, 6) || defined(__clang__) +#define __unreachable() __builtin_unreachable() +#else +#define
CVS commit: [tls-earlyentropy] src/tests/fs
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:57:08 UTC 2014
Modified Files:
src/tests/fs [tls-earlyentropy]: Makefile
src/tests/fs/kernfs [tls-earlyentropy]: Makefile
src/tests/fs/msdosfs [tls-earlyentropy]: t_snapshot.c
src/tests/fs/nfs [tls-earlyentropy]: Makefile
src/tests/fs/nfs/nfsservice [tls-earlyentropy]: rumpnfsd.c
src/tests/fs/nullfs [tls-earlyentropy]: Makefile
src/tests/fs/ptyfs [tls-earlyentropy]: Makefile
src/tests/fs/puffs [tls-earlyentropy]: Makefile
src/tests/fs/umapfs [tls-earlyentropy]: Makefile
src/tests/fs/union [tls-earlyentropy]: Makefile
src/tests/fs/vfs [tls-earlyentropy]: t_renamerace.c t_vnops.c
Added Files:
src/tests/fs/cd9660 [tls-earlyentropy]: Makefile pr_48787.image.bz2.uue
t_high_ino_big_file.sh
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.16.1 src/tests/fs/Makefile
cvs rdiff -u -r0 -r1.1.4.2 src/tests/fs/cd9660/Makefile \
src/tests/fs/cd9660/pr_48787.image.bz2.uue
cvs rdiff -u -r0 -r1.4.2.2 src/tests/fs/cd9660/t_high_ino_big_file.sh
cvs rdiff -u -r1.3 -r1.3.22.1 src/tests/fs/kernfs/Makefile
cvs rdiff -u -r1.2 -r1.2.6.1 src/tests/fs/msdosfs/t_snapshot.c
cvs rdiff -u -r1.8 -r1.8.8.1 src/tests/fs/nfs/Makefile
cvs rdiff -u -r1.7 -r1.7.20.1 src/tests/fs/nfs/nfsservice/rumpnfsd.c
cvs rdiff -u -r1.3 -r1.3.22.1 src/tests/fs/nullfs/Makefile
cvs rdiff -u -r1.4 -r1.4.18.1 src/tests/fs/ptyfs/Makefile
cvs rdiff -u -r1.13 -r1.13.22.1 src/tests/fs/puffs/Makefile
cvs rdiff -u -r1.3 -r1.3.22.1 src/tests/fs/umapfs/Makefile
cvs rdiff -u -r1.3 -r1.3.22.1 src/tests/fs/union/Makefile
cvs rdiff -u -r1.30 -r1.30.2.1 src/tests/fs/vfs/t_renamerace.c
cvs rdiff -u -r1.38 -r1.38.2.1 src/tests/fs/vfs/t_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/Makefile
diff -u src/tests/fs/Makefile:1.22 src/tests/fs/Makefile:1.22.16.1
--- src/tests/fs/Makefile:1.22 Wed Dec 21 00:17:06 2011
+++ src/tests/fs/Makefile Sun Aug 10 06:57:07 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2011/12/21 00:17:06 christos Exp $
+# $NetBSD: Makefile,v 1.22.16.1 2014/08/10 06:57:07 tls Exp $
.include bsd.own.mk
@@ -8,7 +8,7 @@ SUBDIR+= common .WAIT
TESTS_SUBDIRS+= ffs fifofs hfs kernfs lfs msdosfs nfs nullfs psshfs ptyfs puffs
TESTS_SUBDIRS+= tmpfs umapfs union
-TESTS_SUBDIRS+= vfs
+TESTS_SUBDIRS+= vfs cd9660
.if ${MKZFS} != no
TESTS_SUBDIRS+= zfs
Index: src/tests/fs/kernfs/Makefile
diff -u src/tests/fs/kernfs/Makefile:1.3 src/tests/fs/kernfs/Makefile:1.3.22.1
--- src/tests/fs/kernfs/Makefile:1.3 Tue Jun 8 10:43:40 2010
+++ src/tests/fs/kernfs/Makefile Sun Aug 10 06:57:07 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/06/08 10:43:40 pooka Exp $
+# $NetBSD: Makefile,v 1.3.22.1 2014/08/10 06:57:07 tls Exp $
#
TESTSDIR= ${TESTSBASE}/fs/kernfs
@@ -9,6 +9,6 @@ TESTS_C= t_basic
.include bsd.own.mk
LDADD+= -lrumpfs_kernfs # fs driver
-LDADD+= -lrumpvfs -lrump -lrumpuser -lpthread # base
+LDADD+= -lrumpvfs -lrump -lrumpuser -lrump -lpthread # base
.include bsd.test.mk
Index: src/tests/fs/msdosfs/t_snapshot.c
diff -u src/tests/fs/msdosfs/t_snapshot.c:1.2 src/tests/fs/msdosfs/t_snapshot.c:1.2.6.1
--- src/tests/fs/msdosfs/t_snapshot.c:1.2 Wed Feb 6 09:05:01 2013
+++ src/tests/fs/msdosfs/t_snapshot.c Sun Aug 10 06:57:07 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_snapshot.c,v 1.2 2013/02/06 09:05:01 hannken Exp $ */
+/* $NetBSD: t_snapshot.c,v 1.2.6.1 2014/08/10 06:57:07 tls Exp $ */
#include sys/types.h
#include sys/mount.h
@@ -40,9 +40,7 @@ mount_diskfs(const char *fspec, const ch
static void
begin(void)
{
- struct tmpfs_args targs;
-
- targs.ta_version = TMPFS_ARGS_VERSION;
+ struct tmpfs_args targs = { .ta_version = TMPFS_ARGS_VERSION, };
if (rump_sys_mkdir(/stor, 0777) == -1)
atf_tc_fail_errno(mkdir /stor);
Index: src/tests/fs/nfs/Makefile
diff -u src/tests/fs/nfs/Makefile:1.8 src/tests/fs/nfs/Makefile:1.8.8.1
--- src/tests/fs/nfs/Makefile:1.8 Fri Feb 24 13:53:46 2012
+++ src/tests/fs/nfs/Makefile Sun Aug 10 06:57:07 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/02/24 13:53:46 joerg Exp $
+# $NetBSD: Makefile,v 1.8.8.1 2014/08/10 06:57:07 tls Exp $
#
.include bsd.own.mk
@@ -22,7 +22,7 @@ LDADD+=-lrumpfs_ffs -lrumpvfs
LDADD+=-lrumpdev_disk -lrumpdev # disk device
LDADD+=-lrumpnet_shmif # shmif
LDADD+=-lrumpnet_netinet -lrumpnet_net -lrumpnet
-LDADD+=-lrump -lrumpuser -lpthread # base
+LDADD+=-lrump -lrumpuser -lrump -lpthread # base
LDADD+=-lutil
Index: src/tests/fs/nfs/nfsservice/rumpnfsd.c
diff -u src/tests/fs/nfs/nfsservice/rumpnfsd.c:1.7 src/tests/fs/nfs/nfsservice/rumpnfsd.c:1.7.20.1
--- src/tests/fs/nfs/nfsservice/rumpnfsd.c:1.7 Mon Feb 28 21:21:14 2011
+++
CVS commit: [tls-earlyentropy] src/tests/ipf
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:57:10 UTC 2014
Modified Files:
src/tests/ipf [tls-earlyentropy]: t_filter_parse.sh t_nat_exec.sh
t_nat_parse.sh
src/tests/ipf/expected [tls-earlyentropy]: Makefile in2
src/tests/ipf/input [tls-earlyentropy]: Makefile
src/tests/ipf/regress [tls-earlyentropy]: Makefile
Added Files:
src/tests/ipf/expected [tls-earlyentropy]: in100_6 in101_6 in102_6
in1_6 in2_6 in3_6 in4_6 in5_6 in6_6 in8_6
src/tests/ipf/regress [tls-earlyentropy]: in100_6 in101_6 in102_6 in1_6
in2_6 in3_6 in4_6 in5_6 in6_6 in8_6
Removed Files:
src/tests/ipf/input [tls-earlyentropy]: n17_6
src/tests/ipf/regress [tls-earlyentropy]: n17_6
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.6.1 src/tests/ipf/t_filter_parse.sh
cvs rdiff -u -r1.18 -r1.18.4.1 src/tests/ipf/t_nat_exec.sh
cvs rdiff -u -r1.6 -r1.6.8.1 src/tests/ipf/t_nat_parse.sh
cvs rdiff -u -r1.6 -r1.6.8.1 src/tests/ipf/expected/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/tests/ipf/expected/in100_6 \
src/tests/ipf/expected/in101_6 src/tests/ipf/expected/in102_6 \
src/tests/ipf/expected/in1_6 src/tests/ipf/expected/in3_6 \
src/tests/ipf/expected/in4_6 src/tests/ipf/expected/in5_6 \
src/tests/ipf/expected/in6_6 src/tests/ipf/expected/in8_6
cvs rdiff -u -r1.4 -r1.4.8.1 src/tests/ipf/expected/in2
cvs rdiff -u -r0 -r1.2.2.2 src/tests/ipf/expected/in2_6
cvs rdiff -u -r1.6 -r1.6.8.1 src/tests/ipf/input/Makefile
cvs rdiff -u -r1.3 -r0 src/tests/ipf/input/n17_6
cvs rdiff -u -r1.6 -r1.6.8.1 src/tests/ipf/regress/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/tests/ipf/regress/in100_6 \
src/tests/ipf/regress/in101_6 src/tests/ipf/regress/in102_6 \
src/tests/ipf/regress/in1_6 src/tests/ipf/regress/in2_6 \
src/tests/ipf/regress/in3_6 src/tests/ipf/regress/in4_6 \
src/tests/ipf/regress/in5_6 src/tests/ipf/regress/in6_6 \
src/tests/ipf/regress/in8_6
cvs rdiff -u -r1.3 -r0 src/tests/ipf/regress/n17_6
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/ipf/t_filter_parse.sh
diff -u src/tests/ipf/t_filter_parse.sh:1.10 src/tests/ipf/t_filter_parse.sh:1.10.6.1
--- src/tests/ipf/t_filter_parse.sh:1.10 Sun Mar 17 03:00:05 2013
+++ src/tests/ipf/t_filter_parse.sh Sun Aug 10 06:57:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: t_filter_parse.sh,v 1.10 2013/03/17 03:00:05 jmmv Exp $
+# $NetBSD: t_filter_parse.sh,v 1.10.6.1 2014/08/10 06:57:10 tls Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -101,7 +101,7 @@ test_case i15 itest text ipf
test_case i16 itest text ipf
failing_test_case i17 itest Known to be broken text ipftest
test_case i18 itest text ipf
-test_case i19 itest_i19 PR kern/47262 Proto-family missing from logs text ipf
+test_case i19 itest_i19 text ipf
test_case i20 itest text ipf
test_case i21 itest text ipf
test_case i22 itest text ipf
Index: src/tests/ipf/t_nat_exec.sh
diff -u src/tests/ipf/t_nat_exec.sh:1.18 src/tests/ipf/t_nat_exec.sh:1.18.4.1
--- src/tests/ipf/t_nat_exec.sh:1.18 Thu May 16 07:43:02 2013
+++ src/tests/ipf/t_nat_exec.sh Sun Aug 10 06:57:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: t_nat_exec.sh,v 1.18 2013/05/16 07:43:02 martin Exp $
+# $NetBSD: t_nat_exec.sh,v 1.18.4.1 2014/08/10 06:57:10 tls Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -67,8 +67,8 @@ test_case n4 nattest text text
test_case n5 nattest text text
test_case n6 nattest text text
test_case n7 nattest text text
-failing_test_case_be n8 nattest See PR kern/47665 hex hex -T update_ipid=0
-failing_test_case_be n9 nattest See PR kern/47665 hex hex -T update_ipid=0
+test_case n8 nattest hex hex -T update_ipid=0
+test_case n9 nattest hex hex -T update_ipid=0
test_case n10 nattest hex hex -T update_ipid=0
test_case n11 nattest text text
failing_test_case n12 nattest Known to be broken hex hex -T update_ipid=0 -v
@@ -97,7 +97,6 @@ failing_test_case_be n9_6 nattest See P
test_case n11_6 nattest text text -6
test_case n12_6 nattest hex hex -6
test_case n15_6 nattest text text -6
-failing_test_case n17_6 nattest Test golden output file missing hex hex -6
atf_init_test_cases()
{
@@ -138,6 +137,4 @@ atf_init_test_cases()
atf_add_test_case n11_6
atf_add_test_case n12_6
atf_add_test_case n15_6
- atf_add_test_case n17_6
-
}
Index: src/tests/ipf/t_nat_parse.sh
diff -u src/tests/ipf/t_nat_parse.sh:1.6 src/tests/ipf/t_nat_parse.sh:1.6.8.1
--- src/tests/ipf/t_nat_parse.sh:1.6 Sun Jul 8 00:48:29 2012
+++ src/tests/ipf/t_nat_parse.sh Sun Aug 10 06:57:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: t_nat_parse.sh,v 1.6 2012/07/08 00:48:29 pgoyette Exp $
+# $NetBSD: t_nat_parse.sh,v 1.6.8.1 2014/08/10 06:57:10 tls Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -38,7 +38,7 @@ intest()
CVS commit: [tls-earlyentropy] src/tests/bin/sh
Module Name:src Committed By: tls Date: Sun Aug 10 06:57:03 UTC 2014 Modified Files: src/tests/bin/sh [tls-earlyentropy]: Makefile Added Files: src/tests/bin/sh/dotcmd [tls-earlyentropy]: Makefile scoped_command t_dotcmd.sh src/tests/bin/sh/dotcmd/out [tls-earlyentropy]: case_break_case.out case_break_compound.out case_break_file.out case_break_for.out case_break_func.out case_break_subshell.out case_break_until.out case_break_while.out case_continue_case.out case_continue_compound.out case_continue_file.out case_continue_for.out case_continue_func.out case_continue_subshell.out case_continue_until.out case_continue_while.out case_return_case.out case_return_compound.out case_return_file.out case_return_for.out case_return_func.out case_return_subshell.out case_return_until.out case_return_while.out compound_break_case.out compound_break_compound.out compound_break_file.out compound_break_for.out compound_break_func.out compound_break_subshell.out compound_break_until.out compound_break_while.out compound_continue_case.out compound_continue_compound.out compound_continue_file.out compound_continue_for.out compound_continue_func.out compound_continue_subshell.out compound_continue_until.out compound_continue_while.out compound_return_case.out compound_return_compound.out compound_return_file.out compound_return_for.out compound_return_func.out compound_return_subshell.out compound_return_until.out compound_return_while.out file_break_case.out file_break_compound.out file_break_file.out file_break_for.out file_break_func.out file_break_subshell.out file_break_until.out file_break_while.out file_continue_case.out file_continue_compound.out file_continue_file.out file_continue_for.out file_continue_func.out file_continue_subshell.out file_continue_until.out file_continue_while.out file_return_case.out file_return_compound.out file_return_file.out file_return_for.out file_return_func.out file_return_subshell.out file_return_until.out file_return_while.out for_break_case.out for_break_compound.out for_break_file.out for_break_for.out for_break_func.out for_break_subshell.out for_break_until.out for_break_while.out for_continue_case.out for_continue_compound.out for_continue_file.out for_continue_for.out for_continue_func.out for_continue_subshell.out for_continue_until.out for_continue_while.out for_return_case.out for_return_compound.out for_return_file.out for_return_for.out for_return_func.out for_return_subshell.out for_return_until.out for_return_while.out func_break_case.out func_break_compound.out func_break_file.out func_break_for.out func_break_func.out func_break_subshell.out func_break_until.out func_break_while.out func_continue_case.out func_continue_compound.out func_continue_file.out func_continue_for.out func_continue_func.out func_continue_subshell.out func_continue_until.out func_continue_while.out func_return_case.out func_return_compound.out func_return_file.out func_return_for.out func_return_func.out func_return_subshell.out func_return_until.out func_return_while.out subshell_break_case.out subshell_break_compound.out subshell_break_file.out subshell_break_for.out subshell_break_func.out subshell_break_subshell.out subshell_break_until.out subshell_break_while.out subshell_continue_case.out subshell_continue_compound.out subshell_continue_file.out subshell_continue_for.out subshell_continue_func.out subshell_continue_subshell.out subshell_continue_until.out subshell_continue_while.out subshell_return_case.out subshell_return_compound.out subshell_return_file.out subshell_return_for.out subshell_return_func.out subshell_return_subshell.out subshell_return_until.out subshell_return_while.out until_break_case.out until_break_compound.out until_break_file.out until_break_for.out until_break_func.out until_break_subshell.out until_break_until.out until_break_while.out until_continue_case.out until_continue_compound.out until_continue_file.out until_continue_for.out until_continue_func.out until_continue_subshell.out until_continue_until.out until_continue_while.out until_return_case.out until_return_compound.out
CVS commit: [tls-earlyentropy] src/tests/kernel
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:57:19 UTC 2014
Modified Files:
src/tests/kernel [tls-earlyentropy]: Makefile t_kauth_pr_47598.c
src/tests/kernel/tty [tls-earlyentropy]: Makefile
Added Files:
src/tests/kernel [tls-earlyentropy]: t_sysctl.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.33.4.1 -r1.33.4.2 src/tests/kernel/Makefile
cvs rdiff -u -r1.2 -r1.2.8.1 src/tests/kernel/t_kauth_pr_47598.c
cvs rdiff -u -r0 -r1.1.2.2 src/tests/kernel/t_sysctl.c
cvs rdiff -u -r1.1 -r1.1.22.1 src/tests/kernel/tty/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/kernel/Makefile
diff -u src/tests/kernel/Makefile:1.33.4.1 src/tests/kernel/Makefile:1.33.4.2
--- src/tests/kernel/Makefile:1.33.4.1 Mon Apr 7 19:32:15 2014
+++ src/tests/kernel/Makefile Sun Aug 10 06:57:19 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33.4.1 2014/04/07 19:32:15 tls Exp $
+# $NetBSD: Makefile,v 1.33.4.2 2014/08/10 06:57:19 tls Exp $
NOMAN= # defined
@@ -14,6 +14,7 @@ TESTS_C+= t_mqueue
TESTS_C+= t_sysv
TESTS_C+= t_subr_prf
TESTS_C+= t_kauth_pr_47598
+TESTS_C+= t_sysctl
TESTS_SH= t_umount
TESTS_SH+= t_umountstress
@@ -32,9 +33,11 @@ TESTS_SUBDIRS+= tty
TESTS_C+= t_extattrctl
TESTS_C+= t_filedesc
TESTS_C+= t_rnd
-LDADD.t_extattrctl+= -lrumpvfs -lrump -lrumpuser -lpthread
+LDADD.t_extattrctl+= -lrumpvfs -lrump -lrumpuser
+LDADD.t_extattrctl+= -lrump -lpthread
LDADD.t_filedesc+= ${LDADD.t_rnd}
-LDADD.t_rnd+= -lrumpvfs -lrumpdev_rnd -lrumpdev -lrump -lrumpuser -lpthread
+LDADD.t_rnd+= -lrumpvfs -lrumpdev_rnd -lrumpdev -lrump -lrumpuser
+LDADD.t_rnd+= -lrump -lpthread
.endif
Index: src/tests/kernel/t_kauth_pr_47598.c
diff -u src/tests/kernel/t_kauth_pr_47598.c:1.2 src/tests/kernel/t_kauth_pr_47598.c:1.2.8.1
--- src/tests/kernel/t_kauth_pr_47598.c:1.2 Thu Feb 28 20:41:21 2013
+++ src/tests/kernel/t_kauth_pr_47598.c Sun Aug 10 06:57:19 2014
@@ -27,7 +27,7 @@
#include sys/cdefs.h
__COPYRIGHT(@(#) Copyright (c) 2013\
The NetBSD Foundation, inc. All rights reserved.);
-__RCSID($NetBSD: t_kauth_pr_47598.c,v 1.2 2013/02/28 20:41:21 martin Exp $);
+__RCSID($NetBSD: t_kauth_pr_47598.c,v 1.2.8.1 2014/08/10 06:57:19 tls Exp $);
#include errno.h
#include unistd.h
@@ -40,6 +40,48 @@ __RCSID($NetBSD: t_kauth_pr_47598.c,v 1
#include atf-c.h
/*
+ * helper function
+ */
+static const char curtain_name[] = security.models.bsd44.curtain;
+static const char securelevel_name[] = security.models.bsd44.securelevel;
+
+static bool may_lower_curtain(void);
+static int get_curtain(void);
+static void set_curtain(int newval);
+
+static bool
+may_lower_curtain(void)
+{
+ int seclevel;
+ size_t len = sizeof(seclevel);
+
+ if (sysctlbyname(securelevel_name, seclevel, len, NULL, 0) != 0)
+ atf_tc_fail(failed to read %s, securelevel_name);
+
+ return seclevel = 0;
+}
+
+static int
+get_curtain(void)
+{
+ int curtain;
+ size_t len = sizeof(curtain);
+
+ if (sysctlbyname(curtain_name, curtain, len, NULL, 0) != 0)
+ atf_tc_fail(failed to read %s, curtain_name);
+
+ return curtain;
+}
+
+static void
+set_curtain(int newval)
+{
+
+ if (sysctlbyname(curtain_name, NULL, 0, newval, sizeof(newval)) != 0)
+ atf_tc_fail(failed to set %s to %d, curtain_name, newval);
+}
+
+/*
* PR kern/47598: if security.models.extensions.curtain = 1 we crash when
* doing a netstat while an embryonic (not yet fully accepted) connection
* exists.
@@ -59,19 +101,20 @@ ATF_TC_HEAD(kauth_curtain, tc)
ATF_TC_BODY(kauth_curtain, tc)
{
- static const char curtain_name[] = security.models.bsd44.curtain;
- int old_curtain, new_curtain = 1, s, s2, err;
- size_t old_curtain_len = sizeof(old_curtain);
+ int old_curtain, s, s2, err;
socklen_t slen;
struct sockaddr_in sa;
/*
* save old value of curtain and enable it
*/
- if (sysctlbyname(curtain_name, old_curtain, old_curtain_len,
- new_curtain, sizeof(new_curtain)) != 0)
- atf_tc_fail(failed to enable %s, curtain_name);
+ old_curtain = get_curtain();
+ if (old_curtain 1 !may_lower_curtain())
+ atf_tc_skip(curtain is not enabled and we would not be able
+ to drop it later due to securelevel settings);
+
+ set_curtain(1);
/*
* create a socket and bind it to some arbitray free port
@@ -113,9 +156,7 @@ ATF_TC_BODY(kauth_curtain, tc)
/*
* restore old value of curtain
*/
- if (sysctlbyname(curtain_name, NULL, 0,
- old_curtain, sizeof(old_curtain)) != 0)
- atf_tc_fail(failed to restore %s, curtain_name);
+ set_curtain(old_curtain);
}
ATF_TP_ADD_TCS(tp)
Index: src/tests/kernel/tty/Makefile
diff -u src/tests/kernel/tty/Makefile:1.1 src/tests/kernel/tty/Makefile:1.1.22.1
--- src/tests/kernel/tty/Makefile:1.1 Mon Jun 28 19:04:00 2010
+++ src/tests/kernel/tty/Makefile Sun Aug 10 06:57:19 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/06/28 19:04:00 pooka Exp $
+# $NetBSD: Makefile,v
CVS commit: [tls-earlyentropy] src/tests/modules
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:57:27 UTC 2014
Modified Files:
src/tests/modules [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.8.1 src/tests/modules/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/modules/Makefile
diff -u src/tests/modules/Makefile:1.10 src/tests/modules/Makefile:1.10.8.1
--- src/tests/modules/Makefile:1.10 Fri Apr 13 07:05:32 2012
+++ src/tests/modules/Makefile Sun Aug 10 06:57:27 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/04/13 07:05:32 jruoho Exp $
+# $NetBSD: Makefile,v 1.10.8.1 2014/08/10 06:57:27 tls Exp $
.include bsd.own.mk
@@ -12,7 +12,7 @@ TESTSDIR= ${TESTSBASE}/modules
TESTS_C= t_modctl
TESTS_C+= t_builtin
LDADD= -lprop
-LDADD+= -lrumpfs_kernfs -lrumpvfs -lrump -lrumpuser -lpthread
+LDADD+= -lrumpfs_kernfs -lrumpvfs -lrump -lrumpuser -lrump -lpthread
TESTS_SH= t_abi_uvm
TESTS_SH+= t_modload
CVS commit: [tls-earlyentropy] src/tests/libexec
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:57:24 UTC 2014
Modified Files:
src/tests/libexec [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.18.1 src/tests/libexec/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/libexec/Makefile
diff -u src/tests/libexec/Makefile:1.3 src/tests/libexec/Makefile:1.3.18.1
--- src/tests/libexec/Makefile:1.3 Sat Jun 11 18:03:19 2011
+++ src/tests/libexec/Makefile Sun Aug 10 06:57:24 2014
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2011/06/11 18:03:19 christos Exp $
+# $NetBSD: Makefile,v 1.3.18.1 2014/08/10 06:57:24 tls Exp $
#
.include Makefile.inc
.include bsd.own.mk
+.if ${MACHINE_ARCH} != m68000
TESTS_SUBDIRS= ld.elf_so
+.endif
TESTSDIR= ${TESTSBASE}/libexec
CVS commit: [tls-earlyentropy] src/usr.bin/calendar/calendars
Module Name:src Committed By: tls Date: Sun Aug 10 06:57:52 UTC 2014 Modified Files: src/usr.bin/calendar/calendars [tls-earlyentropy]: calendar.holiday calendar.netbsd Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.22.2.1 \ src/usr.bin/calendar/calendars/calendar.holiday cvs rdiff -u -r1.29 -r1.29.2.1 src/usr.bin/calendar/calendars/calendar.netbsd 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/calendar/calendars/calendar.holiday diff -u src/usr.bin/calendar/calendars/calendar.holiday:1.22 src/usr.bin/calendar/calendars/calendar.holiday:1.22.2.1 --- src/usr.bin/calendar/calendars/calendar.holiday:1.22 Sun Oct 13 16:43:49 2013 +++ src/usr.bin/calendar/calendars/calendar.holiday Sun Aug 10 06:57:52 2014 @@ -177,6 +177,7 @@ 05/25 African Liberation Day in Chad, Mauritania, Zambia 05/25 Independence Day in Jordan 05/25 Memorial Day in New Mexico Puerto Rico +05/25 Towel Day, a tribute to Douglas Adams 05/29* First Day of Shavuot 05/27* Bank Holiday in UK (last Monday in May) 05/28 Mothers Day in Central African Republic Index: src/usr.bin/calendar/calendars/calendar.netbsd diff -u src/usr.bin/calendar/calendars/calendar.netbsd:1.29 src/usr.bin/calendar/calendars/calendar.netbsd:1.29.2.1 --- src/usr.bin/calendar/calendars/calendar.netbsd:1.29 Mon Feb 24 07:23:44 2014 +++ src/usr.bin/calendar/calendars/calendar.netbsd Sun Aug 10 06:57:52 2014 @@ -29,6 +29,8 @@ 03/21 NetBSD/i386 port started, 1993 03/26 NetBSD/atari port started, 1995 03/28 NetBSD/sun2 port started, 2001 +04/12 NetBSD 6.0.5 released, 2014 +04/12 NetBSD 6.1.4 released, 2014 04/14 NetBSD 2.0.2 released, 2005 04/20 NetBSD 0.8 released, 1993 04/21 NetBSD 1.6.1 released, 2003
CVS commit: [tls-earlyentropy] src/tests/usr.bin
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:57:37 UTC 2014
Modified Files:
src/tests/usr.bin/nbperf [tls-earlyentropy]: t_nbperf.sh
src/tests/usr.bin/xlint/lint1 [tls-earlyentropy]: Makefile
t_integration.sh
Added Files:
src/tests/usr.bin/xlint/lint1 [tls-earlyentropy]: d_c99_complex_split.c
d_cvt_constant.c d_gcc_extension.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.10.1 src/tests/usr.bin/nbperf/t_nbperf.sh
cvs rdiff -u -r1.2 -r1.2.2.1 src/tests/usr.bin/xlint/lint1/Makefile \
src/tests/usr.bin/xlint/lint1/t_integration.sh
cvs rdiff -u -r0 -r1.2.4.2 \
src/tests/usr.bin/xlint/lint1/d_c99_complex_split.c
cvs rdiff -u -r0 -r1.1.4.2 src/tests/usr.bin/xlint/lint1/d_cvt_constant.c \
src/tests/usr.bin/xlint/lint1/d_gcc_extension.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/nbperf/t_nbperf.sh
diff -u src/tests/usr.bin/nbperf/t_nbperf.sh:1.2 src/tests/usr.bin/nbperf/t_nbperf.sh:1.2.10.1
--- src/tests/usr.bin/nbperf/t_nbperf.sh:1.2 Tue Sep 25 20:53:46 2012
+++ src/tests/usr.bin/nbperf/t_nbperf.sh Sun Aug 10 06:57:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: t_nbperf.sh,v 1.2 2012/09/25 20:53:46 joerg Exp $
+# $NetBSD: t_nbperf.sh,v 1.2.10.1 2014/08/10 06:57:37 tls Exp $
#
# Copyright (c) 2012 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -34,6 +34,8 @@ atf_test_case chm
chm_head()
{
atf_set descr Checks chm algorithm
+ atf_set require.files /usr/share/dict/web2
+ atf_set require.progs cc
}
chm_body()
{
@@ -56,6 +58,8 @@ atf_test_case chm3
chm3_head()
{
atf_set descr Checks chm3 algorithm
+ atf_set require.files /usr/share/dict/web2
+ atf_set require.progs cc
}
chm3_body()
{
@@ -78,6 +82,8 @@ atf_test_case bdz
bdz_head()
{
atf_set descr Checks bdz algorithm
+ atf_set require.files /usr/share/dict/web2
+ atf_set require.progs cc
}
bdz_body()
{
Index: src/tests/usr.bin/xlint/lint1/Makefile
diff -u src/tests/usr.bin/xlint/lint1/Makefile:1.2 src/tests/usr.bin/xlint/lint1/Makefile:1.2.2.1
--- src/tests/usr.bin/xlint/lint1/Makefile:1.2 Tue Feb 4 08:08:59 2014
+++ src/tests/usr.bin/xlint/lint1/Makefile Sun Aug 10 06:57:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/02/04 08:08:59 njoly Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2014/08/10 06:57:37 tls Exp $
NOMAN= # defined
@@ -11,6 +11,7 @@ TESTS_SH= t_integration
FILESDIR= ${TESTSDIR}
FILES+= d_alignof.c
FILES+= d_c99_complex_num.c
+FILES+= d_c99_complex_split.c
FILES+= d_c99_decls_after_stmt.c
FILES+= d_c99_decls_after_stmt2.c
FILES+= d_c99_decls_after_stmt3.c
@@ -31,10 +32,12 @@ FILES+= d_compound_literals2.c
FILES+= d_constant_conv1.c
FILES+= d_constant_conv2.c
FILES+= d_cvt_in_ternary.c
+FILES+= d_cvt_constant.c
FILES+= d_ellipsis_in_switch.c
FILES+= d_gcc_compound_statements1.c
FILES+= d_gcc_compound_statements2.c
FILES+= d_gcc_compound_statements3.c
+FILES+= d_gcc_extension.c
FILES+= d_gcc_func.c
FILES+= d_gcc_variable_array_init.c
FILES+= d_incorrect_array_size.c
Index: src/tests/usr.bin/xlint/lint1/t_integration.sh
diff -u src/tests/usr.bin/xlint/lint1/t_integration.sh:1.2 src/tests/usr.bin/xlint/lint1/t_integration.sh:1.2.2.1
--- src/tests/usr.bin/xlint/lint1/t_integration.sh:1.2 Tue Feb 4 08:08:59 2014
+++ src/tests/usr.bin/xlint/lint1/t_integration.sh Sun Aug 10 06:57:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: t_integration.sh,v 1.2 2014/02/04 08:08:59 njoly Exp $
+# $NetBSD: t_integration.sh,v 1.2.2.1 2014/08/10 06:57:37 tls Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -93,11 +93,14 @@ test_case check_valid gcc_compound_state
statements with non-expressions
test_case check_valid gcc_compound_statements3 Checks GCC compound \
statements with void type
+# XXX: Because of polymorphic __builtin_isnan and expression has null effect
+# test_case check_valid gcc_extension Checks GCC __extension__ and __typeof__
test_case check_valid cvt_in_ternary Checks CVT nodes handling in ? \
-operator
+test_case check_valid cvt_constant Checks constant conversion
test_case check_valid ellipsis_in_switch Checks ellipsis in switch()
test_case check_valid c99_complex_num Checks C99 complex numbers
+test_case check_valid c99_complex_split Checks C99 complex access
test_case check_valid c99_for_loops Checks C99 for loops
test_case check_valid alignof Checks __alignof__
test_case check_valid shift_to_narrower_type Checks that type shifts that \
Added files:
Index: src/tests/usr.bin/xlint/lint1/d_c99_complex_split.c
diff -u /dev/null src/tests/usr.bin/xlint/lint1/d_c99_complex_split.c:1.2.4.2
--- /dev/null Sun Aug 10 06:57:37 2014
+++ src/tests/usr.bin/xlint/lint1/d_c99_complex_split.c Sun Aug 10 06:57:37 2014
@@ -0,0 +1,8 @@
+int b(double a) {
+ return a == 0;
+}
+void a(void) {
+double _Complex z = 0;
+
CVS commit: [tls-earlyentropy] src/usr.bin/cap_mkdb
Module Name:src Committed By: tls Date: Sun Aug 10 06:57:55 UTC 2014 Modified Files: src/usr.bin/cap_mkdb [tls-earlyentropy]: cap_mkdb.1 Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.18.8.1 src/usr.bin/cap_mkdb/cap_mkdb.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/cap_mkdb/cap_mkdb.1 diff -u src/usr.bin/cap_mkdb/cap_mkdb.1:1.18 src/usr.bin/cap_mkdb/cap_mkdb.1:1.18.8.1 --- src/usr.bin/cap_mkdb/cap_mkdb.1:1.18 Sat Apr 21 12:27:29 2012 +++ src/usr.bin/cap_mkdb/cap_mkdb.1 Sun Aug 10 06:57:54 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: cap_mkdb.1,v 1.18 2012/04/21 12:27:29 roy Exp $ +.\ $NetBSD: cap_mkdb.1,v 1.18.8.1 2014/08/10 06:57:54 tls Exp $ .\ .\ Copyright (c) 1992, 1993 .\ The Regents of the University of California. All rights reserved. @@ -104,9 +104,7 @@ The data field of this key/data pair is pair of the first type which has the real data associated with the name. .Sh EXIT STATUS -The -.Nm -utility exits 0 on success and \*[Gt]0 if an error occurs. +.Ex -std .Sh SEE ALSO .Xr dbopen 3 , .Xr getcap 3 ,
CVS commit: [tls-earlyentropy] src/tests/rump
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:57:32 UTC 2014
Modified Files:
src/tests/rump/rumpkern [tls-earlyentropy]: Makefile
src/tests/rump/rumpkern/h_server [tls-earlyentropy]: Makefile
src/tests/rump/rumpvfs [tls-earlyentropy]: Makefile t_etfs.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.22.1 src/tests/rump/rumpkern/Makefile
cvs rdiff -u -r1.3 -r1.3.22.1 src/tests/rump/rumpkern/h_server/Makefile
cvs rdiff -u -r1.3 -r1.3.20.1 src/tests/rump/rumpvfs/Makefile
cvs rdiff -u -r1.9 -r1.9.22.1 src/tests/rump/rumpvfs/t_etfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/rump/rumpkern/Makefile
diff -u src/tests/rump/rumpkern/Makefile:1.14 src/tests/rump/rumpkern/Makefile:1.14.22.1
--- src/tests/rump/rumpkern/Makefile:1.14 Fri Jan 14 13:23:15 2011
+++ src/tests/rump/rumpkern/Makefile Sun Aug 10 06:57:32 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2011/01/14 13:23:15 pooka Exp $
+# $NetBSD: Makefile,v 1.14.22.1 2014/08/10 06:57:32 tls Exp $
.include bsd.own.mk
@@ -18,7 +18,7 @@ TESTS_SH= t_sp
SUBDIR+= h_client h_server
-ADD_TO_LD= -lrumpvfs -lrump -lrumpuser -lpthread
+ADD_TO_LD= -lrumpvfs -lrump -lrumpuser -lrump -lpthread
LDADD.t_modlinkset+= -lukfs -lrumpdev_disk -lrumpdev -lrumpfs_msdos
LDADD.t_modlinkset+= -lrumpfs_cd9660 ${ADD_TO_LD}
LDADD+= ${ADD_TO_LD}
Index: src/tests/rump/rumpkern/h_server/Makefile
diff -u src/tests/rump/rumpkern/h_server/Makefile:1.3 src/tests/rump/rumpkern/h_server/Makefile:1.3.22.1
--- src/tests/rump/rumpkern/h_server/Makefile:1.3 Fri Jan 14 13:23:15 2011
+++ src/tests/rump/rumpkern/h_server/Makefile Sun Aug 10 06:57:32 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/01/14 13:23:15 pooka Exp $
+# $NetBSD: Makefile,v 1.3.22.1 2014/08/10 06:57:32 tls Exp $
#
.include bsd.own.mk
@@ -9,7 +9,7 @@ TESTS_C= h_simpleserver
ATFFILE= no
-LDADD+= -lrump -lrumpuser -lpthread
+LDADD+= -lrump -lrumpuser -lrump -lpthread
WARNS= 4
NOMAN=
Index: src/tests/rump/rumpvfs/Makefile
diff -u src/tests/rump/rumpvfs/Makefile:1.3 src/tests/rump/rumpvfs/Makefile:1.3.20.1
--- src/tests/rump/rumpvfs/Makefile:1.3 Tue Feb 22 10:36:14 2011
+++ src/tests/rump/rumpvfs/Makefile Sun Aug 10 06:57:32 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/02/22 10:36:14 pooka Exp $
+# $NetBSD: Makefile,v 1.3.20.1 2014/08/10 06:57:32 tls Exp $
.include bsd.own.mk
@@ -8,7 +8,7 @@ TESTS_C= t_basic
TESTS_C+= t_etfs
TESTS_C+= t_p2kifs
-LDADD= -lrumpvfs -lrump -lrumpuser -lpthread
+LDADD= -lrumpvfs -lrump -lrumpuser -lrump -lpthread
WARNS= 4
Index: src/tests/rump/rumpvfs/t_etfs.c
diff -u src/tests/rump/rumpvfs/t_etfs.c:1.9 src/tests/rump/rumpvfs/t_etfs.c:1.9.22.1
--- src/tests/rump/rumpvfs/t_etfs.c:1.9 Tue Nov 30 18:19:47 2010
+++ src/tests/rump/rumpvfs/t_etfs.c Sun Aug 10 06:57:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_etfs.c,v 1.9 2010/11/30 18:19:47 pooka Exp $ */
+/* $NetBSD: t_etfs.c,v 1.9.22.1 2014/08/10 06:57:32 tls Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -103,6 +103,8 @@ ATF_TC_BODY(reregister_reg, tc)
ATF_REQUIRE_EQ(lseek(localfd, 0, SEEK_SET), 0);
ATF_REQUIRE(read(localfd, buf, sizeof(buf)) 0);
ATF_REQUIRE_STREQ(buf, TESTSTR2);
+ close(etcfd);
+ close(localfd);
}
ATF_TC(reregister_blk);
CVS commit: [tls-earlyentropy] src/tests/sbin/sysctl
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:57:35 UTC 2014
Modified Files:
src/tests/sbin/sysctl [tls-earlyentropy]: t_sysctl.sh
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.10.1 src/tests/sbin/sysctl/t_sysctl.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/sbin/sysctl/t_sysctl.sh
diff -u src/tests/sbin/sysctl/t_sysctl.sh:1.1 src/tests/sbin/sysctl/t_sysctl.sh:1.1.10.1
--- src/tests/sbin/sysctl/t_sysctl.sh:1.1 Tue Apr 10 02:39:33 2012
+++ src/tests/sbin/sysctl/t_sysctl.sh Sun Aug 10 06:57:35 2014
@@ -1,4 +1,4 @@
-# $NetBSD: t_sysctl.sh,v 1.1 2012/04/10 02:39:33 jruoho Exp $
+# $NetBSD: t_sysctl.sh,v 1.1.10.1 2014/08/10 06:57:35 tls Exp $
#
# Copyright (c) 2012 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -36,6 +36,7 @@ basic_head() {
basic_body() {
atf_check -s exit:0 -o ignore -e empty -x sysctl -a
+ atf_check -s exit:0 -o ignore -e empty -x sysctl -d
}
atf_init_test_cases() {
CVS commit: [tls-earlyentropy] src/usr.bin/comm
Module Name:src Committed By: tls Date: Sun Aug 10 06:57:57 UTC 2014 Modified Files: src/usr.bin/comm [tls-earlyentropy]: comm.1 Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.11.22.1 src/usr.bin/comm/comm.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/comm/comm.1 diff -u src/usr.bin/comm/comm.1:1.11 src/usr.bin/comm/comm.1:1.11.22.1 --- src/usr.bin/comm/comm.1:1.11 Mon Mar 9 19:24:32 2009 +++ src/usr.bin/comm/comm.1 Sun Aug 10 06:57:57 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: comm.1,v 1.11 2009/03/09 19:24:32 joerg Exp $ +.\ $NetBSD: comm.1,v 1.11.22.1 2014/08/10 06:57:57 tls Exp $ .\ .\ Copyright (c) 1989, 1990, 1993 .\ The Regents of the University of California. All rights reserved. @@ -89,8 +89,7 @@ participate in line comparisons. .\ .It Ev LC_MESSAGES .\ .El .Sh EXIT STATUS -.Nm -exits 0 on success, \*[Gt]0 if an error occurred. +.Ex -std .Sh SEE ALSO .Xr cmp 1 , .Xr diff 1 ,
CVS commit: [tls-earlyentropy] src/tools/gcc
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:57:41 UTC 2014
Modified Files:
src/tools/gcc [tls-earlyentropy]: Makefile README.mknative mknative-gcc
Added Files:
src/tools/gcc [tls-earlyentropy]: gcc-version.mk
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.66.2.1 src/tools/gcc/Makefile
cvs rdiff -u -r1.18 -r1.18.2.1 src/tools/gcc/README.mknative
cvs rdiff -u -r0 -r1.1.2.2 src/tools/gcc/gcc-version.mk
cvs rdiff -u -r1.78 -r1.78.2.1 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.66 src/tools/gcc/Makefile:1.66.2.1
--- src/tools/gcc/Makefile:1.66 Thu Feb 27 20:15:53 2014
+++ src/tools/gcc/Makefile Sun Aug 10 06:57:41 2014
@@ -1,15 +1,11 @@
-# $NetBSD: Makefile,v 1.66 2014/02/27 20:15:53 mrg Exp $
+# $NetBSD: Makefile,v 1.66.2.1 2014/08/10 06:57:41 tls Exp $
.include bsd.own.mk
GCC_LANGUAGES=c c++ objc
MODULE= gcc4
-.if ${HAVE_GCC} 45
-GCCDIST= ${.CURDIR}/../../gnu/dist/gcc4
-.else
GCCDIST= ${.CURDIR}/../../external/gpl3/${EXTERNAL_GCC_SUBDIR}/dist
-.endif
GNUHOSTDIST= ${GCCDIST}
.if ${HAVE_GCC} == 48
@@ -35,13 +31,16 @@ MULTILIB_ARGS= --disable-multilib
SOFTFLOAT_ARGS= -with-float=soft
.endif
+.include gcc-version.mk
+
COMMON_CONFIGURE_ARGS= --target=${MACHINE_GNU_PLATFORM} \
--enable-long-long \
--enable-threads \
--with-bugurl=http://www.NetBSD.org/Misc/send-pr.html \
- --with-pkgversion=NetBSD nb1 20120916 \
+ --with-pkgversion=NetBSD ${NETBSD_GCC_VERSION} \
--with-system-zlib \
- --enable-__cxa_atexit
+ --enable-__cxa_atexit \
+ --enable-libstdcxx-threads
.if defined(GCC_CONFIG_ARCH.${MACHINE_ARCH})
COMMON_CONFIGURE_ARGS+= --with-arch=${GCC_CONFIG_ARCH.${MACHINE_ARCH}}
.endif
@@ -50,14 +49,11 @@ COMMON_CONFIGURE_ARGS+= --with-tune=${GC
.endif
CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS}
-.if ${HAVE_GCC} = 45
CONFIGURE_ARGS+= \
--with-sysroot=${DESTDIR} \
--with-mpc=${TOOLDIR} \
--with-mpfr=${TOOLDIR} \
- --with-gmp=${TOOLDIR}
-.endif
-CONFIGURE_ARGS+= \
+ --with-gmp=${TOOLDIR} \
--disable-nls \
${MULTILIB_ARGS} \
${SOFTFLOAT_ARGS} \
@@ -85,23 +81,21 @@ BUILD_MAKE=${TOOL_GMAKE}
# mknative-gcc specific stuff
#
-MKNATIVE_CONFIG_TARGET_LIBS= \
- configure-target-libstdc++-v3 \
- configure-target-libobjc
+MKNATIVE_CONFIG_TARGET_LIBS=
.if ${HAVE_GCC} == 48
-MKNATIVE_CONFIG_TARGET_LIBS += configure-target-libgcc
+MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgcc
+MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgomp
MKNATIVE_TARGET= gcc48
-MKNATIVE_CONFIG_TARGET_LIBS+= \
- configure-target-libgomp
.elif ${HAVE_GCC} == 45
+MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgomp
MKNATIVE_TARGET= gcc45
-MKNATIVE_CONFIG_TARGET_LIBS+= \
- configure-target-libgomp
-.else
-MKNATIVE_TARGET= gcc4
.endif
+MKNATIVE_CONFIG_TARGET_LIBS+= \
+ configure-target-libstdc++-v3 \
+ configure-target-libobjc
+
BINENV= /usr/bin/env -i
@@ -158,7 +152,6 @@ native-gcc: .native/.configure_done
${MACHINE_GNU_PLATFORM} ${DESTDIR} ${TOOLDIR}
NATIVE_CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS}
-.if ${HAVE_GCC} = 45
MPC= ${NETBSDSRCDIR}/external/lgpl3/mpc
MPFR= ${NETBSDSRCDIR}/external/lgpl3/mpfr
GMP= ${NETBSDSRCDIR}/external/lgpl3/gmp
@@ -176,13 +169,13 @@ NATIVE_CONFIGURE_ARGS+= \
--with-mpfr-include=${MPFR}/dist/src \
--with-gmp-include=${GMP}/lib/libgmp/arch/${GMP_MACHINE_ARCH}
-. if ${MACHINE_ARCH} != vax
+.if ${MACHINE_ARCH} != vax
NATIVE_CONFIGURE_ARGS+= --enable-tls
-. endif
-. if !empty(MACHINE_ARCH:Mearm*)
+.endif
+.if !empty(MACHINE_ARCH:Mearm*)
NATIVE_CONFIGURE_ARGS+= --enable-initfini-array
-. endif
.endif
+
NATIVE_CONFIGURE_ARGS+= \
--disable-multilib \
--disable-symvers \
Index: src/tools/gcc/README.mknative
diff -u src/tools/gcc/README.mknative:1.18 src/tools/gcc/README.mknative:1.18.2.1
--- src/tools/gcc/README.mknative:1.18 Wed Feb 26 09:54:34 2014
+++ src/tools/gcc/README.mknative Sun Aug 10 06:57:41 2014
@@ -1,4 +1,4 @@
-$NetBSD: README.mknative,v 1.18 2014/02/26 09:54:34 mrg Exp $
+$NetBSD: README.mknative,v 1.18.2.1 2014/08/10 06:57:41 tls Exp $
This file describes how to bootstrap the native toolchain on a new NetBSD
platform (and how to update the new toolchain files, if needed). These
@@ -29,7 +29,7 @@ work.
to build.sh. Use -M instead. (The differences are in layout and pathname
prefixes in the object directory pointed to by each option.)
-3. In src/tools/gcc, do nbmake-MACHINE HAVE_GCC=45 bootstrap-libgcc.
+3. In src/tools/gcc, do nbmake-MACHINE HAVE_GCC=48 bootstrap-libgcc.
This will create just enough glue in src/external/gpl3/gcc/lib/libgcc/arch
to make it possible to build, based on the toolchain built in
@@ -39,28 +39,24 @@ work.
will regenerate the proper libgcc config files.
4. At top level, do
-
CVS commit: [tls-earlyentropy] src/tools/llvm-lib
Module Name:src Committed By: tls Date: Sun Aug 10 06:57:44 UTC 2014 Added Files: src/tools/llvm-lib/libLLVMDebugInfo [tls-earlyentropy]: Makefile src/tools/llvm-lib/libLLVMProfileData [tls-earlyentropy]: Makefile Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.2 src/tools/llvm-lib/libLLVMDebugInfo/Makefile cvs rdiff -u -r0 -r1.1.2.2 src/tools/llvm-lib/libLLVMProfileData/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/tools/llvm-lib/libLLVMDebugInfo/Makefile diff -u /dev/null src/tools/llvm-lib/libLLVMDebugInfo/Makefile:1.1.2.2 --- /dev/null Sun Aug 10 06:57:44 2014 +++ src/tools/llvm-lib/libLLVMDebugInfo/Makefile Sun Aug 10 06:57:44 2014 @@ -0,0 +1,3 @@ +# $NetBSD: Makefile,v 1.1.2.2 2014/08/10 06:57:44 tls Exp $ + +.include bsd.init.mk Index: src/tools/llvm-lib/libLLVMProfileData/Makefile diff -u /dev/null src/tools/llvm-lib/libLLVMProfileData/Makefile:1.1.2.2 --- /dev/null Sun Aug 10 06:57:44 2014 +++ src/tools/llvm-lib/libLLVMProfileData/Makefile Sun Aug 10 06:57:44 2014 @@ -0,0 +1,3 @@ +# $NetBSD: Makefile,v 1.1.2.2 2014/08/10 06:57:44 tls Exp $ + +.include bsd.init.mk
CVS commit: [tls-earlyentropy] src/tools/compat
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:57:39 UTC 2014
Modified Files:
src/tools/compat [tls-earlyentropy]: compat_defs.h configure
configure.ac nbtool_config.h.in
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.95.2.1 src/tools/compat/compat_defs.h
cvs rdiff -u -r1.80 -r1.80.2.1 src/tools/compat/configure
cvs rdiff -u -r1.81 -r1.81.2.1 src/tools/compat/configure.ac
cvs rdiff -u -r1.34 -r1.34.2.1 src/tools/compat/nbtool_config.h.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/compat/compat_defs.h
diff -u src/tools/compat/compat_defs.h:1.95 src/tools/compat/compat_defs.h:1.95.2.1
--- src/tools/compat/compat_defs.h:1.95 Thu Jan 9 16:08:46 2014
+++ src/tools/compat/compat_defs.h Sun Aug 10 06:57:39 2014
@@ -1,32 +1,34 @@
-/* $NetBSD: compat_defs.h,v 1.95 2014/01/09 16:08:46 apb Exp $ */
+/* $NetBSD: compat_defs.h,v 1.95.2.1 2014/08/10 06:57:39 tls Exp $ */
#ifndef __NETBSD_COMPAT_DEFS_H__
#define __NETBSD_COMPAT_DEFS_H__
-
-/* Work around some complete brain damage. */
/*
- * Linux: features.h turns on _POSIX_SOURCE by default, even though the
- * program (not the OS) should do that. Preload features.h to keep any
- * of this crap from being pulled in, and undefine _POSIX_SOURCE.
+ * On NetBSD, ensure that _NETBSD_SOURCE does not get defined, so that
+ * accidental attempts to use NetBSD-specific features instead of more
+ * portable features is likely to be noticed when the tools are built
+ * on NetBSD. Define enough other feature test macros to expose the
+ * features we need.
*/
-
-#if defined(__linux__) HAVE_FEATURES_H
-#include features.h
-#define __USE_ISOC99 1
-#endif
-
-/* So _NETBSD_SOURCE doesn't end up defined. Define enough to pull in standard
- defs. Other platforms may need similiar defines. */
#ifdef __NetBSD__
#define _ISOC99_SOURCE
#define _POSIX_SOURCE 1
#define _POSIX_C_SOURCE 200112L
#define _XOPEN_SOURCE 600
-#else
+#endif /* __NetBSD__ */
+
+/*
+ * Linux: features.h turns on _POSIX_SOURCE by default, even though the
+ * program (not the OS) should do that. Preload features.h and
+ * then override some of the feature test macros.
+ */
+
+#if defined(__linux__) HAVE_FEATURES_H
+#include features.h
#undef _POSIX_SOURCE
#undef _POSIX_C_SOURCE
-#endif
+#define __USE_ISOC99 1
+#endif /* __linux__ HAVE_FEATURES_H */
/* System headers needed for (re)definitions below. */
@@ -258,6 +260,18 @@ void warn(const char *, ...);
void warnx(const char *, ...);
void vwarnx(const char *, va_list);
#endif
+#if !HAVE_DECL_WARNC
+void warnc(int, const char *, ...);
+#endif
+#if !HAVE_DECL_VWARNC
+void vwarnc(int, const char *, va_list);
+#endif
+#if !HAVE_DECL_ERRC
+void errc(int, int, const char *, ...);
+#endif
+#if !HAVE_DECL_VERRC
+void verrc(int, int, const char *, va_list);
+#endif
#if !HAVE_ESETFUNC
void (*esetfunc(void (*)(int, const char *, ...)))(int, const char *, ...);
Index: src/tools/compat/configure
diff -u src/tools/compat/configure:1.80 src/tools/compat/configure:1.80.2.1
--- src/tools/compat/configure:1.80 Thu Jan 9 11:27:31 2014
+++ src/tools/compat/configure Sun Aug 10 06:57:39 2014
@@ -5794,13 +5794,246 @@ EOF
fi
-echo $as_me:5797: checking whether htobe16 is declared 5
+echo $as_me:5797: checking whether errc is declared 5
+echo $ECHO_N checking whether errc is declared... $ECHO_C 6
+if test ${ac_cv_have_decl_errc+set} = set; then
+ echo $ECHO_N (cached) $ECHO_C 6
+else
+ cat conftest.$ac_ext _ACEOF
+#line 5803 configure
+#include confdefs.h
+
+#ifdef HAVE_ERR_H
+#include err.h
+#endif
+
+int
+main ()
+{
+#ifndef errc
+ char *p = (char *) errc;
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo $as_me:5822: \$ac_compile\) 5
+ (eval $ac_compile) 25
+ ac_status=$?
+ echo $as_me:5825: \$? = $ac_status 5
+ (exit $ac_status); }
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo $as_me:5828: \$ac_try\) 5
+ (eval $ac_try) 25
+ ac_status=$?
+ echo $as_me:5831: \$? = $ac_status 5
+ (exit $ac_status); }; }; then
+ ac_cv_have_decl_errc=yes
+else
+ echo $as_me: failed program was: 5
+cat conftest.$ac_ext 5
+ac_cv_have_decl_errc=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo $as_me:5841: result: $ac_cv_have_decl_errc 5
+echo ${ECHO_T}$ac_cv_have_decl_errc 6
+if test $ac_cv_have_decl_errc = yes; then
+
+cat confdefs.h EOF
+#define HAVE_DECL_ERRC 1
+EOF
+
+else
+ cat confdefs.h EOF
+#define HAVE_DECL_ERRC 0
+EOF
+
+fi
+echo $as_me:5855: checking whether verrc is declared 5
+echo $ECHO_N checking whether verrc is declared... $ECHO_C 6
+if test ${ac_cv_have_decl_verrc+set} = set; then
+ echo $ECHO_N (cached) $ECHO_C 6
+else
+ cat conftest.$ac_ext _ACEOF
+#line 5861 configure
+#include confdefs.h
+
+#ifdef HAVE_ERR_H
+#include err.h
+#endif
+
+int
+main ()
+{
+#ifndef verrc
+ char *p = (char *)
CVS commit: [tls-earlyentropy] src/usr.bin/asa
Module Name:src Committed By: tls Date: Sun Aug 10 06:57:50 UTC 2014 Modified Files: src/usr.bin/asa [tls-earlyentropy]: asa.1 Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.11.76.1 src/usr.bin/asa/asa.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/asa/asa.1 diff -u src/usr.bin/asa/asa.1:1.11 src/usr.bin/asa/asa.1:1.11.76.1 --- src/usr.bin/asa/asa.1:1.11 Fri Feb 8 01:36:18 2002 +++ src/usr.bin/asa/asa.1 Sun Aug 10 06:57:50 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: asa.1,v 1.11 2002/02/08 01:36:18 ross Exp $ +.\ $NetBSD: asa.1,v 1.11.76.1 2014/08/10 06:57:50 tls Exp $ .\ .\ Copyright (c) 1993 Winning Strategies, Inc. .\ All rights reserved. @@ -62,9 +62,7 @@ before printing the rest of the line. Lines beginning with characters other than the above are treated as if they begin with \*[Lt]space\*[Gt]. .Sh EXIT STATUS -The -.Nm -utility exit 0 on success, and \*[Gt]0 if an error occurs. +.Ex -std .Sh EXAMPLES To view a file containing the output of a .Tn FORTRAN
CVS commit: [tls-earlyentropy] src/tools/vgrind
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:57:48 UTC 2014
Added Files:
src/tools/vgrind [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.2.2.2 src/tools/vgrind/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/tools/vgrind/Makefile
diff -u /dev/null src/tools/vgrind/Makefile:1.2.2.2
--- /dev/null Sun Aug 10 06:57:48 2014
+++ src/tools/vgrind/Makefile Sun Aug 10 06:57:47 2014
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.2.2.2 2014/08/10 06:57:47 tls Exp $
+
+HOSTPROGNAME= nbvfontedpr
+HOST_BINDIR= ${TOOLDIR}/libexec
+HOST_SRCDIR= usr.bin/vgrind
+HOST_FILESDIR= ${TOOLDIR}/share/misc
+HOST_CPPFLAGS= -D_PATH_VGRINDEFS=\${HOST_FILESDIR}/vgrindefs\
+HOSTFILES= vgrindefs vgrindefs.db
+NOSHARE=# defined
+CLEANFILES+= ${HOSTFILES}
+
+.include ${.CURDIR}/../Makefile.host
+
+vgrindefs: vgrindefs.src
+ cp ${.ALLSRC} ${.TARGET}
+
+vgrindefs.db: vgrindefs
+ ${TOOL_CAP_MKDB} -f ${.ALLSRC} ${.ALLSRC}
CVS commit: [tls-earlyentropy] src/usr.bin/grep
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:58:14 UTC 2014
Modified Files:
src/usr.bin/grep [tls-earlyentropy]: grep.c util.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.8.1 src/usr.bin/grep/grep.c
cvs rdiff -u -r1.17 -r1.17.6.1 src/usr.bin/grep/util.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/grep/grep.c
diff -u src/usr.bin/grep/grep.c:1.11 src/usr.bin/grep/grep.c:1.11.8.1
--- src/usr.bin/grep/grep.c:1.11 Sun May 6 22:27:00 2012
+++ src/usr.bin/grep/grep.c Sun Aug 10 06:58:14 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: grep.c,v 1.11 2012/05/06 22:27:00 joerg Exp $ */
+/* $NetBSD: grep.c,v 1.11.8.1 2014/08/10 06:58:14 tls Exp $ */
/* $FreeBSD: head/usr.bin/grep/grep.c 211519 2010-08-19 22:55:17Z delphij $ */
/* $OpenBSD: grep.c,v 1.42 2010/07/02 22:18:03 tedu Exp $ */
@@ -34,7 +34,7 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: grep.c,v 1.11 2012/05/06 22:27:00 joerg Exp $);
+__RCSID($NetBSD: grep.c,v 1.11.8.1 2014/08/10 06:58:14 tls Exp $);
#include sys/stat.h
#include sys/types.h
@@ -159,7 +159,6 @@ usage(void)
{
fprintf(stderr, getstr(4), __progname);
fprintf(stderr, %s, getstr(5));
- fprintf(stderr, %s, getstr(5));
fprintf(stderr, %s, getstr(6));
fprintf(stderr, %s, getstr(7));
exit(2);
Index: src/usr.bin/grep/util.c
diff -u src/usr.bin/grep/util.c:1.17 src/usr.bin/grep/util.c:1.17.6.1
--- src/usr.bin/grep/util.c:1.17 Mon Jan 21 03:24:43 2013
+++ src/usr.bin/grep/util.c Sun Aug 10 06:58:14 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.17 2013/01/21 03:24:43 msaitoh Exp $ */
+/* $NetBSD: util.c,v 1.17.6.1 2014/08/10 06:58:14 tls Exp $ */
/* $FreeBSD: head/usr.bin/grep/util.c 211496 2010-08-19 09:28:59Z des $ */
/* $OpenBSD: util.c,v 1.39 2010/07/02 22:18:03 tedu Exp $ */
@@ -34,7 +34,7 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: util.c,v 1.17 2013/01/21 03:24:43 msaitoh Exp $);
+__RCSID($NetBSD: util.c,v 1.17.6.1 2014/08/10 06:58:14 tls Exp $);
#include sys/stat.h
#include sys/types.h
@@ -324,7 +324,7 @@ procline(struct str *l, int nottext)
continue;
/* Check for whole word match */
if (fg_pattern[i].word pmatch.rm_so != 0) {
-wint_t wbegin, wend;
+wchar_t wbegin, wend;
wbegin = wend = L' ';
if (pmatch.rm_so != 0
CVS commit: [tls-earlyentropy] src/usr.bin/ctags
Module Name:src Committed By: tls Date: Sun Aug 10 06:58:02 UTC 2014 Modified Files: src/usr.bin/ctags [tls-earlyentropy]: ctags.1 Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.16.22.1 src/usr.bin/ctags/ctags.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/ctags/ctags.1 diff -u src/usr.bin/ctags/ctags.1:1.16 src/usr.bin/ctags/ctags.1:1.16.22.1 --- src/usr.bin/ctags/ctags.1:1.16 Fri May 14 16:48:36 2010 +++ src/usr.bin/ctags/ctags.1 Sun Aug 10 06:58:02 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: ctags.1,v 1.16 2010/05/14 16:48:36 joerg Exp $ +.\ $NetBSD: ctags.1,v 1.16.22.1 2014/08/10 06:58:02 tls Exp $ .\ .\ Copyright (c) 1987, 1990, 1993 .\ The Regents of the University of California. All rights reserved. @@ -177,8 +177,7 @@ the second section of the lex file. default output tags file .El .Sh EXIT STATUS -.Nm -exits with a value of 1 if an error occurred, 0 otherwise. +.Ex -std Duplicate objects are not considered errors. .Sh SEE ALSO .Xr ex 1 ,
CVS commit: [tls-earlyentropy] src/usr.bin/find
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:58:06 UTC 2014
Modified Files:
src/usr.bin/find [tls-earlyentropy]: find.1
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.80.6.1 src/usr.bin/find/find.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/find/find.1
diff -u src/usr.bin/find/find.1:1.80 src/usr.bin/find/find.1:1.80.6.1
--- src/usr.bin/find/find.1:1.80 Fri Feb 8 12:50:51 2013
+++ src/usr.bin/find/find.1 Sun Aug 10 06:58:06 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: find.1,v 1.80 2013/02/08 12:50:51 wiz Exp $
+.\ $NetBSD: find.1,v 1.80.6.1 2014/08/10 06:58:06 tls Exp $
.\
.\ Copyright (c) 1990, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -32,7 +32,7 @@
.\
.\ from: @(#)find.1 8.7 (Berkeley) 5/9/95
.\
-.Dd August 26, 2012
+.Dd May 17, 2014
.Dt FIND 1
.Os
.Sh NAME
@@ -783,6 +783,8 @@ but do not print them.
.It Li find / \e( \-newer ttt \-or \-user wnj \e) \-ls \-exit 1
Same as above, but list the first file matching the criteria before exiting
with a value of 1.
+.It Li find . \-type f \-exec sh \-c 'file=\*[q]$1\*[q]; ...;' - {} \;
+Perform an arbitrarily complex shell command for every file.
.El
.Sh SEE ALSO
.Xr chflags 1 ,
CVS commit: [tls-earlyentropy] src/usr.bin/extattr
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:58:04 UTC 2014
Modified Files:
src/usr.bin/extattr [tls-earlyentropy]: getextattr.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.8.1 src/usr.bin/extattr/getextattr.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/extattr/getextattr.c
diff -u src/usr.bin/extattr/getextattr.c:1.10 src/usr.bin/extattr/getextattr.c:1.10.8.1
--- src/usr.bin/extattr/getextattr.c:1.10 Sun Jun 17 08:09:29 2012
+++ src/usr.bin/extattr/getextattr.c Sun Aug 10 06:58:04 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: getextattr.c,v 1.10 2012/06/17 08:09:29 manu Exp $ */
+/* $NetBSD: getextattr.c,v 1.10.8.1 2014/08/10 06:58:04 tls Exp $ */
/*-
* Copyright (c) 2002, 2003 Networks Associates Technology, Inc.
@@ -310,8 +310,8 @@ main(int argc, char *argv[])
(void)close(fd);
} else {
- val_len = strlen(argv[0]) + 1;
- mkbuf(buf, buflen, val_len);
+ val_len = strlen(argv[0]);
+ mkbuf(buf, buflen, val_len + 1);
strcpy(buf, argv[0]); /* safe */
argc--; argv++;
}
@@ -406,7 +406,7 @@ main(int argc, char *argv[])
hexdump(buf, error);
continue;
} else {
-fwrite(buf, buflen, 1, stdout);
+fwrite(buf, error, 1, stdout);
printf(\n);
continue;
}
CVS commit: [tls-earlyentropy] src/usr.bin/getconf
Module Name:src Committed By: tls Date: Sun Aug 10 06:58:10 UTC 2014 Modified Files: src/usr.bin/getconf [tls-earlyentropy]: getconf.1 Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.12.18.1 src/usr.bin/getconf/getconf.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/getconf/getconf.1 diff -u src/usr.bin/getconf/getconf.1:1.12 src/usr.bin/getconf/getconf.1:1.12.18.1 --- src/usr.bin/getconf/getconf.1:1.12 Tue Aug 9 18:11:38 2011 +++ src/usr.bin/getconf/getconf.1 Sun Aug 10 06:58:10 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: getconf.1,v 1.12 2011/08/09 18:11:38 jruoho Exp $ +.\ $NetBSD: getconf.1,v 1.12.18.1 2014/08/10 06:58:10 tls Exp $ .\ .\ Copyright (c) 1996 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -81,9 +81,7 @@ standard output, in the format .Va value .Dc . .Sh EXIT STATUS -The -.Nm -utility exits 0 on success, and \*[Gt]0 if an error occurs. +.Ex -std .Sh SEE ALSO .Xr pathconf 2 , .Xr confstr 3 ,
CVS commit: [tls-earlyentropy] src/usr.bin/config
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:57:59 UTC 2014
Modified Files:
src/usr.bin/config [tls-earlyentropy]: config.1 config.5 defs.h files.c
gram.y main.c sem.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.8.1 src/usr.bin/config/config.1
cvs rdiff -u -r1.22 -r1.22.2.1 src/usr.bin/config/config.5
cvs rdiff -u -r1.44 -r1.44.8.1 src/usr.bin/config/defs.h
cvs rdiff -u -r1.11 -r1.11.8.1 src/usr.bin/config/files.c
cvs rdiff -u -r1.38 -r1.38.2.1 src/usr.bin/config/gram.y
cvs rdiff -u -r1.51 -r1.51.2.1 src/usr.bin/config/main.c
cvs rdiff -u -r1.42 -r1.42.2.1 src/usr.bin/config/sem.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/config/config.1
diff -u src/usr.bin/config/config.1:1.13 src/usr.bin/config/config.1:1.13.8.1
--- src/usr.bin/config/config.1:1.13 Thu Aug 30 12:42:41 2012
+++ src/usr.bin/config/config.1 Sun Aug 10 06:57:59 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: config.1,v 1.13 2012/08/30 12:42:41 wiz Exp $
+.\ $NetBSD: config.1,v 1.13.8.1 2014/08/10 06:57:59 tls Exp $
.\
.\ Copyright (c) 1980, 1991, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\
.\ from: @(#)config.8 8.2 (Berkeley) 4/19/94
.\
-.Dd August 30, 2012
+.Dd May 5, 2014
.Dt CONFIG 1
.Os
.Sh NAME
@@ -39,7 +39,9 @@
.Nm
.Op Fl Ppv
.Op Fl b Ar builddir
+.Op Fl D Ar var=value
.Op Fl s Ar srcdir
+.Op Fl U Ar value
.Op Ar config-file
.Nm
.Fl x
@@ -109,6 +111,11 @@ Use
.Ar builddir
as the kernel build directory, instead of computing and creating one
automatically.
+.It Fl D Ar var=value
+Define a makeoptions variable to the given value.
+This is equivalent to appending a
+.Li makeoptions var=value
+line to the config file.
.It Fl L
Generate a lint configuration.
See section
@@ -131,6 +138,12 @@ is used to prepare a kernel build direct
when it is used in combination with the
.Fl L
flag.
+.It Fl U Ar var
+Undefine the makeoption
+.Ar var .
+This is equivalent to appending the line
+.Li no makeoptions var
+to the config file.
.It Fl v
Increase verbosity by enabling some more warnings.
.It Fl x
Index: src/usr.bin/config/config.5
diff -u src/usr.bin/config/config.5:1.22 src/usr.bin/config/config.5:1.22.2.1
--- src/usr.bin/config/config.5:1.22 Thu Feb 13 22:36:28 2014
+++ src/usr.bin/config/config.5 Sun Aug 10 06:57:59 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: config.5,v 1.22 2014/02/13 22:36:28 wiz Exp $
+.\ $NetBSD: config.5,v 1.22.2.1 2014/08/10 06:57:59 tls Exp $
.\
.\ Copyright (c) 2006, 2007 The NetBSD Foundation.
.\ All rights reserved.
@@ -24,7 +24,7 @@
.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\ POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd March 3, 2010
+.Dd May 29, 2014
.Dt CONFIG 5
.Os
.Sh NAME
@@ -587,6 +587,8 @@ prefix
Defines the indentification string of the kernel.
This statement is optional, and the name of the main configuration file will be
used as a default value.
+.It Ic no ident
+Deletes any pre-existing indentification string of the kernel.
.It Ic maxusers Ar number
Despite its name, this statement does not limit the maximum number of users on
the system.
Index: src/usr.bin/config/defs.h
diff -u src/usr.bin/config/defs.h:1.44 src/usr.bin/config/defs.h:1.44.8.1
--- src/usr.bin/config/defs.h:1.44 Fri Jun 8 08:56:45 2012
+++ src/usr.bin/config/defs.h Sun Aug 10 06:57:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.44 2012/06/08 08:56:45 martin Exp $ */
+/* $NetBSD: defs.h,v 1.44.8.1 2014/08/10 06:57:59 tls Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -107,7 +107,7 @@ extern const char *progname;
* The next two lines define the current version of the config(1) binary,
* and the minimum version of the configuration files it supports.
*/
-#define CONFIG_VERSION 20100430
+#define CONFIG_VERSION 20140502
#define CONFIG_MINVERSION 0
/*
Index: src/usr.bin/config/files.c
diff -u src/usr.bin/config/files.c:1.11 src/usr.bin/config/files.c:1.11.8.1
--- src/usr.bin/config/files.c:1.11 Sun Mar 11 08:21:53 2012
+++ src/usr.bin/config/files.c Sun Aug 10 06:57:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: files.c,v 1.11 2012/03/11 08:21:53 dholland Exp $ */
+/* $NetBSD: files.c,v 1.11.8.1 2014/08/10 06:57:59 tls Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -160,7 +160,9 @@ addfile(const char *path, struct condexp
TAILQ_INSERT_TAIL(allfiles, fi, fi_next);
return;
bad:
- condexpr_destroy(optx);
+ if (optx != NULL) {
+ condexpr_destroy(optx);
+ }
}
void
Index: src/usr.bin/config/gram.y
diff -u src/usr.bin/config/gram.y:1.38 src/usr.bin/config/gram.y:1.38.2.1
--- src/usr.bin/config/gram.y:1.38 Sun Aug 11 10:37:08 2013
+++ src/usr.bin/config/gram.y Sun Aug 10 06:57:59 2014
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: gram.y,v 1.38 2013/08/11 10:37:08 pooka Exp $ */
+/* $NetBSD: gram.y,v 1.38.2.1 2014/08/10 06:57:59 tls Exp $ */
/*
*
CVS commit: [tls-earlyentropy] src/usr.bin/locate/locate
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:58:21 UTC 2014
Modified Files:
src/usr.bin/locate/locate [tls-earlyentropy]: updatedb.sh
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.18.1 src/usr.bin/locate/locate/updatedb.sh
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/locate/locate/updatedb.sh
diff -u src/usr.bin/locate/locate/updatedb.sh:1.14 src/usr.bin/locate/locate/updatedb.sh:1.14.18.1
--- src/usr.bin/locate/locate/updatedb.sh:1.14 Wed Jul 13 07:58:35 2011
+++ src/usr.bin/locate/locate/updatedb.sh Sun Aug 10 06:58:21 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: updatedb.sh,v 1.14 2011/07/13 07:58:35 apb Exp $
+# $NetBSD: updatedb.sh,v 1.14.18.1 2014/08/10 06:58:21 tls Exp $
#
# Copyright (c) 1989, 1993
# The Regents of the University of California. All rights reserved.
@@ -61,20 +61,41 @@ SRCHPATHS=
#eval \$command $quotedlist \$filename
#
shell_quote()
-{
+{(
local result=''
- local arg
+ local arg qarg
+ LC_COLLATE=C ; export LC_COLLATE # so [a-zA-Z0-9] works in ASCII
for arg in $@ ; do
- # Append a space if necessary
- result=${result}${result:+ }
- # Convert each embedded ' to '\'',
- # then insert ' at the beginning of the first line,
- # and append ' at the end of the last line.
- result=${result}$(printf %s\n $arg | \
- sed -e s/'/'''/g -e 1s/^/'/ -e \$s/\$/'/)
+ case ${arg} in
+ '')
+ qarg=''
+ ;;
+ *[!-./a-zA-Z0-9]*)
+ # Convert each embedded ' to '\'',
+ # then insert ' at the beginning of the first line,
+ # and append ' at the end of the last line.
+ # Finally, elide unnecessary '' pairs at the
+ # beginning and end of the result and as part of
+ # '\'''\'' sequences that result from multiple
+ # adjacent quotes in he input.
+ qarg=$(printf %s\n $arg | \
+ ${SED:-sed} -e s/'/'''/g \
+-e 1s/^/'/ -e \$s/\$/'/ \
+-e 1s/^''// -e \$s/''\$// \
+-e s/'''/'/g
+)
+ ;;
+ *)
+ # Arg is not the empty string, and does not contain
+ # any unsafe characters. Leave it unchanged for
+ # readability.
+ qarg=${arg}
+ ;;
+ esac
+ result=${result}${result:+ }${qarg}
done
printf %s\n $result
-}
+)}
# read configuration file
if [ -f $CONF ]; then
CVS commit: [tls-earlyentropy] src/usr.bin/m4/PSD.doc
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:58:23 UTC 2014
Modified Files:
src/usr.bin/m4/PSD.doc [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.74.1 src/usr.bin/m4/PSD.doc/Makefile
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/m4/PSD.doc/Makefile
diff -u src/usr.bin/m4/PSD.doc/Makefile:1.3 src/usr.bin/m4/PSD.doc/Makefile:1.3.74.1
--- src/usr.bin/m4/PSD.doc/Makefile:1.3 Thu Jul 10 10:34:44 2003
+++ src/usr.bin/m4/PSD.doc/Makefile Sun Aug 10 06:58:23 2014
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2003/07/10 10:34:44 lukem Exp $
+# $NetBSD: Makefile,v 1.3.74.1 2014/08/10 06:58:23 tls Exp $
#
# @(#)Makefile 8.1 (Berkeley) 6/8/93
-DIR= psd/17.m4
+SECTION=psd
+ARTICLE=m4
SRCS= m4.ms
MACROS= -msU
-paper.ps: ${SRCS}
- ${TOOL_ROFF_PS} ${SRCS} ${.TARGET}
-
.include bsd.doc.mk
CVS commit: [tls-earlyentropy] src/usr.bin/printf
Module Name:src Committed By: tls Date: Sun Aug 10 06:58:43 UTC 2014 Modified Files: src/usr.bin/printf [tls-earlyentropy]: printf.1 Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.24.22.1 src/usr.bin/printf/printf.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/printf/printf.1 diff -u src/usr.bin/printf/printf.1:1.24 src/usr.bin/printf/printf.1:1.24.22.1 --- src/usr.bin/printf/printf.1:1.24 Mon Apr 5 21:24:14 2010 +++ src/usr.bin/printf/printf.1 Sun Aug 10 06:58:43 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: printf.1,v 1.24 2010/04/05 21:24:14 joerg Exp $ +.\ $NetBSD: printf.1,v 1.24.22.1 2014/08/10 06:58:43 tls Exp $ .\ .\ Copyright (c) 1989, 1990, 1993 .\ The Regents of the University of California. All rights reserved. @@ -359,8 +359,7 @@ In no case does a non-existent or small a field; padding takes place only if the specified field width exceeds the actual width. .Sh EXIT STATUS -.Nm -exits 0 on success, 1 on failure. +.Ex -std .Sh SEE ALSO .Xr echo 1 , .Xr printf 3 ,
CVS commit: [tls-earlyentropy] src/usr.bin/nfsstat
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:58:36 UTC 2014
Modified Files:
src/usr.bin/nfsstat [tls-earlyentropy]: nfsstat.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.18.1 src/usr.bin/nfsstat/nfsstat.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/nfsstat/nfsstat.c
diff -u src/usr.bin/nfsstat/nfsstat.c:1.24 src/usr.bin/nfsstat/nfsstat.c:1.24.18.1
--- src/usr.bin/nfsstat/nfsstat.c:1.24 Tue Sep 6 18:19:58 2011
+++ src/usr.bin/nfsstat/nfsstat.c Sun Aug 10 06:58:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: nfsstat.c,v 1.24 2011/09/06 18:19:58 joerg Exp $ */
+/* $NetBSD: nfsstat.c,v 1.24.18.1 2014/08/10 06:58:36 tls Exp $ */
/*
* Copyright (c) 1983, 1989, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT(@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = from: @(#)nfsstat.c 8.1 (Berkeley) 6/6/93;
#else
-__RCSID($NetBSD: nfsstat.c,v 1.24 2011/09/06 18:19:58 joerg Exp $);
+__RCSID($NetBSD: nfsstat.c,v 1.24.18.1 2014/08/10 06:58:36 tls Exp $);
#endif
#endif /* not lint */
@@ -203,7 +203,7 @@ static void
intpr(void)
{
struct nfsstats nfsstats;
- int64_t total;
+ uint64_t total;
int i;
#define PCT(x,y) ((y) == 0 ? 0 : (int)((int64_t)(x) * 100 / (y)))
@@ -217,13 +217,13 @@ intpr(void)
for (i = 0; i NFS_NPROCS; i++)
total += nfsstats.rpccnt[i];
printf(Client Info:\n);
- printf(RPC Counts: (%lld call%s)\n, (long long)total,
+ printf(RPC Counts: (% PRIu64 call%s)\n, total,
total == 1 ? : s);
printf(%10s %14s %14s %14s %14s\n,
null, getattr, setattr, lookup, access);
printf(
- %10d %2d%% %10d %2d%% %10d %2d%% %10d %2d%% %10d %2d%%\n,
+ %10u %2u%% %10u %2u%% %10u %2u%% %10u %2u%% %10u %2u%%\n,
RPCSTAT(nfsstats.rpccnt[NFSPROC_NULL]),
RPCSTAT(nfsstats.rpccnt[NFSPROC_GETATTR]),
RPCSTAT(nfsstats.rpccnt[NFSPROC_SETATTR]),
@@ -232,7 +232,7 @@ intpr(void)
printf(%10s %14s %14s %14s %14s\n,
readlink, read, write, create, mkdir);
printf(
- %10d %2d%% %10d %2d%% %10d %2d%% %10d %2d%% %10d %2d%%\n,
+ %10u %2u%% %10u %2u%% %10u %2u%% %10u %2u%% %10u %2u%%\n,
RPCSTAT(nfsstats.rpccnt[NFSPROC_READLINK]),
RPCSTAT(nfsstats.rpccnt[NFSPROC_READ]),
RPCSTAT(nfsstats.rpccnt[NFSPROC_WRITE]),
@@ -241,7 +241,7 @@ intpr(void)
printf(%10s %14s %14s %14s %14s\n,
symlink, mknod, remove, rmdir, rename);
printf(
- %10d %2d%% %10d %2d%% %10d %2d%% %10d %2d%% %10d %2d%%\n,
+ %10u %2u%% %10u %2u%% %10u %2u%% %10u %2u%% %10u %2u%%\n,
RPCSTAT(nfsstats.rpccnt[NFSPROC_SYMLINK]),
RPCSTAT(nfsstats.rpccnt[NFSPROC_MKNOD]),
RPCSTAT(nfsstats.rpccnt[NFSPROC_REMOVE]),
@@ -250,7 +250,7 @@ intpr(void)
printf(%10s %14s %14s %14s %14s\n,
link, readdir, readdirplus, fsstat, fsinfo);
printf(
- %10d %2d%% %10d %2d%% %10d %2d%% %10d %2d%% %10d %2d%%\n,
+ %10u %2u%% %10u %2u%% %10u %2u%% %10u %2u%% %10u %2u%%\n,
RPCSTAT(nfsstats.rpccnt[NFSPROC_LINK]),
RPCSTAT(nfsstats.rpccnt[NFSPROC_READDIR]),
RPCSTAT(nfsstats.rpccnt[NFSPROC_READDIRPLUS]),
@@ -258,14 +258,14 @@ intpr(void)
RPCSTAT(nfsstats.rpccnt[NFSPROC_FSINFO]));
printf(%10s %14s\n,
pathconf, commit);
- printf(%10d %2d%% %10d %2d%%\n,
+ printf(%10u %2u%% %10u %2u%%\n,
RPCSTAT(nfsstats.rpccnt[NFSPROC_PATHCONF]),
RPCSTAT(nfsstats.rpccnt[NFSPROC_COMMIT]));
printf(RPC Info:\n);
printf(%10s %14s %14s %14s %14s\n,
timeout, invalid, unexpected, retries, requests);
- printf(%10d %14d %14d %14d %14d\n,
+ printf(%10u %14u %14u %14u %14u\n,
nfsstats.rpctimeouts,
nfsstats.rpcinvalid,
nfsstats.rpcunexpected,
@@ -276,7 +276,7 @@ intpr(void)
printf(%10s %14s %14s %14s %14s\n,
attrcache, lookupcache, read, write, readlink);
printf(
- %10d %2d%% %10d %2d%% %10d %2d%% %10d %2d%% %10d %2d%%\n,
+ %10u %2u%% %10u %2u%% %10u %2u%% %10u %2u%% %10u %2u%%\n,
NUMPCT(nfsstats.attrcache_hits,
nfsstats.attrcache_misses),
NUMPCT(nfsstats.lookupcache_hits,
@@ -289,7 +289,7 @@ intpr(void)
nfsstats.readlink_bios));
printf(%10s %14s\n,
readdir, direofcache);
- printf(%10d %2d%% %10d %2d%%\n,
+ printf(%10u %2u%% %10u %2u%%\n,
NUMPCT(nfsstats.biocache_readdirs - nfsstats.readdir_bios,
nfsstats.readdir_bios),
NUMPCT(nfsstats.direofcache_hits,
@@ -304,13 +304,13 @@ intpr(void)
for (i = 0; i NFS_NPROCS; i++)
total += nfsstats.srvrpccnt[i];
printf(Server Info:\n);
- printf(RPC Counts: (%lld call%s)\n, (long long)total,
+ printf(RPC Counts: (% PRIu64 call%s)\n, total,
total == 1 ? : s);
printf(%10s %14s %14s %14s %14s\n,
null, getattr, setattr, lookup, access);
printf(
- %10d %2d%% %10d %2d%% %10d %2d%% %10d %2d%% %10d
CVS commit: [tls-earlyentropy] src/usr.bin/mail
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:58:25 UTC 2014
Modified Files:
src/usr.bin/mail [tls-earlyentropy]: Makefile
src/usr.bin/mail/USD.doc [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.35.18.1 src/usr.bin/mail/Makefile
cvs rdiff -u -r1.5 -r1.5.74.1 src/usr.bin/mail/USD.doc/Makefile
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/Makefile
diff -u src/usr.bin/mail/Makefile:1.35 src/usr.bin/mail/Makefile:1.35.18.1
--- src/usr.bin/mail/Makefile:1.35 Tue Aug 16 11:49:17 2011
+++ src/usr.bin/mail/Makefile Sun Aug 10 06:58:25 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2011/08/16 11:49:17 christos Exp $
+# $NetBSD: Makefile,v 1.35.18.1 2014/08/10 06:58:25 tls Exp $
# @(#)Makefile 8.3 (Berkeley) 4/20/95
.include bsd.own.mk
@@ -69,11 +69,9 @@ CWARNFLAGS+= -Wextra
.if ${MKSHARE} != no
FILESDIR= /usr/share/misc
FILES= mail.help mail.tildehelp
+.endif
-.if make(install)
SUBDIR+= USD.doc
-.endif
-.endif
CONFIGFILES= mail.rc
FILESDIR_mail.rc= /etc
Index: src/usr.bin/mail/USD.doc/Makefile
diff -u src/usr.bin/mail/USD.doc/Makefile:1.5 src/usr.bin/mail/USD.doc/Makefile:1.5.74.1
--- src/usr.bin/mail/USD.doc/Makefile:1.5 Thu Jul 10 10:34:45 2003
+++ src/usr.bin/mail/USD.doc/Makefile Sun Aug 10 06:58:25 2014
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2003/07/10 10:34:45 lukem Exp $
+# $NetBSD: Makefile,v 1.5.74.1 2014/08/10 06:58:25 tls Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/8/93
-DIR= usd/07.mail
+SECTION=reference/ref1
+ARTICLE=mail
SRCS= mail0.nr mail1.nr mail2.nr mail3.nr mail4.nr mail5.nr mail6.nr \
mail7.nr mail8.nr mail9.nr maila.nr
MACROS= -me
-
-paper.ps: ${SRCS}
- ${TOOL_SOELIM} -I${.CURDIR} ${.ALLSRC} | ${TOOL_TBL} | \
- ${TOOL_ROFF_PS} ${MACROS} ${.TARGET}
+ROFF_TBL=yes
+#EXTRAHTMLFILES=# none!
.include bsd.doc.mk
CVS commit: [tls-earlyentropy] src/usr.bin/progress
Module Name:src Committed By: tls Date: Sun Aug 10 06:58:45 UTC 2014 Modified Files: src/usr.bin/progress [tls-earlyentropy]: progress.1 Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.14.38.1 src/usr.bin/progress/progress.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/progress/progress.1 diff -u src/usr.bin/progress/progress.1:1.14 src/usr.bin/progress/progress.1:1.14.38.1 --- src/usr.bin/progress/progress.1:1.14 Wed Apr 30 13:11:01 2008 +++ src/usr.bin/progress/progress.1 Sun Aug 10 06:58:45 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: progress.1,v 1.14 2008/04/30 13:11:01 martin Exp $ +.\ $NetBSD: progress.1,v 1.14.38.1 2014/08/10 06:58:45 tls Exp $ .\ .\ Copyright (c) 2003-2007 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -94,8 +94,7 @@ is specified, calculate the length using .Ic gzip -l . .El .Sh EXIT STATUS -.Nm -exits 0 on success. +.Ex -std .Sh EXAMPLES The command .Dl progress -zf file.tar.gz tar xf -
CVS commit: [tls-earlyentropy] src/usr.bin/getaddrinfo
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:58:08 UTC 2014
Modified Files:
src/usr.bin/getaddrinfo [tls-earlyentropy]: Makefile getaddrinfo.1
getaddrinfo.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.2.1 src/usr.bin/getaddrinfo/Makefile
cvs rdiff -u -r1.3 -r1.3.2.1 src/usr.bin/getaddrinfo/getaddrinfo.1 \
src/usr.bin/getaddrinfo/getaddrinfo.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/getaddrinfo/Makefile
diff -u src/usr.bin/getaddrinfo/Makefile:1.1 src/usr.bin/getaddrinfo/Makefile:1.1.2.1
--- src/usr.bin/getaddrinfo/Makefile:1.1 Mon Sep 30 06:19:22 2013
+++ src/usr.bin/getaddrinfo/Makefile Sun Aug 10 06:58:08 2014
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2013/09/30 06:19:22 riastradh Exp $
+# $NetBSD: Makefile,v 1.1.2.1 2014/08/10 06:58:08 tls Exp $
+
+.include bsd.own.mk
PROG= getaddrinfo
Index: src/usr.bin/getaddrinfo/getaddrinfo.1
diff -u src/usr.bin/getaddrinfo/getaddrinfo.1:1.3 src/usr.bin/getaddrinfo/getaddrinfo.1:1.3.2.1
--- src/usr.bin/getaddrinfo/getaddrinfo.1:1.3 Wed Mar 19 18:21:39 2014
+++ src/usr.bin/getaddrinfo/getaddrinfo.1 Sun Aug 10 06:58:08 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: getaddrinfo.1,v 1.3 2014/03/19 18:21:39 riastradh Exp $
+.\ $NetBSD: getaddrinfo.1,v 1.3.2.1 2014/08/10 06:58:08 tls Exp $
.\
.\ Copyright (c) 2013 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -27,7 +27,7 @@
.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\ POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd March 19, 2014
+.Dd April 22, 2014
.Dt GETADDRINFO 1
.Os
.Sh NAME
@@ -38,7 +38,7 @@
.Op Fl cNnP
.Op Fl f Ar family
.Op Fl p Ar protocol
-.Op Fl s Ar service
+.Op Fl s Ar service Ns Op Ns / Ns Ar protocol
.Op Fl t Ar socktype
.Op Ar hostname
.Sh DESCRIPTION
@@ -119,8 +119,11 @@ or
Specify a protocol.
Protocols may be numeric, or symbolic as listed in
.Xr protocols 5 .
-.It Fl s Ar service
+.It Fl s Ar service Ns Op Ns / Ns Ar protocol
Specify a service to look up.
+Services may be symbolic or numeric with an optional
+protocol suffix as listed in
+.Xr services 5 .
If no service is specified, a hostname must be specified.
.It Fl t Ar socktype
Specify a socket type.
Index: src/usr.bin/getaddrinfo/getaddrinfo.c
diff -u src/usr.bin/getaddrinfo/getaddrinfo.c:1.3 src/usr.bin/getaddrinfo/getaddrinfo.c:1.3.2.1
--- src/usr.bin/getaddrinfo/getaddrinfo.c:1.3 Wed Mar 19 01:24:32 2014
+++ src/usr.bin/getaddrinfo/getaddrinfo.c Sun Aug 10 06:58:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: getaddrinfo.c,v 1.3 2014/03/19 01:24:32 ginsbach Exp $ */
+/* $NetBSD: getaddrinfo.c,v 1.3.2.1 2014/08/10 06:58:08 tls Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: getaddrinfo.c,v 1.3 2014/03/19 01:24:32 ginsbach Exp $);
+__RCSID($NetBSD: getaddrinfo.c,v 1.3.2.1 2014/08/10 06:58:08 tls Exp $);
#include sys/types.h
#include sys/socket.h
@@ -132,6 +132,24 @@ main(int argc, char **argv)
if (argc == 1)
hostname = argv[0];
+ if (service != NULL) {
+ char *p;
+
+ if ((p = strchr(service, '/')) != NULL) {
+ if (hints.ai_protocol != 0) {
+warnx(protocol already specified);
+usage();
+ }
+ *p = '\0';
+ p++;
+
+ if (!parse_protocol(p, hints.ai_protocol)) {
+warnx(invalid protocol: %s, p);
+usage();
+ }
+ }
+ }
+
error = getaddrinfo(hostname, service, hints, addrinfo);
if (error)
errx(1, %s, gai_strerror(error));
CVS commit: [tls-earlyentropy] src/usr.bin/ipcs
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:58:16 UTC 2014
Modified Files:
src/usr.bin/ipcs [tls-earlyentropy]: Makefile ipcs.1 ipcs.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.22.1 src/usr.bin/ipcs/Makefile
cvs rdiff -u -r1.19 -r1.19.2.1 src/usr.bin/ipcs/ipcs.1
cvs rdiff -u -r1.42 -r1.42.24.1 src/usr.bin/ipcs/ipcs.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/ipcs/Makefile
diff -u src/usr.bin/ipcs/Makefile:1.10 src/usr.bin/ipcs/Makefile:1.10.22.1
--- src/usr.bin/ipcs/Makefile:1.10 Tue Apr 14 22:15:21 2009
+++ src/usr.bin/ipcs/Makefile Sun Aug 10 06:58:16 2014
@@ -1,7 +1,5 @@
-# $NetBSD: Makefile,v 1.10 2009/04/14 22:15:21 lukem Exp $
+# $NetBSD: Makefile,v 1.10.22.1 2014/08/10 06:58:16 tls Exp $
PROG= ipcs
-DPADD+= ${LIBKVM}
-LDADD+= -lkvm
.include bsd.prog.mk
Index: src/usr.bin/ipcs/ipcs.1
diff -u src/usr.bin/ipcs/ipcs.1:1.19 src/usr.bin/ipcs/ipcs.1:1.19.2.1
--- src/usr.bin/ipcs/ipcs.1:1.19 Tue Mar 18 18:20:45 2014
+++ src/usr.bin/ipcs/ipcs.1 Sun Aug 10 06:58:16 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: ipcs.1,v 1.19 2014/03/18 18:20:45 riastradh Exp $
+.\ $NetBSD: ipcs.1,v 1.19.2.1 2014/08/10 06:58:16 tls Exp $
.\
.\ Copyright (c) 1994 SigmaSoft, Th. Lockert
.\ All rights reserved.
@@ -23,7 +23,7 @@
.\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd March 21, 2004
+.Dd June 11, 2014
.Dt IPCS 1
.Os
.Sh NAME
@@ -32,8 +32,6 @@
.Sh SYNOPSIS
.Nm
.Op Fl abcmopqstMQST
-.Op Fl C Ar system
-.Op Fl N Ar core
.Sh DESCRIPTION
The
.Nm
@@ -95,17 +93,8 @@ of the last control operation on an IPC
the last send or receive of a message,
the last attach or detach of a shared memory segment,
or the last operation on a semaphore.
-.It Fl C Ar system
-Extract the name list from the specified system instead of the
-default
-.Dq Pa /netbsd .
.It Fl M
Display system information about shared memory.
-.It Fl N Ar core
-Extract values associated with the name list from the specified
-core instead of the default
-.Dq Pa /dev/kmem .
-and semaphores.
.It Fl Q
Display system information about messages queues.
.It Fl S
@@ -138,13 +127,6 @@ System data structures may change while
is running; the output of
.Nm
is not guaranteed to be consistent.
-.Sh FILES
-.Bl -tag -width /etc/passwd -compact
-.It Pa /dev/kmem
-default kernel memory
-.It Pa /netbsd
-default system name list
-.El
.Sh SEE ALSO
.Xr ipcrm 1 ,
.Xr shmat 2 ,
Index: src/usr.bin/ipcs/ipcs.c
diff -u src/usr.bin/ipcs/ipcs.c:1.42 src/usr.bin/ipcs/ipcs.c:1.42.24.1
--- src/usr.bin/ipcs/ipcs.c:1.42 Sun Jan 18 01:10:34 2009
+++ src/usr.bin/ipcs/ipcs.c Sun Aug 10 06:58:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ipcs.c,v 1.42 2009/01/18 01:10:34 lukem Exp $ */
+/* $NetBSD: ipcs.c,v 1.42.24.1 2014/08/10 06:58:16 tls Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -66,9 +66,7 @@
#include err.h
#include fcntl.h
#include grp.h
-#include kvm.h
#include limits.h
-#include nlist.h
#include paths.h
#include pwd.h
#include stdio.h
@@ -90,13 +88,11 @@
#define PID 8
#define TIME 16
-static char *core = NULL, *namelist = NULL;
static int display = 0;
static int option = 0;
static void cvt_time(time_t, char *, size_t);
static char*fmt_perm(u_short);
-static void ipcs_kvm(void);
static void msg_sysctl(void);
static void sem_sysctl(void);
static void shm_sysctl(void);
@@ -174,7 +170,7 @@ main(int argc, char *argv[])
int i;
time_t now;
- while ((i = getopt(argc, argv, MmQqSsabC:cN:optT)) != -1)
+ while ((i = getopt(argc, argv, MmQqSsabcoptT)) != -1)
switch (i) {
case 'M':
display |= SHMTOTAL;
@@ -203,15 +199,9 @@ main(int argc, char *argv[])
case 'b':
option |= BIGGEST;
break;
- case 'C':
- core = optarg;
- break;
case 'c':
option |= CREATOR;
break;
- case 'N':
- namelist = optarg;
- break;
case 'o':
option |= OUTSTANDING;
break;
@@ -229,22 +219,19 @@ main(int argc, char *argv[])
usage();
(void)time(now);
- (void)printf(IPC status from %s as of %s\n,
+ (void)printf(IPC status from running system as of %s\n,
/* and extra \n from ctime(3) */
- core == NULL ? running system : core, ctime(now));
+ ctime(now));
if (display == 0)
display = SHMINFO | MSGINFO | SEMINFO;
- if (core == NULL) {
- if (display (MSGINFO | MSGTOTAL))
- msg_sysctl();
- if (display (SHMINFO | SHMTOTAL))
- shm_sysctl();
- if (display (SEMINFO | SEMTOTAL))
- sem_sysctl();
- } else
- ipcs_kvm();
+ if (display (MSGINFO | MSGTOTAL))
+ msg_sysctl();
+ if (display (SHMINFO | SHMTOTAL))
+ shm_sysctl();
+ if (display (SEMINFO | SEMTOTAL))
+ sem_sysctl();
return 0;
}
@@ -680,214 +667,12 @@ done:
free(buf);
}
-static struct nlist symbols[] = {
- { .n_name = _sema },
CVS commit: [tls-earlyentropy] src/usr.bin/patch
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:58:38 UTC 2014
Modified Files:
src/usr.bin/patch [tls-earlyentropy]: backupfile.c patch.1
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.36.1 src/usr.bin/patch/backupfile.c
cvs rdiff -u -r1.16 -r1.16.6.1 src/usr.bin/patch/patch.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/patch/backupfile.c
diff -u src/usr.bin/patch/backupfile.c:1.14 src/usr.bin/patch/backupfile.c:1.14.36.1
--- src/usr.bin/patch/backupfile.c:1.14 Fri Sep 19 18:33:34 2008
+++ src/usr.bin/patch/backupfile.c Sun Aug 10 06:58:38 2014
@@ -1,7 +1,7 @@
/*
* $OpenBSD: backupfile.c,v 1.19 2006/03/11 19:41:30 otto Exp $
* $DragonFly: src/usr.bin/patch/backupfile.c,v 1.5 2008/08/11 00:05:06 joerg Exp $
- * $NetBSD: backupfile.c,v 1.14 2008/09/19 18:33:34 joerg Exp $
+ * $NetBSD: backupfile.c,v 1.14.36.1 2014/08/10 06:58:38 tls Exp $
*/
/*
@@ -22,7 +22,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: backupfile.c,v 1.14 2008/09/19 18:33:34 joerg Exp $);
+__RCSID($NetBSD: backupfile.c,v 1.14.36.1 2014/08/10 06:58:38 tls Exp $);
#include ctype.h
#include dirent.h
@@ -227,11 +227,11 @@ invalid_arg(const char *kind, const char
}
static const char *backup_args[] = {
- never, simple, nil, existing, t, numbered, 0
+ none, never, simple, nil, existing, t, numbered, 0
};
static enum backup_type backup_types[] = {
- simple, simple, numbered_existing,
+ none, simple, simple, numbered_existing,
numbered_existing, numbered, numbered
};
Index: src/usr.bin/patch/patch.1
diff -u src/usr.bin/patch/patch.1:1.16 src/usr.bin/patch/patch.1:1.16.6.1
--- src/usr.bin/patch/patch.1:1.16 Tue Jan 29 09:30:11 2013
+++ src/usr.bin/patch/patch.1 Sun Aug 10 06:58:38 2014
@@ -1,6 +1,6 @@
.\ $OpenBSD: patch.1,v 1.22 2008/06/06 20:44:00 jmc Exp $
.\ $DragonFly: src/usr.bin/patch/patch.1,v 1.10 2008/08/18 19:15:55 joerg Exp $
-.\ $NetBSD: patch.1,v 1.16 2013/01/29 09:30:11 wiz Exp $
+.\ $NetBSD: patch.1,v 1.16.6.1 2014/08/10 06:58:38 tls Exp $
.\ Copyright 1986, Larry Wall
.\
.\ Redistribution and use in source and binary forms, with or without
@@ -21,7 +21,7 @@
.\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\ SUCH DAMAGE.
.\
-.Dd August 18, 2008
+.Dd April 11, 2014
.Dt PATCH 1
.Os
.Sh NAME
@@ -38,7 +38,7 @@
.Op Fl o Ar out-file
.Op Fl p Ar strip-count
.Op Fl r Ar rej-name
-.Op Fl V Cm t | nil | never
+.Op Fl V Cm t | nil | never | none
.Op Fl x Ar number
.Op Fl z Ar backup-ext
.Op Fl Fl posix
@@ -266,7 +266,7 @@ and assume that patches are reversed if
Forces
.Nm
to interpret the patch file as a unified context diff (a unidiff).
-.It Fl V Cm t | nil | never , Fl Fl version-control Cm t | nil | never
+.It Fl V Cm t | nil | never | none , Fl Fl version-control Cm t | nil | never | none
Causes the next argument to be interpreted as a method for creating
backup file names.
The type of backups made can also be given in the
CVS commit: [tls-earlyentropy] src/usr.bin/pmap
Module Name:src Committed By: tls Date: Sun Aug 10 06:58:41 UTC 2014 Modified Files: src/usr.bin/pmap [tls-earlyentropy]: pmap.1 Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.17.22.1 src/usr.bin/pmap/pmap.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/pmap/pmap.1 diff -u src/usr.bin/pmap/pmap.1:1.17 src/usr.bin/pmap/pmap.1:1.17.22.1 --- src/usr.bin/pmap/pmap.1:1.17 Fri May 14 17:31:26 2010 +++ src/usr.bin/pmap/pmap.1 Sun Aug 10 06:58:41 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: pmap.1,v 1.17 2010/05/14 17:31:26 joerg Exp $ +.\ $NetBSD: pmap.1,v 1.17.22.1 2014/08/10 06:58:41 tls Exp $ .\ .\ Copyright (c) 2002, 2003 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -202,8 +202,7 @@ and another process as the same time, si .Fl p and place the extra PID at the end of the command line. .Sh EXIT STATUS -.Nm -exits 0 on success, and \*[Gt]0 if an error occurred. +.Ex -std .Sh EXAMPLES While the meaning of most of the output is self-evident, some pieces of it may appear to be a little inscrutable.
CVS commit: [tls-earlyentropy] src/usr.bin/rsh
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:58:50 UTC 2014
Modified Files:
src/usr.bin/rsh [tls-earlyentropy]: rsh.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.33.18.1 src/usr.bin/rsh/rsh.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/rsh/rsh.c
diff -u src/usr.bin/rsh/rsh.c:1.33 src/usr.bin/rsh/rsh.c:1.33.18.1
--- src/usr.bin/rsh/rsh.c:1.33 Mon Aug 29 14:22:46 2011
+++ src/usr.bin/rsh/rsh.c Sun Aug 10 06:58:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rsh.c,v 1.33 2011/08/29 14:22:46 joerg Exp $ */
+/* $NetBSD: rsh.c,v 1.33.18.1 2014/08/10 06:58:49 tls Exp $ */
/*-
* Copyright (c) 1983, 1990, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = @(#)rsh.c 8.4 (Berkeley) 4/29/95;
#else
-__RCSID($NetBSD: rsh.c,v 1.33 2011/08/29 14:22:46 joerg Exp $);
+__RCSID($NetBSD: rsh.c,v 1.33.18.1 2014/08/10 06:58:49 tls Exp $);
#endif
#endif /* not lint */
@@ -76,7 +76,9 @@ int remerr;
static int sigs[] = { SIGINT, SIGTERM, SIGQUIT };
static char *copyargs(char **);
+#ifndef IN_RCMD
static void sendsig(int);
+#endif
static int checkfd(struct pollfd *, int);
static void talk(int, sigset_t *, pid_t, int);
__dead static void usage(void);
@@ -265,6 +267,7 @@ main(int argc, char **argv)
(void)sigprocmask(SIG_BLOCK, nset, oset);
+#ifndef IN_RCMD
for (i = 0; i sizeof(sigs) / sizeof(sigs[0]); i++) {
struct sigaction sa;
@@ -273,6 +276,7 @@ main(int argc, char **argv)
(void)sigaction(sigs[i], sa, NULL);
}
}
+#endif
if (!nflag) {
pid = fork();
@@ -282,13 +286,8 @@ main(int argc, char **argv)
else
pid = -1;
-#if defined(KERBEROS) defined(CRYPT)
- if (!doencrypt)
-#endif
- {
- (void)ioctl(remerr, FIONBIO, one);
- (void)ioctl(rem, FIONBIO, one);
- }
+ (void)ioctl(remerr, FIONBIO, one);
+ (void)ioctl(rem, FIONBIO, one);
talk(nflag, oset, pid, rem);
@@ -305,17 +304,12 @@ checkfd(struct pollfd *fdp, int outfd)
if (fdp-revents (POLLNVAL|POLLERR|POLLHUP))
return -1;
-
+
if ((fdp-revents POLLIN) == 0)
return 0;
errno = 0;
-#if defined(KERBEROS) defined(CRYPT)
- if (doencrypt)
- nr = des_read(fdp-fd, buf, sizeof buf);
- else
-#endif
- nr = read(fdp-fd, buf, sizeof buf);
+ nr = read(fdp-fd, buf, sizeof buf);
if (nr = 0) {
if (errno != EAGAIN)
@@ -339,7 +333,7 @@ static void
talk(int nflag, sigset_t *oset, __pid_t pid, int rem)
{
int nr, nw, nfds;
- struct pollfd fds[2], *fdp = fds[0];
+ struct pollfd fds[3], *fdp = fds[0];
char *bp, buf[BUFSIZ];
if (!nflag pid == 0) {
@@ -380,12 +374,7 @@ rewrite: if (poll(fdp, 1, INFTIM) == -1
if ((fdp-revents POLLOUT) == 0)
goto rewrite;
-#if defined(KERBEROS) defined(CRYPT)
- if (doencrypt)
-nw = des_write(rem, bp, nr);
- else
-#endif
-nw = write(rem, bp, nr);
+ nw = write(rem, bp, nr);
if (nw 0) {
if (errno == EAGAIN)
@@ -400,39 +389,57 @@ done:
exit(0);
}
- (void)sigprocmask(SIG_SETMASK, oset, NULL);
- fds[0].events = fds[1].events = POLLIN|POLLNVAL|POLLERR|POLLHUP;
- fds[0].fd = remerr;
- fds[1].fd = rem;
+#ifdef IN_RCMD
fdp = fds[0];
+ nfds = 3;
+ fds[0].events = POLLIN|POLLNVAL|POLLERR|POLLHUP;
+ fds[0].fd = 2;
+#else
+ (void)sigprocmask(SIG_SETMASK, oset, NULL);
+ fdp = fds[1];
nfds = 2;
+ fds[0].events = 0;
+#endif
+ fds[1].events = fds[2].events = POLLIN|POLLNVAL|POLLERR|POLLHUP;
+ fds[1].fd = remerr;
+ fds[2].fd = rem;
do {
if (poll(fdp, nfds, INFTIM) == -1) {
if (errno != EINTR)
err(1, poll);
continue;
}
- if (fds[0].events != 0 checkfd(fds[0], 2) == -1) {
+ if ((fds[1].events != 0 checkfd(fds[1], 2) == -1)
+#ifdef IN_RCMD
+ || (fds[0].events != 0 checkfd(fds[0], remerr) == -1)
+#endif
+ ) {
+ nfds--;
+ fds[1].events = 0;
+#ifdef IN_RCMD
nfds--;
fds[0].events = 0;
- fdp = fds[1];
+#endif
+ fdp = fds[2];
}
- if (fds[1].events != 0 checkfd(fds[1], 1) == -1) {
+ if (fds[2].events != 0 checkfd(fds[2], 1) == -1) {
nfds--;
- fds[1].events = 0;
+ fds[2].events = 0;
}
}
while (nfds);
}
+#ifndef IN_RCMD
static void
sendsig(int sig)
{
char signo;
signo = sig;
- (void)write(remerr, signo, 1);
+ (void)write(remerr, signo, 1);
}
+#endif
static char *
CVS commit: [tls-earlyentropy] src/usr.bin/kdump
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:58:18 UTC 2014
Modified Files:
src/usr.bin/kdump [tls-earlyentropy]: kdump.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.117.2.1 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/kdump/kdump.c
diff -u src/usr.bin/kdump/kdump.c:1.117 src/usr.bin/kdump/kdump.c:1.117.2.1
--- src/usr.bin/kdump/kdump.c:1.117 Wed Nov 27 20:27:58 2013
+++ src/usr.bin/kdump/kdump.c Sun Aug 10 06:58:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kdump.c,v 1.117 2013/11/27 20:27:58 christos Exp $ */
+/* $NetBSD: kdump.c,v 1.117.2.1 2014/08/10 06:58:18 tls 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.117 2013/11/27 20:27:58 christos Exp $);
+__RCSID($NetBSD: kdump.c,v 1.117.2.1 2014/08/10 06:58:18 tls Exp $);
#endif
#endif /* not lint */
@@ -652,14 +652,13 @@ rprint(register_t ret)
{
if (!plain) {
- (void)printf(%ld, (long)ret);
- if (!small(ret))
- (void)printf(/%#lx, (long)ret);
+ output_long(ret, 0);
+ if (!small(ret)) {
+ putchar('/');
+ output_long(ret, 1);
+ }
} else {
- if (decimal || small(ret))
- (void)printf(%ld, (long)ret);
- else
- (void)printf(%#lx, (long)ret);
+ output_long(ret, !(decimal || small(ret)));
}
}
CVS commit: [tls-earlyentropy] src/usr.bin/netstat
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:58:32 UTC 2014
Modified Files:
src/usr.bin/netstat [tls-earlyentropy]: main.c netstat.h route.c show.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.88.2.1 src/usr.bin/netstat/main.c
cvs rdiff -u -r1.48 -r1.48.2.1 src/usr.bin/netstat/netstat.h
cvs rdiff -u -r1.80 -r1.80.6.1 src/usr.bin/netstat/route.c
cvs rdiff -u -r1.18 -r1.18.2.1 src/usr.bin/netstat/show.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/netstat/main.c
diff -u src/usr.bin/netstat/main.c:1.88 src/usr.bin/netstat/main.c:1.88.2.1
--- src/usr.bin/netstat/main.c:1.88 Sat Nov 23 22:01:12 2013
+++ src/usr.bin/netstat/main.c Sun Aug 10 06:58:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.88 2013/11/23 22:01:12 christos Exp $ */
+/* $NetBSD: main.c,v 1.88.2.1 2014/08/10 06:58:32 tls Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = from: @(#)main.c 8.4 (Berkeley) 3/1/94;
#else
-__RCSID($NetBSD: main.c,v 1.88 2013/11/23 22:01:12 christos Exp $);
+__RCSID($NetBSD: main.c,v 1.88.2.1 2014/08/10 06:58:32 tls Exp $);
#endif
#endif /* not lint */
@@ -79,8 +79,8 @@ struct nlist nl[] = {
{ _udbtable, 0, 0, 0, 0 },
#define N_UDPSTAT 5
{ _udpstat, 0, 0, 0, 0 }, /* not available via kvm */
-#define N_IFNET 6
- { _ifnet, 0, 0, 0, 0 },
+#define N_IFNET_LIST 6
+ { _ifnet_list, 0, 0, 0, 0 },
#define N_ICMPSTAT 7
{ _icmpstat, 0, 0, 0, 0 }, /* not available via kvm */
#define N_RTSTAT 8
@@ -570,7 +570,7 @@ main(int argc, char *argv[])
}
if (pflag) {
if (iflag tp-pr_istats)
- intpr(interval, nl[N_IFNET].n_value, tp-pr_istats);
+ intpr(interval, nl[N_IFNET_LIST].n_value, tp-pr_istats);
else if (tp-pr_stats)
(*tp-pr_stats)(nl[tp-pr_sindex].n_value,
tp-pr_name);
@@ -624,17 +624,17 @@ main(int argc, char *argv[])
if (af != AF_UNSPEC)
goto protostat;
- intpr(interval, nl[N_IFNET].n_value, NULL);
+ intpr(interval, nl[N_IFNET_LIST].n_value, NULL);
break;
}
if (rflag) {
if (sflag)
rt_stats(use_sysctl ? 0 : nl[N_RTSTAT].n_value);
else {
-if (!use_sysctl)
- err(1, -r is not supported
- for post-mortem analysis.);
-p_rttables(af);
+if (use_sysctl)
+ p_rttables(af);
+else
+ routepr(nl[N_RTREE].n_value);
}
break;
}
@@ -723,7 +723,7 @@ printproto(struct protox *tp, const char
if (sflag) {
if (iflag) {
if (tp-pr_istats)
-intpr(interval, nl[N_IFNET].n_value,
+intpr(interval, nl[N_IFNET_LIST].n_value,
tp-pr_istats);
return;
}
Index: src/usr.bin/netstat/netstat.h
diff -u src/usr.bin/netstat/netstat.h:1.48 src/usr.bin/netstat/netstat.h:1.48.2.1
--- src/usr.bin/netstat/netstat.h:1.48 Sat Nov 23 22:01:12 2013
+++ src/usr.bin/netstat/netstat.h Sun Aug 10 06:58:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: netstat.h,v 1.48 2013/11/23 22:01:12 christos Exp $ */
+/* $NetBSD: netstat.h,v 1.48.2.1 2014/08/10 06:58:32 tls Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -67,57 +67,59 @@ int use_sysctl; /* use sysctl instead of
int force_sysctl; /* force use of sysctl (or exit) - for testing */
-int kread __P((u_long addr, char *buf, int size));
-const char *plural __P((int));
-const char *plurales __P((int));
-int get_hardticks __P((void));
-
-void protopr __P((u_long, const char *));
-void tcp_stats __P((u_long, const char *));
-void tcp_dump __P((u_long, const char *, u_long));
-void udp_stats __P((u_long, const char *));
-void ip_stats __P((u_long, const char *));
-void icmp_stats __P((u_long, const char *));
-void igmp_stats __P((u_long, const char *));
-void pim_stats __P((u_long, const char *));
-void arp_stats __P((u_long, const char *));
-void carp_stats __P((u_long, const char *));
-void pfsync_stats __P((u_long, const char*));
+int kread(u_long addr, char *buf, int size);
+const char *plural(int);
+const char *plurales(int);
+int get_hardticks(void);
+
+void protopr(u_long, const char *);
+void tcp_stats(u_long, const char *);
+void tcp_dump(u_long, const char *, u_long);
+void udp_stats(u_long, const char *);
+void ip_stats(u_long, const char *);
+void icmp_stats(u_long, const char *);
+void igmp_stats(u_long, const char *);
+void pim_stats(u_long, const char *);
+void arp_stats(u_long, const char *);
+void carp_stats(u_long, const char *);
+void pfsync_stats(u_long, const char*);
#ifdef IPSEC
-void fast_ipsec_stats __P((u_long, const char *));
+void fast_ipsec_stats(u_long, const char *);
#endif
#ifdef INET6
struct sockaddr_in6;
struct in6_addr;
-void ip6protopr __P((u_long, const char *));
-void tcp6_stats __P((u_long, const char *));
-void tcp6_dump __P((u_long, const char *, u_long));
-void udp6_stats __P((u_long, const char *));
-void ip6_stats __P((u_long, const char *));
-void ip6_ifstats __P((const char *));
CVS commit: [tls-earlyentropy] src/usr.bin/nbperf
Module Name:src Committed By: tls Date: Sun Aug 10 06:58:29 UTC 2014 Modified Files: src/usr.bin/nbperf [tls-earlyentropy]: nbperf-bdz.c Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.8.6.1 src/usr.bin/nbperf/nbperf-bdz.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/nbperf/nbperf-bdz.c diff -u src/usr.bin/nbperf/nbperf-bdz.c:1.8 src/usr.bin/nbperf/nbperf-bdz.c:1.8.6.1 --- src/usr.bin/nbperf/nbperf-bdz.c:1.8 Fri Mar 1 18:26:10 2013 +++ src/usr.bin/nbperf/nbperf-bdz.c Sun Aug 10 06:58:29 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: nbperf-bdz.c,v 1.8 2013/03/01 18:26:10 joerg Exp $ */ +/* $NetBSD: nbperf-bdz.c,v 1.8.6.1 2014/08/10 06:58:29 tls Exp $ */ /*- * Copyright (c) 2009, 2012 The NetBSD Foundation, Inc. * All rights reserved. @@ -36,7 +36,7 @@ #endif #include sys/cdefs.h -__RCSID($NetBSD: nbperf-bdz.c,v 1.8 2013/03/01 18:26:10 joerg Exp $); +__RCSID($NetBSD: nbperf-bdz.c,v 1.8.6.1 2014/08/10 06:58:29 tls Exp $); #include err.h #include inttypes.h @@ -240,7 +240,7 @@ print_hash(struct nbperf *nbperf, struct fprintf(nbperf-output, \tidx2 = idx - holes64[idx 6] - holes64k[idx 16];\n \tidx2 -= popcount64(g1[idx 6] g2[idx 6]\n - \t(((uint64_t)1 idx) - 1));\n + \t(((uint64_t)1 (idx 63)) - 1));\n \treturn idx2;\n); fprintf(nbperf-output, }\n);
CVS commit: [tls-earlyentropy] src/usr.bin/rump_allserver
Module Name:src Committed By: tls Date: Sun Aug 10 06:58:53 UTC 2014 Modified Files: src/usr.bin/rump_allserver [tls-earlyentropy]: rump_allserver.c Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.36.2.1 src/usr.bin/rump_allserver/rump_allserver.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/rump_allserver/rump_allserver.c diff -u src/usr.bin/rump_allserver/rump_allserver.c:1.36 src/usr.bin/rump_allserver/rump_allserver.c:1.36.2.1 --- src/usr.bin/rump_allserver/rump_allserver.c:1.36 Fri Mar 21 16:26:30 2014 +++ src/usr.bin/rump_allserver/rump_allserver.c Sun Aug 10 06:58:53 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_allserver.c,v 1.36 2014/03/21 16:26:30 pooka Exp $ */ +/* $NetBSD: rump_allserver.c,v 1.36.2.1 2014/08/10 06:58:53 tls Exp $ */ /*- * Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved. @@ -28,7 +28,7 @@ #include rump/rumpuser_port.h #ifndef lint -__RCSID($NetBSD: rump_allserver.c,v 1.36 2014/03/21 16:26:30 pooka Exp $); +__RCSID($NetBSD: rump_allserver.c,v 1.36.2.1 2014/08/10 06:58:53 tls Exp $); #endif /* !lint */ #include sys/types.h @@ -151,14 +151,6 @@ main(int argc, char *argv[]) unsigned nmods = 0, curmod = 0, nlibs = 0, curlib = 0, libidx; unsigned liblast = -1; /* XXXgcc */ -#ifdef __GLIBC__ - char *p_weak; - - if ((p_weak = getenv(LD_DYNAMIC_WEAK)) == NULL || *p_weak != '1') - fprintf(stderr, WARNING: LD_DYNAMIC_WEAK is not set to - \1\ in the environment\n); -#endif - #ifdef PLATFORM_HAS_SETGETPROGNAME setprogname(argv[0]); #endif
CVS commit: [tls-earlyentropy] src/usr.bin/gprof
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:58:12 UTC 2014
Modified Files:
src/usr.bin/gprof [tls-earlyentropy]: Makefile
src/usr.bin/gprof/PSD.doc [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.27.86.1 src/usr.bin/gprof/Makefile
cvs rdiff -u -r1.6 -r1.6.74.1 src/usr.bin/gprof/PSD.doc/Makefile
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/gprof/Makefile
diff -u src/usr.bin/gprof/Makefile:1.27 src/usr.bin/gprof/Makefile:1.27.86.1
--- src/usr.bin/gprof/Makefile:1.27 Tue Feb 9 18:28:10 1999
+++ src/usr.bin/gprof/Makefile Sun Aug 10 06:58:12 2014
@@ -1,7 +1,5 @@
-# $NetBSD: Makefile,v 1.27 1999/02/09 18:28:10 tv Exp $
+# $NetBSD: Makefile,v 1.27.86.1 2014/08/10 06:58:12 tls Exp $
-.if make(install)
-SUBDIR= PSD.doc
-.endif
+SUBDIR=PSD.doc
.include bsd.subdir.mk
Index: src/usr.bin/gprof/PSD.doc/Makefile
diff -u src/usr.bin/gprof/PSD.doc/Makefile:1.6 src/usr.bin/gprof/PSD.doc/Makefile:1.6.74.1
--- src/usr.bin/gprof/PSD.doc/Makefile:1.6 Thu Jul 10 10:34:44 2003
+++ src/usr.bin/gprof/PSD.doc/Makefile Sun Aug 10 06:58:12 2014
@@ -1,15 +1,18 @@
-# $NetBSD: Makefile,v 1.6 2003/07/10 10:34:44 lukem Exp $
+# $NetBSD: Makefile,v 1.6.74.1 2014/08/10 06:58:12 tls Exp $
# @(#)Makefile 8.1 (Berkeley) 8/14/93
-DIR= psd/18.gprof
+SECTION=reference/ref1
+ARTICLE=gprof
SRCS= header.me abstract.me intro.me profiling.me gathering.me \
postp.me present.me refs.me
-EXTRA= postp1.pic postp2.pic postp3.pic pres1.pic pres2.pic
-DPADD= ${EXTRA}
+DEPSRCS=postp1.pic postp2.pic postp3.pic pres1.pic pres2.pic
MACROS= -me
-
-paper.ps: ${SRCS} ${DPADD}
- ${TOOL_SOELIM} -I${.CURDIR} ${.ALLSRC:M*.me} | ${TOOL_PIC} | \
- ${TOOL_TBL} | ${TOOL_EQN} | ${TOOL_ROFF_PS} ${MACROS} ${.TARGET}
+ROFF_PIC=yes
+ROFF_EQN=yes
+ROFF_TBL=yes
+EXTRAHTMLFILES=\
+ gprof-1.png gprof-2.png gprof-3.png gprof-4.png gprof-5.png \
+ gprof-6.png gprof-7.png gprof-8.png gprof-9.png gprof-10.png \
+ gprof-11.png gprof-12.png gprof-13.png gprof-14.png
.include bsd.doc.mk
CVS commit: [tls-earlyentropy] src/usr.bin/make
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:58:27 UTC 2014
Modified Files:
src/usr.bin/make [tls-earlyentropy]: Makefile job.c main.c make.h
parse.c var.c
src/usr.bin/make/PSD.doc [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.56.8.1 src/usr.bin/make/Makefile
cvs rdiff -u -r1.176 -r1.176.2.1 src/usr.bin/make/job.c
cvs rdiff -u -r1.226 -r1.226.2.1 src/usr.bin/make/main.c
cvs rdiff -u -r1.92 -r1.92.2.1 src/usr.bin/make/make.h
cvs rdiff -u -r1.194 -r1.194.2.1 src/usr.bin/make/parse.c
cvs rdiff -u -r1.184 -r1.184.2.1 src/usr.bin/make/var.c
cvs rdiff -u -r1.2 -r1.2.92.1 src/usr.bin/make/PSD.doc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/Makefile
diff -u src/usr.bin/make/Makefile:1.56 src/usr.bin/make/Makefile:1.56.8.1
--- src/usr.bin/make/Makefile:1.56 Wed May 30 21:54:23 2012
+++ src/usr.bin/make/Makefile Sun Aug 10 06:58:27 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2012/05/30 21:54:23 sjg Exp $
+# $NetBSD: Makefile,v 1.56.8.1 2014/08/10 06:58:27 tls Exp $
# @(#)Makefile 5.2 (Berkeley) 12/28/90
PROG= make
@@ -25,9 +25,7 @@ COPTS.meta.c += -DHAVE_FILEMON_H -I${FIL
.endif
.PATH: ${.CURDIR}/lst.lib
-.if make(install)
SUBDIR= PSD.doc
-.endif
.if make(obj) || make(clean)
SUBDIR+= unit-tests
.endif
Index: src/usr.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.176 src/usr.bin/make/job.c:1.176.2.1
--- src/usr.bin/make/job.c:1.176 Sun Aug 4 16:48:15 2013
+++ src/usr.bin/make/job.c Sun Aug 10 06:58:27 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.176 2013/08/04 16:48:15 sjg Exp $ */
+/* $NetBSD: job.c,v 1.176.2.1 2014/08/10 06:58:27 tls Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: job.c,v 1.176 2013/08/04 16:48:15 sjg Exp $;
+static char rcsid[] = $NetBSD: job.c,v 1.176.2.1 2014/08/10 06:58:27 tls Exp $;
#else
#include sys/cdefs.h
#ifndef lint
#if 0
static char sccsid[] = @(#)job.c 8.2 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: job.c,v 1.176 2013/08/04 16:48:15 sjg Exp $);
+__RCSID($NetBSD: job.c,v 1.176.2.1 2014/08/10 06:58:27 tls Exp $);
#endif
#endif /* not lint */
#endif
@@ -1346,7 +1346,7 @@ JobExec(Job *job, char **argv)
(void)fcntl(0, F_SETFD, 0);
(void)lseek(0, (off_t)0, SEEK_SET);
- if (job-node-type OP_MAKE) {
+ if (job-node-type (OP_MAKE | OP_SUBMAKE)) {
/*
* Pass job token pipe to submakes.
*/
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.226 src/usr.bin/make/main.c:1.226.2.1
--- src/usr.bin/make/main.c:1.226 Fri Feb 7 17:23:35 2014
+++ src/usr.bin/make/main.c Sun Aug 10 06:58:27 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.226 2014/02/07 17:23:35 pooka Exp $ */
+/* $NetBSD: main.c,v 1.226.2.1 2014/08/10 06:58:27 tls Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: main.c,v 1.226 2014/02/07 17:23:35 pooka Exp $;
+static char rcsid[] = $NetBSD: main.c,v 1.226.2.1 2014/08/10 06:58:27 tls Exp $;
#else
#include sys/cdefs.h
#ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT(@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = @(#)main.c 8.3 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: main.c,v 1.226 2014/02/07 17:23:35 pooka Exp $);
+__RCSID($NetBSD: main.c,v 1.226.2.1 2014/08/10 06:58:27 tls Exp $);
#endif
#endif /* not lint */
#endif
@@ -99,14 +99,14 @@ __RCSID($NetBSD: main.c,v 1.226 2014/02
*
* Error Print a tagged error message. The global
*MAKE variable must have been defined. This
- *takes a format string and two optional
- *arguments for it.
+ *takes a format string and optional arguments
+ *for it.
*
* Fatal Print an error message and exit. Also takes
- *a format string and two arguments.
+ *a format string and arguments for it.
*
* Punt Aborts all jobs and exits with a message. Also
- *takes a format string and two arguments.
+ *takes a format string and arguments for it.
*
* Finish Finish things up by printing the number of
*errors which occurred, as passed to it, and
Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.92 src/usr.bin/make/make.h:1.92.2.1
--- src/usr.bin/make/make.h:1.92 Wed Sep 4 15:38:26 2013
+++ src/usr.bin/make/make.h Sun Aug 10 06:58:27 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.92 2013/09/04 15:38:26 sjg Exp $ */
+/* $NetBSD: make.h,v 1.92.2.1 2014/08/10 06:58:27 tls Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -273,6 +273,7 @@ typedef struct GNode {
#define OP_NOMETA 0x0008 /* .NOMETA do not create a .meta file */
#define OP_META 0x0010 /* .META we _do_ want a .meta file */
#define OP_NOMETA_CMP 0x0020 /* Do not compare commands in .meta file
CVS commit: [tls-earlyentropy] src/usr.bin/newgrp
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:58:34 UTC 2014
Modified Files:
src/usr.bin/newgrp [tls-earlyentropy]: grutil.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.6.1 src/usr.bin/newgrp/grutil.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/newgrp/grutil.c
diff -u src/usr.bin/newgrp/grutil.c:1.3 src/usr.bin/newgrp/grutil.c:1.3.6.1
--- src/usr.bin/newgrp/grutil.c:1.3 Thu Jan 24 17:46:30 2013
+++ src/usr.bin/newgrp/grutil.c Sun Aug 10 06:58:34 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: grutil.c,v 1.3 2013/01/24 17:46:30 christos Exp $ */
+/* $NetBSD: grutil.c,v 1.3.6.1 2014/08/10 06:58:34 tls Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: grutil.c,v 1.3 2013/01/24 17:46:30 christos Exp $);
+__RCSID($NetBSD: grutil.c,v 1.3.6.1 2014/08/10 06:58:34 tls Exp $);
#include sys/param.h
#include err.h
@@ -147,7 +147,7 @@ addgrp(gid_t newgid, int makespace)
return ADDGRP_NOERROR;
rval = alloc_groups(ngroups, groups, ngroupsmax);
- if (rval != 0)
+ if (rval != ADDGRP_NOERROR)
return rval;
/*
@@ -235,7 +235,7 @@ newgrp(const char *gname, struct passwd
if (ruid == 0 || pwd-pw_gid == grp-gr_gid)
return grp-gr_gid;
- if (alloc_groups(ngroups, groups, ngroupsmax) == 0) {
+ if (alloc_groups(ngroups, groups, ngroupsmax) == ADDGRP_NOERROR) {
int i;
for (i = 0; i ngroups; i++)
if (groups[i] == grp-gr_gid) {
CVS commit: [tls-earlyentropy] src/usr.bin/stat
Module Name:src Committed By: tls Date: Sun Aug 10 06:58:57 UTC 2014 Modified Files: src/usr.bin/stat [tls-earlyentropy]: stat.1 Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.36.6.1 src/usr.bin/stat/stat.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/stat/stat.1 diff -u src/usr.bin/stat/stat.1:1.36 src/usr.bin/stat/stat.1:1.36.6.1 --- src/usr.bin/stat/stat.1:1.36 Mon Dec 3 07:49:21 2012 +++ src/usr.bin/stat/stat.1 Sun Aug 10 06:58:57 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: stat.1,v 1.36 2012/12/03 07:49:21 wiz Exp $ +.\ $NetBSD: stat.1,v 1.36.6.1 2014/08/10 06:58:57 tls Exp $ .\ .\ Copyright (c) 2002-2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -477,8 +477,7 @@ and which default to .Cm S . .Sh EXIT STATUS -.Nm -exits 0 on success, and \*[Gt]0 if an error occurred. +.Ex -std .Sh EXAMPLES If no options are specified, the default format is %d %i %Sp %l %Su %Sg %r %z \e%Sa\e \e%Sm\e \e%Sc\e \e%SB\e %k %b %#Xf %N.
CVS commit: [tls-earlyentropy] src/usr.bin/systat
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:58:59 UTC 2014
Modified Files:
src/usr.bin/systat [tls-earlyentropy]: extern.h icmp.c ip.c ip6.c
main.c tcp.c vmstat.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.42.16.1 src/usr.bin/systat/extern.h
cvs rdiff -u -r1.12 -r1.12.40.1 src/usr.bin/systat/icmp.c
cvs rdiff -u -r1.17 -r1.17.40.1 src/usr.bin/systat/ip.c
cvs rdiff -u -r1.15 -r1.15.40.1 src/usr.bin/systat/ip6.c \
src/usr.bin/systat/tcp.c
cvs rdiff -u -r1.47 -r1.47.6.1 src/usr.bin/systat/main.c
cvs rdiff -u -r1.77 -r1.77.22.1 src/usr.bin/systat/vmstat.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/systat/extern.h
diff -u src/usr.bin/systat/extern.h:1.42 src/usr.bin/systat/extern.h:1.42.16.1
--- src/usr.bin/systat/extern.h:1.42 Fri Jan 6 14:08:08 2012
+++ src/usr.bin/systat/extern.h Sun Aug 10 06:58:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.42 2012/01/06 14:08:08 drochner Exp $ */
+/* $NetBSD: extern.h,v 1.42.16.1 2014/08/10 06:58:59 tls Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -60,7 +60,6 @@ extern char *memf;
extern int allflag;
extern int turns;
extern gid_t egid;
-extern int use_sysctl;
struct inpcb;
#ifdef INET6
Index: src/usr.bin/systat/icmp.c
diff -u src/usr.bin/systat/icmp.c:1.12 src/usr.bin/systat/icmp.c:1.12.40.1
--- src/usr.bin/systat/icmp.c:1.12 Thu Apr 10 17:16:39 2008
+++ src/usr.bin/systat/icmp.c Sun Aug 10 06:58:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp.c,v 1.12 2008/04/10 17:16:39 thorpej Exp $ */
+/* $NetBSD: icmp.c,v 1.12.40.1 2014/08/10 06:58:59 tls Exp $ */
/*
* Copyright (c) 1999, 2000 Andrew Doran a...@netbsd.org
@@ -29,7 +29,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: icmp.c,v 1.12 2008/04/10 17:16:39 thorpej Exp $);
+__RCSID($NetBSD: icmp.c,v 1.12.40.1 2014/08/10 06:58:59 tls Exp $);
#endif /* not lint */
#include sys/param.h
@@ -65,11 +65,6 @@ static uint64_t curstat[ICMP_NSTATS];
static uint64_t newstat[ICMP_NSTATS];
static uint64_t oldstat[ICMP_NSTATS];
-static struct nlist namelist[] = {
- { .n_name = _icmpstat },
- { .n_name = NULL }
-};
-
WINDOW *
openicmp(void)
{
@@ -160,36 +155,16 @@ int
initicmp(void)
{
- if (! use_sysctl) {
- if (namelist[0].n_type == 0) {
- if (kvm_nlist(kd, namelist)) {
-nlisterr(namelist);
-return(0);
- }
- if (namelist[0].n_type == 0) {
-error(No namelist);
-return(0);
- }
- }
- }
-
return (1);
}
void
fetchicmp(void)
{
- int i;
-
- if (use_sysctl) {
- size_t size = sizeof(newstat);
+ size_t i, size = sizeof(newstat);
- if (sysctlbyname(net.inet.icmp.stats, newstat, size,
- NULL, 0) == -1)
- return;
- } else {
- KREAD((void *)namelist[0].n_value, newstat, sizeof(newstat));
- }
+ if (sysctlbyname(net.inet.icmp.stats, newstat, size, NULL, 0) == -1)
+ return;
xADJINETCTR(curstat, oldstat, newstat, ICMP_STAT_BADCODE);
xADJINETCTR(curstat, oldstat, newstat, ICMP_STAT_BADLEN);
Index: src/usr.bin/systat/ip.c
diff -u src/usr.bin/systat/ip.c:1.17 src/usr.bin/systat/ip.c:1.17.40.1
--- src/usr.bin/systat/ip.c:1.17 Thu Apr 10 17:16:39 2008
+++ src/usr.bin/systat/ip.c Sun Aug 10 06:58:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ip.c,v 1.17 2008/04/10 17:16:39 thorpej Exp $ */
+/* $NetBSD: ip.c,v 1.17.40.1 2014/08/10 06:58:59 tls Exp $ */
/*
* Copyright (c) 1999, 2000 Andrew Doran a...@netbsd.org
@@ -29,7 +29,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: ip.c,v 1.17 2008/04/10 17:16:39 thorpej Exp $);
+__RCSID($NetBSD: ip.c,v 1.17.40.1 2014/08/10 06:58:59 tls Exp $);
#endif /* not lint */
#include sys/param.h
@@ -68,12 +68,6 @@ static struct mystat curstat;
static struct mystat oldstat;
static struct mystat newstat;
-static struct nlist namelist[] = {
- { .n_name = _ipstat },
- { .n_name = _udpstat },
- { .n_name = NULL }
-};
-
WINDOW *
openip(void)
{
@@ -186,42 +180,20 @@ int
initip(void)
{
- if (! use_sysctl) {
- if (namelist[0].n_type == 0) {
- if (kvm_nlist(kd, namelist)) {
-nlisterr(namelist);
-return(0);
- }
- if ((namelist[0].n_type | namelist[1].n_type) == 0) {
-error(No namelist);
-return(0);
- }
- }
- }
return 1;
}
void
fetchip(void)
{
+ size_t size;
- if (use_sysctl) {
- size_t size;
-
- size = sizeof(newstat.i);
- if (sysctlbyname(net.inet.ip.stats, newstat.i, size,
- NULL, 0) == -1)
- return;
- size = sizeof(newstat.u);
- if (sysctlbyname(net.inet.udp.stats, newstat.u, size,
- NULL, 0) == -1)
- return;
- } else {
- KREAD((void *)namelist[0].n_value, newstat.i,
- sizeof(newstat.i));
- KREAD((void *)namelist[1].n_value, newstat.u,
- sizeof(newstat.u));
- }
+ size = sizeof(newstat.i);
+ if (sysctlbyname(net.inet.ip.stats, newstat.i, size, NULL, 0) == -1)
+ return;
+ size = sizeof(newstat.u);
+ if (sysctlbyname(net.inet.udp.stats, newstat.u, size, NULL, 0) ==
CVS commit: [tls-earlyentropy] src/usr.bin/tail
Module Name:src Committed By: tls Date: Sun Aug 10 06:59:01 UTC 2014 Modified Files: src/usr.bin/tail [tls-earlyentropy]: tail.1 Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.14.6.1 src/usr.bin/tail/tail.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/tail/tail.1 diff -u src/usr.bin/tail/tail.1:1.14 src/usr.bin/tail/tail.1:1.14.6.1 --- src/usr.bin/tail/tail.1:1.14 Thu Jan 31 23:09:06 2013 +++ src/usr.bin/tail/tail.1 Sun Aug 10 06:59:01 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: tail.1,v 1.14 2013/01/31 23:09:06 wiz Exp $ +.\ $NetBSD: tail.1,v 1.14.6.1 2014/08/10 06:59:01 tls Exp $ .\ .\ Copyright (c) 1980, 1990, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -32,7 +32,7 @@ .\ .\ @(#)tail.1 8.1 (Berkeley) 6/6/93 .\ -.Dd June 6, 1993 +.Dd June 15, 2014 .Dt TAIL 1 .Os .Sh NAME @@ -92,7 +92,8 @@ to not stop when end of file is reached, data to be appended to the input. The .Fl f -option is ignored if the standard input is a pipe, but not if it is a FIFO. +option is ignored if there are no file arguments and the standard +input is a pipe or a FIFO. .It Fl F The .Fl F
CVS commit: [tls-earlyentropy] src/usr.bin/tip
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:59:08 UTC 2014
Modified Files:
src/usr.bin/tip [tls-earlyentropy]: cmds.c cu.c tip.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.36.4.1 src/usr.bin/tip/cmds.c
cvs rdiff -u -r1.21 -r1.21.18.1 src/usr.bin/tip/cu.c
cvs rdiff -u -r1.53 -r1.53.2.1 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/cmds.c
diff -u src/usr.bin/tip/cmds.c:1.36 src/usr.bin/tip/cmds.c:1.36.4.1
--- src/usr.bin/tip/cmds.c:1.36 Sun Jun 2 13:18:12 2013
+++ src/usr.bin/tip/cmds.c Sun Aug 10 06:59:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cmds.c,v 1.36 2013/06/02 13:18:12 christos Exp $ */
+/* $NetBSD: cmds.c,v 1.36.4.1 2014/08/10 06:59:08 tls Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)cmds.c 8.1 (Berkeley) 6/6/93;
#endif
-__RCSID($NetBSD: cmds.c,v 1.36 2013/06/02 13:18:12 christos Exp $);
+__RCSID($NetBSD: cmds.c,v 1.36.4.1 2014/08/10 06:59:08 tls Exp $);
#endif /* not lint */
#include tip.h
@@ -792,11 +792,11 @@ tandem(const char *option)
(void)tcgetattr(FD, rmtty);
if (strcmp(option, on) == 0) {
- rmtty.c_iflag |= IXON|IXOFF|IXANY;
- term.c_iflag |= IXON|IXOFF|IXANY;
+ rmtty.c_iflag |= IXON|IXOFF;
+ term.c_iflag |= IXON|IXOFF;
} else {
- rmtty.c_iflag = ~(IXON|IXOFF|IXANY);
- term.c_iflag = ~(IXON|IXOFF|IXANY);
+ rmtty.c_iflag = ~(IXON|IXOFF);
+ term.c_iflag = ~(IXON|IXOFF);
}
(void)tcsetattr(FD, TCSADRAIN, rmtty);
(void)tcsetattr(0, TCSADRAIN, term);
Index: src/usr.bin/tip/cu.c
diff -u src/usr.bin/tip/cu.c:1.21 src/usr.bin/tip/cu.c:1.21.18.1
--- src/usr.bin/tip/cu.c:1.21 Tue Sep 6 18:33:01 2011
+++ src/usr.bin/tip/cu.c Sun Aug 10 06:59:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cu.c,v 1.21 2011/09/06 18:33:01 joerg Exp $ */
+/* $NetBSD: cu.c,v 1.21.18.1 2014/08/10 06:59:08 tls Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -36,7 +36,7 @@
#if 0
static char sccsid[] = @(#)cu.c 8.1 (Berkeley) 6/6/93;
#endif
-__RCSID($NetBSD: cu.c,v 1.21 2011/09/06 18:33:01 joerg Exp $);
+__RCSID($NetBSD: cu.c,v 1.21.18.1 2014/08/10 06:59:08 tls Exp $);
#endif /* not lint */
#include tip.h
@@ -55,7 +55,8 @@ cumain(int argc, char *argv[])
int flow = -1; /* -1 is tandem ^S/^Q */
static int helpme = 0, nostop = 0;
char useresc = '~';
- static char sbuf[12], brbuf[16];
+ static char sbuf[12];
+ int cmdlineBR;
extern char *optarg;
extern int optind;
@@ -80,6 +81,7 @@ cumain(int argc, char *argv[])
CU = NULL;
DV = NULL;
BR = DEFBR;
+ cmdlineBR = 0;
while((c = getopt_long(argc, argv,
E:F:P:a:p:c:l:s:hefot0123456789, longopts, NULL)) != -1) {
@@ -159,9 +161,8 @@ cumain(int argc, char *argv[])
break;
case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9':
- (void)snprintf(brbuf, sizeof(brbuf) -1, %s%c,
- brbuf, c);
- BR = atoi(brbuf);
+ cmdlineBR = cmdlineBR * 10 + (c - '0');
+ BR = cmdlineBR;
break;
default:
if (nostop == 0)
Index: src/usr.bin/tip/tip.c
diff -u src/usr.bin/tip/tip.c:1.53 src/usr.bin/tip/tip.c:1.53.2.1
--- src/usr.bin/tip/tip.c:1.53 Mon Oct 21 14:47:46 2013
+++ src/usr.bin/tip/tip.c Sun Aug 10 06:59:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tip.c,v 1.53 2013/10/21 14:47:46 christos Exp $ */
+/* $NetBSD: tip.c,v 1.53.2.1 2014/08/10 06:59:08 tls 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.53 2013/10/21 14:47:46 christos Exp $);
+__RCSID($NetBSD: tip.c,v 1.53.2.1 2014/08/10 06:59:08 tls Exp $);
#endif /* not lint */
/*
@@ -73,7 +73,7 @@ main(int argc, char *argv[])
char *p;
const char *q;
char sbuf[12];
- static char brbuf[16];
+ int cmdlineBR;
int fcarg;
setprogname(argv[0]);
@@ -95,6 +95,7 @@ main(int argc, char *argv[])
exit(1);
}
+ cmdlineBR = 0;
while((c = getopt(argc, argv, v0123456789)) != -1) {
switch(c) {
@@ -104,8 +105,8 @@ main(int argc, char *argv[])
case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9':
- (void)snprintf(brbuf, sizeof(brbuf) -1, %s%c, brbuf, c);
- BR = atoi(brbuf);
+ cmdlineBR = cmdlineBR * 10 + (c - '0');
+ BR = cmdlineBR;
break;
default:
@@ -497,9 +498,9 @@ ttysetup(speed_t spd)
cntrl.c_cc[VMIN] = 1;
cntrl.c_cc[VTIME] = 0;
if (boolean(value(TAND)))
- cntrl.c_iflag |= IXOFF|IXON|IXANY;
+ cntrl.c_iflag |= IXOFF|IXON;
else
- cntrl.c_iflag = ~(IXOFF|IXON|IXANY);
+ cntrl.c_iflag = ~(IXOFF|IXON);
return tcsetattr(FD, TCSAFLUSH, cntrl);
}
CVS commit: [tls-earlyentropy] src/usr.bin/quota
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:58:47 UTC 2014
Modified Files:
src/usr.bin/quota [tls-earlyentropy]: quota.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.49.8.1 src/usr.bin/quota/quota.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/quota/quota.c
diff -u src/usr.bin/quota/quota.c:1.49 src/usr.bin/quota/quota.c:1.49.8.1
--- src/usr.bin/quota/quota.c:1.49 Sat May 12 19:53:22 2012
+++ src/usr.bin/quota/quota.c Sun Aug 10 06:58:47 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: quota.c,v 1.49 2012/05/12 19:53:22 dholland Exp $ */
+/* $NetBSD: quota.c,v 1.49.8.1 2014/08/10 06:58:47 tls Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT(@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = @(#)quota.c 8.4 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: quota.c,v 1.49 2012/05/12 19:53:22 dholland Exp $);
+__RCSID($NetBSD: quota.c,v 1.49.8.1 2014/08/10 06:58:47 tls Exp $);
#endif
#endif /* not lint */
@@ -502,30 +502,6 @@ getprivs(id_t id, int idtype)
}
err(1, %s: quota_open, fst[i].f_mntonname);
}
-#if 0
- if (strncmp(fst[i].f_fstypename, nfs,
- sizeof(fst[i].f_fstypename)) == 0) {
- version = 0;
- qup-numqvs = QUOTA_NLIMITS;
- qup-qvs = malloc(qup-numqvs * sizeof(qup-qvs[0]));
- if (qup-qvs == NULL) {
-err(1, Out of memory);
- }
- if (getnfsquota(fst[i].f_mntfromname,
- qup-qvs, id, ufs_quota_class_names[idtype]) != 1)
-continue;
- } else if ((fst[i].f_flag ST_QUOTA) != 0) {
- qup-numqvs = QUOTA_NLIMITS;
- qup-qvs = malloc(qup-numqvs * sizeof(qup-qvs[0]));
- if (qup-qvs == NULL) {
-err(1, Out of memory);
- }
- if (getvfsquota(fst[i].f_mntonname, qup-qvs, version,
- id, idtype, dflag, 0) != 1)
-continue;
- } else
- continue;
-#else
qup-numqvs = quota_getnumidtypes(qup-qh);
qup-qvs = malloc(qup-numqvs * sizeof(qup-qvs[0]));
if (qup-qvs == NULL) {
@@ -547,7 +523,6 @@ getprivs(id_t id, int idtype)
quotaval_clear(qup-qvs[j]);
}
}
-#endif
(void)strlcpy(qup-fsname, fst[i].f_mntonname,
sizeof(qup-fsname));
if (quphead == NULL)
CVS commit: [tls-earlyentropy] src/usr.bin/timeout
Module Name:src Committed By: tls Date: Sun Aug 10 06:59:06 UTC 2014 Added Files: src/usr.bin/timeout [tls-earlyentropy]: Makefile timeout.1 timeout.c Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r0 -r1.2.2.2 src/usr.bin/timeout/Makefile cvs rdiff -u -r0 -r1.3.2.2 src/usr.bin/timeout/timeout.1 cvs rdiff -u -r0 -r1.4.2.2 src/usr.bin/timeout/timeout.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/usr.bin/timeout/Makefile diff -u /dev/null src/usr.bin/timeout/Makefile:1.2.2.2 --- /dev/null Sun Aug 10 06:59:06 2014 +++ src/usr.bin/timeout/Makefile Sun Aug 10 06:59:06 2014 @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.2.2.2 2014/08/10 06:59:06 tls Exp $ +# $FreeBSD: head/usr.bin/timeout/Makefile 268745 2014-07-16 09:55:36Z bapt $ +WARNS=6 +PROG= timeout + +.include bsd.prog.mk Index: src/usr.bin/timeout/timeout.1 diff -u /dev/null src/usr.bin/timeout/timeout.1:1.3.2.2 --- /dev/null Sun Aug 10 06:59:06 2014 +++ src/usr.bin/timeout/timeout.1 Sun Aug 10 06:59:06 2014 @@ -0,0 +1,133 @@ +.\ $NetBSD: timeout.1,v 1.3.2.2 2014/08/10 06:59:06 tls Exp $ +.\ +.\ Copyright (c) 2014 Baptiste Daroussin b...@freebsd.org +.\ All rights reserved. +.\ +.\ Redistribution and use in source and binary forms, with or without +.\ modification, are permitted provided that the following conditions +.\ are met: +.\ 1. Redistributions of source code must retain the above copyright +.\notice, this list of conditions and the following disclaimer. +.\ 2. Redistributions in binary form must reproduce the above copyright +.\notice, this list of conditions and the following disclaimer in the +.\documentation and/or other materials provided with the distribution. +.\ +.\ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\ SUCH DAMAGE. +.\ +.\ $FreeBSD: head/usr.bin/timeout/timeout.1 268861 2014-07-18 22:56:59Z bapt $ +.\ +.Dd July 19, 2014 +.Dt TIMEOUT 1 +.Os +.Sh NAME +.Nm timeout +.Nd run a command with a time limit +.Sh SYNOPSIS +.Nm +.Op Fl Fl signal Ar sig | Fl s Ar sig +.Op Fl Fl preserve-status +.Op Fl Fl kill-after Ar time | Fl k Ar time +.Op Fl Fl foreground +.Ao Ar duration Ac +.Ao Ar command Ac +.Ao Ar args ... Ac +.Sh DESCRIPTION +.Nm +starts the +.Ar command +with its +.Ar args . +If +.Ar command +is still running after +.Ar duration , +it is killed. +By default, +.Dv SIGTERM . +is sent. +.Bl -tag -width -k time, --kill-after time +.It Fl Fl preserve-status +Always exits with the same status as +.Ar command +even if it times out. +.It Fl Fl foreground +Do not propagate timeout to the +.Ar command +children. +.It Fl s Ar sig , Fl Fl signal Ar sig +Specify the signal to send on timeout. +By default, +.Dv SIGTERM . +is sent. +.It Fl k Ar time , Fl Fl kill-after Ar time +Send a second kill signal if +.Ar command +is still running after +.Ar time +after the first signal was sent. +.El +.Sh DURATION FORMAT +.Ar duration +and +.Ar time +can be integer or decimal numbers. +Values without unit symbols are interpreted as seconds. +.Pp +Supported unit symbols are: +.Bl -tag -width indent -compact +.It s +seconds +.It m +minutes +.It h +hours +.It d +days +.El +.Sh EXIT STATUS +If the timeout was not reached, the exit status of +.Ar command +is returned. +.Pp +If the timeout was reached and +.Fl Fl preserve-status +is set, the exit status of +.Ar command +is returned. +If +.Fl Fl preserve-status +is not set, an exit status of 124 is returned. +.Pp +If +.Ar command +exits after receiving a signal, the exit status returned is the signal number plus 128. +.Sh SEE ALSO +.Xr kill 1 , +.Xr signal 3 +.Sh HISTORY +A +.Nm +utility appeared in a development branch of +.Fx 11 +and was imported into +.Nx 7 . +The +.Fx +work is compatible with GNU +.Nm +by +.An Padraig Brady , +from GNU Coreutils 8.21. +The +.Nm +utility first appeared in GNU Coreutils 7.0. Index: src/usr.bin/timeout/timeout.c diff -u /dev/null src/usr.bin/timeout/timeout.c:1.4.2.2 --- /dev/null Sun Aug 10 06:59:06 2014 +++ src/usr.bin/timeout/timeout.c Sun Aug 10 06:59:06 2014 @@ -0,0 +1,357 @@ +/* $NetBSD: timeout.c,v 1.4.2.2 2014/08/10 06:59:06 tls Exp $ */ + +/*- + * Copyright (c) 2014 Baptiste Daroussin b...@freebsd.org + * Copyright
CVS commit: [tls-earlyentropy] src/usr.bin/tic
Module Name:src Committed By: tls Date: Sun Aug 10 06:59:03 UTC 2014 Modified Files: src/usr.bin/tic [tls-earlyentropy]: tic.c Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.23.6.1 src/usr.bin/tic/tic.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/tic/tic.c diff -u src/usr.bin/tic/tic.c:1.23 src/usr.bin/tic/tic.c:1.23.6.1 --- src/usr.bin/tic/tic.c:1.23 Sat Dec 8 23:29:28 2012 +++ src/usr.bin/tic/tic.c Sun Aug 10 06:59:03 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: tic.c,v 1.23 2012/12/08 23:29:28 joerg Exp $ */ +/* $NetBSD: tic.c,v 1.23.6.1 2014/08/10 06:59:03 tls Exp $ */ /* * Copyright (c) 2009, 2010 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ #endif #include sys/cdefs.h -__RCSID($NetBSD: tic.c,v 1.23 2012/12/08 23:29:28 joerg Exp $); +__RCSID($NetBSD: tic.c,v 1.23.6.1 2014/08/10 06:59:03 tls Exp $); #include sys/types.h #include sys/queue.h @@ -585,7 +585,7 @@ main(int argc, char **argv) free(term-name); free(term); } - hdestroy(); + hdestroy1(free, NULL); #endif
CVS commit: [tls-earlyentropy] src/usr.bin/vmstat
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:59:13 UTC 2014
Modified Files:
src/usr.bin/vmstat [tls-earlyentropy]: Makefile drvstats.c vmstat.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.30.18.1 src/usr.bin/vmstat/Makefile
cvs rdiff -u -r1.6 -r1.6.6.1 src/usr.bin/vmstat/drvstats.c
cvs rdiff -u -r1.191 -r1.191.2.1 src/usr.bin/vmstat/vmstat.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/vmstat/Makefile
diff -u src/usr.bin/vmstat/Makefile:1.30 src/usr.bin/vmstat/Makefile:1.30.18.1
--- src/usr.bin/vmstat/Makefile:1.30 Wed Aug 17 13:54:31 2011
+++ src/usr.bin/vmstat/Makefile Sun Aug 10 06:59:13 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2011/08/17 13:54:31 christos Exp $
+# $NetBSD: Makefile,v 1.30.18.1 2014/08/10 06:59:13 tls Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
.include bsd.own.mk
Index: src/usr.bin/vmstat/drvstats.c
diff -u src/usr.bin/vmstat/drvstats.c:1.6 src/usr.bin/vmstat/drvstats.c:1.6.6.1
--- src/usr.bin/vmstat/drvstats.c:1.6 Tue Nov 13 14:09:58 2012
+++ src/usr.bin/vmstat/drvstats.c Sun Aug 10 06:59:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: drvstats.c,v 1.6 2012/11/13 14:09:58 chs Exp $ */
+/* $NetBSD: drvstats.c,v 1.6.6.1 2014/08/10 06:59:13 tls Exp $ */
/*
* Copyright (c) 1996 John M. Vinopal
@@ -40,42 +40,18 @@
#include err.h
#include fcntl.h
-#include kvm.h
#include limits.h
-#include nlist.h
#include stdio.h
#include stdlib.h
#include string.h
#include unistd.h
#include drvstats.h
-static struct nlist namelist[] = {
-#define X_TK_NIN 0
- { .n_name = _tk_nin }, /* tty characters in */
-#define X_TK_NOUT 1
- { .n_name = _tk_nout }, /* tty characters out */
-#define X_HZ 2
- { .n_name = _hz }, /* ticks per second */
-#define X_STATHZ 3
- { .n_name = _stathz },
-#define X_DRIVE_COUNT 4
- { .n_name = _iostat_count }, /* number of drives */
-#define X_DRIVELIST 5
- { .n_name = _iostatlist }, /* TAILQ of drives */
- { .n_name = NULL },
-};
-
/* Structures to hold the statistics. */
struct _drive cur, last;
-/* Kernel pointers: nlistf and memf defined in calling program. */
-static kvm_t *kd = NULL;
-extern char *nlistf;
-extern char *memf;
extern int hz;
-/* Pointer to list of drives. */
-static struct io_stats *iostathead = NULL;
/* sysctl hw.drivestats buffer. */
static struct io_sysctl *drives = NULL;
@@ -84,27 +60,12 @@ size_t ndrive = 0;
int *drv_select;
char **dr_name;
-#define KVM_ERROR(_string) do { \
- warnx(%s, (_string)); \
- errx(1, %s, kvm_geterr(kd)); \
-} while (/* CONSTCOND */0)
-
-/*
- * Dereference the namelist pointer `v' and fill in the local copy
- * 'p' which is of size 's'.
- */
-#define deref_nl(v, p, s) do { \
- deref_kptr((void *)namelist[(v)].n_value, (p), (s)); \
-} while (/* CONSTCOND */0)
-
/* Missing from sys/time.h */
#define timerset(tvp, uvp) do { \
((uvp)-tv_sec = (tvp)-tv_sec);\
((uvp)-tv_usec = (tvp)-tv_usec);\
} while (/* CONSTCOND */0)
-static void deref_kptr(void *, void *, size_t);
-
/*
* Take the delta between the present values and the last recorded
* values, storing the present values in the 'last' structure, and
@@ -183,70 +144,44 @@ cpuswap(void)
void
drvreadstats(void)
{
- struct io_stats cur_drive, *p;
size_t size, i;
int mib[3];
- p = iostathead;
-
- if (memf == NULL) {
- mib[0] = CTL_HW;
- mib[1] = HW_IOSTATS;
- mib[2] = sizeof(struct io_sysctl);
-
- size = ndrive * sizeof(struct io_sysctl);
- if (sysctl(mib, 3, drives, size, NULL, 0) 0)
- err(1, sysctl hw.iostats failed);
- for (i = 0; i ndrive; i++) {
- cur.rxfer[i] = drives[i].rxfer;
- cur.wxfer[i] = drives[i].wxfer;
- cur.seek[i] = drives[i].seek;
- cur.rbytes[i] = drives[i].rbytes;
- cur.wbytes[i] = drives[i].wbytes;
- cur.time[i].tv_sec = drives[i].time_sec;
- cur.time[i].tv_usec = drives[i].time_usec;
- }
+ mib[0] = CTL_HW;
+ mib[1] = HW_IOSTATS;
+ mib[2] = sizeof(struct io_sysctl);
+
+ size = ndrive * sizeof(struct io_sysctl);
+ if (sysctl(mib, 3, drives, size, NULL, 0) 0)
+ err(1, sysctl hw.iostats failed);
+ for (i = 0; i ndrive; i++) {
+ cur.rxfer[i] = drives[i].rxfer;
+ cur.wxfer[i] = drives[i].wxfer;
+ cur.seek[i] = drives[i].seek;
+ cur.rbytes[i] = drives[i].rbytes;
+ cur.wbytes[i] = drives[i].wbytes;
+ cur.time[i].tv_sec = drives[i].time_sec;
+ cur.time[i].tv_usec = drives[i].time_usec;
+ }
mib[0] = CTL_KERN;
- mib[1] = KERN_TKSTAT;
- mib[2] = KERN_TKSTAT_NIN;
- size = sizeof(cur.tk_nin);
- if (sysctl(mib, 3, cur.tk_nin, size, NULL, 0) 0)
- cur.tk_nin = 0;
-
- mib[2] = KERN_TKSTAT_NOUT;
- size = sizeof(cur.tk_nout);
- if (sysctl(mib, 3, cur.tk_nout, size, NULL, 0) 0)
- cur.tk_nout = 0;
- } else {
- for (i = 0; i ndrive; i++) {
- deref_kptr(p, cur_drive, sizeof(cur_drive));
- cur.rxfer[i] = cur_drive.io_rxfer;
- cur.wxfer[i] = cur_drive.io_wxfer;
-
CVS commit: [tls-earlyentropy] src/usr.bin/sed
Module Name:src Committed By: tls Date: Sun Aug 10 06:58:55 UTC 2014 Modified Files: src/usr.bin/sed [tls-earlyentropy]: Makefile POSIX compile.c defs.h extern.h main.c misc.c process.c sed.1 Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.14.22.1 src/usr.bin/sed/Makefile cvs rdiff -u -r1.4 -r1.4.88.1 src/usr.bin/sed/POSIX cvs rdiff -u -r1.39 -r1.39.4.1 src/usr.bin/sed/compile.c cvs rdiff -u -r1.10 -r1.10.22.1 src/usr.bin/sed/defs.h cvs rdiff -u -r1.11 -r1.11.22.1 src/usr.bin/sed/extern.h \ src/usr.bin/sed/misc.c cvs rdiff -u -r1.21 -r1.21.22.1 src/usr.bin/sed/main.c cvs rdiff -u -r1.39 -r1.39.6.1 src/usr.bin/sed/process.c cvs rdiff -u -r1.32 -r1.32.4.1 src/usr.bin/sed/sed.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/sed/Makefile diff -u src/usr.bin/sed/Makefile:1.14 src/usr.bin/sed/Makefile:1.14.22.1 --- src/usr.bin/sed/Makefile:1.14 Tue Apr 14 22:15:26 2009 +++ src/usr.bin/sed/Makefile Sun Aug 10 06:58:55 2014 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.14 2009/04/14 22:15:26 lukem Exp $ +# $NetBSD: Makefile,v 1.14.22.1 2014/08/10 06:58:55 tls Exp $ # from: @(#)Makefile 8.1 (Berkeley) 6/6/93 .include bsd.own.mk +WARNS=6 PROG= sed SRCS= compile.c main.c misc.c process.c Index: src/usr.bin/sed/POSIX diff -u src/usr.bin/sed/POSIX:1.4 src/usr.bin/sed/POSIX:1.4.88.1 --- src/usr.bin/sed/POSIX:1.4 Thu Jan 9 20:21:25 1997 +++ src/usr.bin/sed/POSIX Sun Aug 10 06:58:55 2014 @@ -1,5 +1,6 @@ -# $NetBSD: POSIX,v 1.4 1997/01/09 20:21:25 tls Exp $ -# from: @(#)POSIX 8.1 (Berkeley) 6/6/93 +# $NetBSD: POSIX,v 1.4.88.1 2014/08/10 06:58:55 tls Exp $ +# @(#)POSIX 8.1 (Berkeley) 6/6/93 +# $FreeBSD: head/usr.bin/sed/POSIX 168417 2007-04-06 08:43:30Z yar $ Comments on the IEEE P1003.2 Draft 12 Part 2: Shell and Utilities @@ -118,10 +119,15 @@ All uses of POSIX refer to section 4.5 1,3c\ text - Historic implementations, and this implementation, do not output - the text in the above example. The general rule, therefore, - is that a range whose second address is never matched extends to - the end of the input. + Historic implementations did not output the text in the above + example. Therefore it was believed that a range whose second + address was never matched extended to the end of the input. + However, the current practice adopted by this implementation, + as well as by those from GNU and SUN, is as follows: The text + from the 'c' command still isn't output because the second address + isn't actually matched; but the range is reset after all if its + second address is a line number. In the above example, only the + first line of the input will be deleted. 13. Historical implementations allow an output suppressing #n at the beginning of -e arguments as well as in a script file. POSIX Index: src/usr.bin/sed/compile.c diff -u src/usr.bin/sed/compile.c:1.39 src/usr.bin/sed/compile.c:1.39.4.1 --- src/usr.bin/sed/compile.c:1.39 Fri Jun 28 15:04:35 2013 +++ src/usr.bin/sed/compile.c Sun Aug 10 06:58:55 2014 @@ -1,6 +1,7 @@ -/* $NetBSD: compile.c,v 1.39 2013/06/28 15:04:35 joerg Exp $ */ +/* $NetBSD: compile.c,v 1.39.4.1 2014/08/10 06:58:55 tls Exp $ */ /*- + * Copyright (c) 1992 Diomidis Spinellis. * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. * @@ -32,58 +33,25 @@ * SUCH DAMAGE. */ -/*- - * Copyright (c) 1992 Diomidis Spinellis. - * - * This code is derived from software contributed to Berkeley by - * Diomidis Spinellis of Imperial College, University of London. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - *notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - *notice, this list of conditions and the following disclaimer in the - *documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - *may be used to endorse or promote products derived from this software - *without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL,
CVS commit: [tls-earlyentropy] src/usr.bin/xinstall
Module Name:src Committed By: tls Date: Sun Aug 10 06:59:18 UTC 2014 Modified Files: src/usr.bin/xinstall [tls-earlyentropy]: xinstall.c Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.115.18.1 src/usr.bin/xinstall/xinstall.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/xinstall/xinstall.c diff -u src/usr.bin/xinstall/xinstall.c:1.115 src/usr.bin/xinstall/xinstall.c:1.115.18.1 --- src/usr.bin/xinstall/xinstall.c:1.115 Tue Sep 6 18:50:32 2011 +++ src/usr.bin/xinstall/xinstall.c Sun Aug 10 06:59:18 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: xinstall.c,v 1.115 2011/09/06 18:50:32 joerg Exp $ */ +/* $NetBSD: xinstall.c,v 1.115.18.1 2014/08/10 06:59:18 tls Exp $ */ /* * Copyright (c) 1987, 1993 @@ -46,7 +46,7 @@ __COPYRIGHT(@(#) Copyright (c) 1987, 19 #if 0 static char sccsid[] = @(#)xinstall.c 8.1 (Berkeley) 7/21/93; #else -__RCSID($NetBSD: xinstall.c,v 1.115 2011/09/06 18:50:32 joerg Exp $); +__RCSID($NetBSD: xinstall.c,v 1.115.18.1 2014/08/10 06:59:18 tls Exp $); #endif #endif /* not lint */ @@ -1202,8 +1202,10 @@ metadata_log(const char *path, const cha if (*type == 'f') /* type=file */ fprintf(metafp, size=%lld, (long long)size); if (tv != NULL dopreserve) - fprintf(metafp, time=%lld.%ld, - (long long)tv[1].tv_sec, (long)tv[1].tv_usec); + fprintf(metafp, time=%lld.%0*lld, + (long long)tv[1].tv_sec, + (tv[1].tv_usec == 0 ? 1 : 9), + (long long)tv[1].tv_usec * 1000); if (digestresult digest) fprintf(metafp, %s=%s, digest, digestresult); if (fflags)
CVS commit: [tls-earlyentropy] src/usr.sbin/cpuctl/arch
Module Name:src Committed By: tls Date: Sun Aug 10 06:59:25 UTC 2014 Modified Files: src/usr.sbin/cpuctl/arch [tls-earlyentropy]: i386.c Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.54.2.1 src/usr.sbin/cpuctl/arch/i386.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/cpuctl/arch/i386.c diff -u src/usr.sbin/cpuctl/arch/i386.c:1.54 src/usr.sbin/cpuctl/arch/i386.c:1.54.2.1 --- src/usr.sbin/cpuctl/arch/i386.c:1.54 Sat Jan 4 18:13:48 2014 +++ src/usr.sbin/cpuctl/arch/i386.c Sun Aug 10 06:59:25 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: i386.c,v 1.54 2014/01/04 18:13:48 msaitoh Exp $ */ +/* $NetBSD: i386.c,v 1.54.2.1 2014/08/10 06:59:25 tls Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -57,7 +57,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: i386.c,v 1.54 2014/01/04 18:13:48 msaitoh Exp $); +__RCSID($NetBSD: i386.c,v 1.54.2.1 2014/08/10 06:59:25 tls Exp $); #endif /* not lint */ #include sys/types.h @@ -348,19 +348,22 @@ const struct cpu_cpuid_nameclass i386_cp [0x2f] = Xeon E7 family, [0x35] = Atom Family, [0x36] = Atom S1000, -[0x37] = Atom C2000, E3000, +[0x37] = Atom E3000, Z3000, [0x3a] = Xeon E3-1200v2 and 3rd gen core, Ivy Bridge, [0x3c] = 4th gen Core, Xeon E3-12xx v3 (Haswell), -[0x3d] = Next gen Core, +[0x3d] = Core M based on Broadwell, [0x3e] = Xeon E5/E7, Ivy Bridge-EP, -[0x3f] = Future gen Xeon, +[0x3f] = Next gen Xeon based on Haswell, [0x45] = 4th gen Core, Xeon E3-12xx v3 (Haswell), [0x46] = 4th gen Core, Xeon E3-12xx v3 (Haswell), -[0x4d] = Atom C2000, E3000, +[0x4a] = Future Atom E3000, Z3000, +[0x4d] = Atom C2000, +[0x5a] = Future Atom E3000, Z3000, +[0x5d] = Future Atom E3000, Z3000, }, Pentium Pro, II or III, /* Default */ NULL, @@ -997,6 +1000,9 @@ intel_cpu_cacheinfo(struct cpu_info *ci) desc); if (cai != NULL) ci-ci_cinfo[cai-cai_index] = *cai; +else if ((verbose != 0) (desc != 0xff)) + printf(Unknown cacheinfo desc %02x\n, + desc); } } x86_cpuid(2, descs);
CVS commit: [tls-earlyentropy] src/usr.sbin/btpand
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:59:23 UTC 2014
Modified Files:
src/usr.sbin/btpand [tls-earlyentropy]: btpand.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.18.1 src/usr.sbin/btpand/btpand.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/btpand/btpand.c
diff -u src/usr.sbin/btpand/btpand.c:1.6 src/usr.sbin/btpand/btpand.c:1.6.18.1
--- src/usr.sbin/btpand/btpand.c:1.6 Mon Aug 29 20:38:55 2011
+++ src/usr.sbin/btpand/btpand.c Sun Aug 10 06:59:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: btpand.c,v 1.6 2011/08/29 20:38:55 joerg Exp $ */
+/* $NetBSD: btpand.c,v 1.6.18.1 2014/08/10 06:59:23 tls Exp $ */
/*-
* Copyright (c) 2008-2009 Iain Hibbert
@@ -27,7 +27,7 @@
#include sys/cdefs.h
__COPYRIGHT(@(#) Copyright (c) 2008-2009 Iain Hibbert. All rights reserved.);
-__RCSID($NetBSD: btpand.c,v 1.6 2011/08/29 20:38:55 joerg Exp $);
+__RCSID($NetBSD: btpand.c,v 1.6.18.1 2014/08/10 06:59:23 tls Exp $);
#include sys/wait.h
@@ -213,6 +213,7 @@ main(int argc, char *argv[])
switch(fork()) {
case -1: /* bad */
err(EXIT_FAILURE, fork() failed);
+ /*NOTREACHED*/
case 0: /* child */
openlog(getprogname(), LOG_NDELAY | LOG_PERROR | LOG_PID, LOG_DAEMON);
CVS commit: [tls-earlyentropy] src/usr.bin/vgrind
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:59:11 UTC 2014
Modified Files:
src/usr.bin/vgrind [tls-earlyentropy]: Makefile extern.h pathnames.h
regexp.c vfontedpr.c
Removed Files:
src/usr.bin/vgrind [tls-earlyentropy]: vgrindefs.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.21.22.1 src/usr.bin/vgrind/Makefile
cvs rdiff -u -r1.5 -r1.5.68.1 src/usr.bin/vgrind/extern.h
cvs rdiff -u -r1.4 -r1.4.74.1 src/usr.bin/vgrind/pathnames.h
cvs rdiff -u -r1.12 -r1.12.8.1 src/usr.bin/vgrind/regexp.c
cvs rdiff -u -r1.14 -r1.14.8.1 src/usr.bin/vgrind/vfontedpr.c
cvs rdiff -u -r1.10 -r0 src/usr.bin/vgrind/vgrindefs.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/vgrind/Makefile
diff -u src/usr.bin/vgrind/Makefile:1.21 src/usr.bin/vgrind/Makefile:1.21.22.1
--- src/usr.bin/vgrind/Makefile:1.21 Tue Apr 14 22:15:28 2009
+++ src/usr.bin/vgrind/Makefile Sun Aug 10 06:59:11 2014
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2009/04/14 22:15:28 lukem Exp $
+# $NetBSD: Makefile,v 1.21.22.1 2014/08/10 06:59:11 tls Exp $
# @(#)Makefile 8.1 (Berkeley) 6/9/93
+WARNS=6
.include bsd.own.mk
PROG= vfontedpr
@@ -13,8 +14,8 @@ CLEANFILES+=vgrindefs.src.db
FILES=tmac.vgrind vgrindefs.src vgrindefs.src.db
FILESNAME_vgrindefs.src= vgrindefs
FILESNAME_vgrindefs.src.db= vgrindefs.db
-FILESDIR= /usr/share/misc
-FILESDIR_tmac.vgrind= /usr/share/tmac
+FILESDIR?= /usr/share/misc
+FILESDIR_tmac.vgrind?= /usr/share/tmac
FILESNAME_tmac.vgrind= vgrind.tmac
.endif
@@ -35,8 +36,7 @@ CAP_MKDB_ENDIAN=
.if ${MKSHARE} != no
vgrindefs.src.db: vgrindefs.src
${_MKTARGET_CREATE}
- ${TOOL_CAP_MKDB} ${CAP_MKDB_ENDIAN} -f vgrindefs.src \
- ${.CURDIR}/vgrindefs.src
+ ${TOOL_CAP_MKDB} ${CAP_MKDB_ENDIAN} -f vgrindefs.src ${.ALLSRC}
.else
vgrindefs.src.db:
.endif
Index: src/usr.bin/vgrind/extern.h
diff -u src/usr.bin/vgrind/extern.h:1.5 src/usr.bin/vgrind/extern.h:1.5.68.1
--- src/usr.bin/vgrind/extern.h:1.5 Fri Apr 23 22:14:57 2004
+++ src/usr.bin/vgrind/extern.h Sun Aug 10 06:59:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.5 2004/04/23 22:14:57 christos Exp $ */
+/* $NetBSD: extern.h,v 1.5.68.1 2014/08/10 06:59:11 tls Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -32,9 +32,8 @@
* @(#)extern.h 8.1 (Berkeley) 6/6/93
*/
-typedef int boolean;
-extern boolean x_escaped;/* if last character was an escape */
+extern bool x_escaped; /* if last character was an escape */
extern char*x_start; /* start of the current string */
extern char*l_acmbeg; /* string introducing a comment */
extern char*l_acmend; /* string ending a comment */
@@ -46,11 +45,11 @@ extern char*l_combeg; /
extern char*l_comend; /* string ending a comment */
extern char l_escape; /* character used to escape characters */
extern char*l_keywds[]; /* keyword table address */
-extern boolean l_onecase; /* upper and lower case are equivalent */
+extern bool l_onecase; /* upper and lower case are equivalent */
extern char*l_prcbeg; /* regular expr for procedure begin */
extern char*l_strbeg; /* delimiter for string constant */
extern char*l_strend; /* delimiter for string constant */
-extern boolean l_toplex; /* procedures only defined at top lex level */
+extern bool l_toplex; /* procedures only defined at top lex level */
extern const char *language; /* the language indicator */
#include sys/cdefs.h
Index: src/usr.bin/vgrind/pathnames.h
diff -u src/usr.bin/vgrind/pathnames.h:1.4 src/usr.bin/vgrind/pathnames.h:1.4.74.1
--- src/usr.bin/vgrind/pathnames.h:1.4 Thu Aug 7 11:17:00 2003
+++ src/usr.bin/vgrind/pathnames.h Sun Aug 10 06:59:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pathnames.h,v 1.4 2003/08/07 11:17:00 agc Exp $ */
+/* $NetBSD: pathnames.h,v 1.4.74.1 2014/08/10 06:59:11 tls Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -31,4 +31,6 @@
* @(#)pathnames.h 8.1 (Berkeley) 6/6/93
*/
+#ifndef _PATH_VGRINDEFS
#define _PATH_VGRINDEFS /usr/share/misc/vgrindefs
+#endif
Index: src/usr.bin/vgrind/regexp.c
diff -u src/usr.bin/vgrind/regexp.c:1.12 src/usr.bin/vgrind/regexp.c:1.12.8.1
--- src/usr.bin/vgrind/regexp.c:1.12 Tue Mar 20 20:34:59 2012
+++ src/usr.bin/vgrind/regexp.c Sun Aug 10 06:59:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: regexp.c,v 1.12 2012/03/20 20:34:59 matt Exp $ */
+/* $NetBSD: regexp.c,v 1.12.8.1 2014/08/10 06:59:11 tls Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -30,6 +30,10 @@
* SUCH DAMAGE.
*/
+#if HAVE_NBTOOL_CONFIG_H
+#include nbtool_config.h
+#endif
+
#include sys/cdefs.h
#ifndef lint
__COPYRIGHT(@(#) Copyright (c) 1980, 1993\
@@ -40,27 +44,31 @@ __COPYRIGHT(@(#)
CVS commit: [tls-earlyentropy] src/usr.bin/who
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:59:16 UTC 2014
Modified Files:
src/usr.bin/who [tls-earlyentropy]: who.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.36.1 src/usr.bin/who/who.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/who/who.c
diff -u src/usr.bin/who/who.c:1.23 src/usr.bin/who/who.c:1.23.36.1
--- src/usr.bin/who/who.c:1.23 Thu Jul 24 15:35:41 2008
+++ src/usr.bin/who/who.c Sun Aug 10 06:59:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: who.c,v 1.23 2008/07/24 15:35:41 christos Exp $ */
+/* $NetBSD: who.c,v 1.23.36.1 2014/08/10 06:59:16 tls Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT(@(#) Copyright (c) 1989, 19
#if 0
static char sccsid[] = @(#)who.c 8.1 (Berkeley) 6/6/93;
#endif
-__RCSID($NetBSD: who.c,v 1.23 2008/07/24 15:35:41 christos Exp $);
+__RCSID($NetBSD: who.c,v 1.23.36.1 2014/08/10 06:59:16 tls Exp $);
#endif /* not lint */
#include sys/types.h
@@ -285,6 +285,7 @@ print(const char *name, const char *line
time_t idle;
const char *types = NULL;
size_t i;
+ char *tstr;
state = '?';
idle = 0;
@@ -312,7 +313,8 @@ print(const char *name, const char *line
(void)printf(%c , state);
(void)printf(%-*.*s , maxline, maxline, line);
- (void)printf(%.12s , ctime(t) + 4);
+ tstr = ctime(t);
+ (void)printf(%.12s , tstr ? tstr + 4 : ?);
if (show_idle) {
if (idle 60)
CVS commit: [tls-earlyentropy] src/usr.sbin/iostat
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:59:37 UTC 2014
Modified Files:
src/usr.sbin/iostat [tls-earlyentropy]: Makefile iostat.8 iostat.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.22.1 src/usr.sbin/iostat/Makefile
cvs rdiff -u -r1.22 -r1.22.72.1 src/usr.sbin/iostat/iostat.8
cvs rdiff -u -r1.60 -r1.60.18.1 src/usr.sbin/iostat/iostat.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/iostat/Makefile
diff -u src/usr.sbin/iostat/Makefile:1.24 src/usr.sbin/iostat/Makefile:1.24.22.1
--- src/usr.sbin/iostat/Makefile:1.24 Fri Jan 7 03:12:27 2011
+++ src/usr.sbin/iostat/Makefile Sun Aug 10 06:59:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2011/01/07 03:12:27 jakllsch Exp $
+# $NetBSD: Makefile,v 1.24.22.1 2014/08/10 06:59:37 tls Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
.include bsd.own.mk
@@ -13,7 +13,7 @@ CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/vmst
# drvstats.c pulled in from ../../usr.bin/vmstat
SRCS= drvstats.c iostat.c
-DPADD= ${LIBKVM} ${LIBM}
-LDADD= -lkvm -lm
+DPADD= ${LIBM}
+LDADD= -lm
.include bsd.prog.mk
Index: src/usr.sbin/iostat/iostat.8
diff -u src/usr.sbin/iostat/iostat.8:1.22 src/usr.sbin/iostat/iostat.8:1.22.72.1
--- src/usr.sbin/iostat/iostat.8:1.22 Thu Aug 7 11:25:22 2003
+++ src/usr.sbin/iostat/iostat.8 Sun Aug 10 06:59:37 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: iostat.8,v 1.22 2003/08/07 11:25:22 agc Exp $
+.\ $NetBSD: iostat.8,v 1.22.72.1 2014/08/10 06:59:37 tls Exp $
.\
.\ Copyright (c) 1985, 1991, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\
.\ from: @(#)iostat.8 8.1 (Berkeley) 6/6/93
.\
-.Dd March 1, 2003
+.Dd June 11, 2014
.Dt IOSTAT 8
.Os
.Sh NAME
@@ -41,8 +41,6 @@ statistics
.Nm
.Op Fl CdDITx
.Op Fl c Ar count
-.Op Fl M Ar core
-.Op Fl N Ar system
.Op Fl w Ar wait
.Op Ar drives
.Sh DESCRIPTION
@@ -106,13 +104,6 @@ transfers, and time spent in transfers.
Use of this flag disables the default display.
.It Fl I
Show the running total values, rather than an average.
-.It Fl M Ar core
-Extract values associated with the name list from the specified core
-instead of the default
-.Dq Pa /dev/mem .
-.It Fl N Ar system
-Extract the name list from the specified system instead of the default
-.Dq Pa /netbsd .
.It Fl T
Show tty statistics.
This is enabled by default unless the
@@ -191,13 +182,6 @@ Seconds spent in disk activity
% of CPU time in idle mode
.El
.El
-.Sh FILES
-.Bl -tag -width /dev/mem -compact
-.It Pa /netbsd
-Default kernel namelist.
-.It Pa /dev/mem
-Default memory file.
-.El
.Sh SEE ALSO
.Xr fstat 1 ,
.Xr netstat 1 ,
Index: src/usr.sbin/iostat/iostat.c
diff -u src/usr.sbin/iostat/iostat.c:1.60 src/usr.sbin/iostat/iostat.c:1.60.18.1
--- src/usr.sbin/iostat/iostat.c:1.60 Tue Aug 30 19:06:06 2011
+++ src/usr.sbin/iostat/iostat.c Sun Aug 10 06:59:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: iostat.c,v 1.60 2011/08/30 19:06:06 joerg Exp $ */
+/* $NetBSD: iostat.c,v 1.60.18.1 2014/08/10 06:59:37 tls Exp $ */
/*
* Copyright (c) 1996 John M. Vinopal
@@ -71,7 +71,7 @@ __COPYRIGHT(@(#) Copyright (c) 1986, 19
#if 0
static char sccsid[] = @(#)iostat.c 8.3 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: iostat.c,v 1.60 2011/08/30 19:06:06 joerg Exp $);
+__RCSID($NetBSD: iostat.c,v 1.60.18.1 2014/08/10 06:59:37 tls Exp $);
#endif
#endif /* not lint */
@@ -91,9 +91,6 @@ __RCSID($NetBSD: iostat.c,v 1.60 2011/0
#include drvstats.h
-/* Namelist and memory files. */
-char *nlistf, *memf;
-
int hz;
static int reps, interval;
static int todo = 0;
@@ -130,7 +127,7 @@ main(int argc, char *argv[])
struct timespec tv;
struct ttysize ts;
- while ((ch = getopt(argc, argv, Cc:dDIM:N:Tw:x)) != -1)
+ while ((ch = getopt(argc, argv, Cc:dDITw:x)) != -1)
switch (ch) {
case 'c':
if ((reps = atoi(optarg)) = 0)
@@ -150,12 +147,6 @@ main(int argc, char *argv[])
case 'I':
todo |= SHOW_TOTALS;
break;
- case 'M':
- memf = optarg;
- break;
- case 'N':
- nlistf = optarg;
- break;
case 'T':
todo |= SHOW_TTY;
break;
@@ -450,8 +441,8 @@ static void
usage(void)
{
- (void)fprintf(stderr, usage: iostat [-CdDITx] [-c count] [-M core]
- [-N system] [-w wait] [drives]\n);
+ (void)fprintf(stderr, usage: iostat [-CdDITx] [-c count]
+ [-w wait] [drives]\n);
exit(1);
}
CVS commit: [tls-earlyentropy] src/usr.bin/xlint
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:59:20 UTC 2014
Modified Files:
src/usr.bin/xlint/common [tls-earlyentropy]: emit.c externs.h
src/usr.bin/xlint/lint1 [tls-earlyentropy]: cgram.y decl.c externs1.h
init.c lint1.h main1.c mem1.c scan.l tree.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.22.1 src/usr.bin/xlint/common/emit.c
cvs rdiff -u -r1.4 -r1.4.62.1 src/usr.bin/xlint/common/externs.h
cvs rdiff -u -r1.59 -r1.59.2.1 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.58 -r1.58.2.1 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.31 -r1.31.4.1 src/usr.bin/xlint/lint1/externs1.h
cvs rdiff -u -r1.24 -r1.24.22.1 src/usr.bin/xlint/lint1/init.c
cvs rdiff -u -r1.27 -r1.27.4.1 src/usr.bin/xlint/lint1/lint1.h
cvs rdiff -u -r1.21 -r1.21.4.1 src/usr.bin/xlint/lint1/main1.c
cvs rdiff -u -r1.15 -r1.15.18.1 src/usr.bin/xlint/lint1/mem1.c
cvs rdiff -u -r1.54 -r1.54.2.1 src/usr.bin/xlint/lint1/scan.l
cvs rdiff -u -r1.75 -r1.75.2.1 src/usr.bin/xlint/lint1/tree.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/xlint/common/emit.c
diff -u src/usr.bin/xlint/common/emit.c:1.5 src/usr.bin/xlint/common/emit.c:1.5.22.1
--- src/usr.bin/xlint/common/emit.c:1.5 Wed Apr 15 01:20:57 2009
+++ src/usr.bin/xlint/common/emit.c Sun Aug 10 06:59:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: emit.c,v 1.5 2009/04/15 01:20:57 christos Exp $ */
+/* $NetBSD: emit.c,v 1.5.22.1 2014/08/10 06:59:20 tls Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include sys/cdefs.h
#if defined(__RCSID) !defined(lint)
-__RCSID($NetBSD: emit.c,v 1.5 2009/04/15 01:20:57 christos Exp $);
+__RCSID($NetBSD: emit.c,v 1.5.22.1 2014/08/10 06:59:20 tls Exp $);
#endif
#include ctype.h
@@ -216,11 +216,11 @@ outint(int i)
* the name is preceded by its length
*/
void
-outname(const char *name)
+outname1(const char *file, size_t line, const char *name)
{
if (name == NULL)
- errx(1, internal error: outname() 1);
+ errx(1, %s, %zu: internal error: outname(NULL), file, line);
outint((int)strlen(name));
outstrg(name);
}
Index: src/usr.bin/xlint/common/externs.h
diff -u src/usr.bin/xlint/common/externs.h:1.4 src/usr.bin/xlint/common/externs.h:1.4.62.1
--- src/usr.bin/xlint/common/externs.h:1.4 Thu Apr 7 16:28:40 2005
+++ src/usr.bin/xlint/common/externs.h Sun Aug 10 06:59:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: externs.h,v 1.4 2005/04/07 16:28:40 christos Exp $ */
+/* $NetBSD: externs.h,v 1.4.62.1 2014/08/10 06:59:20 tls Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -69,5 +69,6 @@ extern void outchar(int);
extern void outqchar(int);
extern void outstrg(const char *);
extern void outint(int);
-extern void outname(const char *);
+#define outname(a) outname1(__FILE__, __LINE__, a);
+extern void outname1(const char *, size_t, const char *);
extern void outsrc(const char *);
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.59 src/usr.bin/xlint/lint1/cgram.y:1.59.2.1
--- src/usr.bin/xlint/lint1/cgram.y:1.59 Sun Mar 23 04:58:16 2014
+++ src/usr.bin/xlint/lint1/cgram.y Sun Aug 10 06:59:20 2014
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.59 2014/03/23 04:58:16 dholland Exp $ */
+/* $NetBSD: cgram.y,v 1.59.2.1 2014/08/10 06:59:20 tls Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include sys/cdefs.h
#if defined(__RCSID) !defined(lint)
-__RCSID($NetBSD: cgram.y,v 1.59 2014/03/23 04:58:16 dholland Exp $);
+__RCSID($NetBSD: cgram.y,v 1.59.2.1 2014/08/10 06:59:20 tls Exp $);
#endif
#include stdlib.h
@@ -107,7 +107,7 @@ static inline void RESTORE(const char *f
#endif
%}
-%expect 5
+%expect 75
%union {
int y_int;
@@ -189,13 +189,21 @@ static inline void RESTORE(const char *f
%token y_type T_ATTRIBUTE
%token y_type T_AT_ALIGNED
%token y_type T_AT_DEPRECATED
+%token y_type T_AT_NORETURN
%token y_type T_AT_MAY_ALIAS
%token y_type T_AT_PACKED
+%token y_type T_AT_PURE
%token y_type T_AT_TUINION
%token y_type T_AT_TUNION
%token y_type T_AT_UNUSED
-
-
+%token y_type T_AT_FORMAT
+%token y_type T_AT_FORMAT_PRINTF
+%token y_type T_AT_FORMAT_SCANF
+%token y_type T_AT_FORMAT_STRFTIME
+%token y_type T_AT_FORMAT_ARG
+%token y_type T_AT_SENTINEL
+%token y_type T_AT_RETURNS_TWICE
+%token y_type T_AT_COLD
%left T_COMMA
%right T_ASSIGN T_OPASS
@@ -470,19 +478,41 @@ declaration:
| error T_SEMI
;
+type_attribute_format_type:
+ T_AT_FORMAT_PRINTF
+ | T_AT_FORMAT_SCANF
+ | T_AT_FORMAT_STRFTIME
+ ;
+
type_attribute_spec:
T_AT_DEPRECATED
| T_AT_ALIGNED T_LPARN constant T_RPARN
+ | T_AT_SENTINEL T_LPARN constant T_RPARN
+ | T_AT_FORMAT_ARG T_LPARN constant T_RPARN
| T_AT_MAY_ALIAS
+ | T_AT_NORETURN
+ | T_AT_COLD
+ | T_AT_RETURNS_TWICE
| T_AT_PACKED {
addpacked();
}
+ | T_AT_PURE
| T_AT_TUNION
+ |
CVS commit: [tls-earlyentropy] src/usr.sbin/etcupdate
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:59:29 UTC 2014
Modified Files:
src/usr.sbin/etcupdate [tls-earlyentropy]: etcupdate etcupdate.8
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.51.8.1 src/usr.sbin/etcupdate/etcupdate
cvs rdiff -u -r1.20 -r1.20.8.1 src/usr.sbin/etcupdate/etcupdate.8
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/etcupdate/etcupdate
diff -u src/usr.sbin/etcupdate/etcupdate:1.51 src/usr.sbin/etcupdate/etcupdate:1.51.8.1
--- src/usr.sbin/etcupdate/etcupdate:1.51 Wed Aug 15 16:26:41 2012
+++ src/usr.sbin/etcupdate/etcupdate Sun Aug 10 06:59:29 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: etcupdate,v 1.51 2012/08/15 16:26:41 apb Exp $
+# $NetBSD: etcupdate,v 1.51.8.1 2014/08/10 06:59:29 tls Exp $
#
# Copyright (c) 2001-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -46,6 +46,8 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin:${PA
# Default settings
PROG=${0##*/}
+DESTDIR= # must not have a trailing slash
+DESTDIR_BRE= # basic regex to match ${DESTDIR}
TEMPROOT=${TEMPROOT:=/tmp/temproot}
PAGER=${PAGER:=/usr/bin/more}
SWIDTH=$(stty size | awk '{w=$2}END{if(w==0){w=80}print w}')
@@ -60,7 +62,7 @@ BINARYDIRMODE=false # true for -s extra
BINARYDIR= # directory name for BINARYDIRMODE
BINARYTGZMODE=false # true for -s etc.tgz
TGZLIST= # quoted list list of files for BINARYTGZMODE
-SRC_ARGLIST= # quoted list of one or more -s args
+SRC_ARGLIST= # quoted list of -s args
N_SRC_ARGS=0 # number of -s args
AUTOMATIC=false
LOCALSKIP=false
@@ -70,6 +72,7 @@ MACHINE_ARCH=${MACHINE_ARCH:=$(uname -
export MACHINE_ARCH
# Settings for post-installation procedures
+NEED_ANYTHING=false
NEED_MAKEDEV=false
NEED_MTREE=false
NEED_NEWALIASES=false
@@ -94,6 +97,7 @@ Options:
* A temporary directory in which one or both of etc.tgz
and xetc.tgz have been extracted.
-t temproot Where to store temporary files (default: /tmp/temproot)
+ -d destdir Destination directory to check. (default: /)
-w width Screen width(default: 80)
-a Automatically update unmodified files
-l Automatically skip files with strictly local changes
@@ -134,38 +138,76 @@ yesno() {
#eval set -- $quotedlist
# or like this:
#eval \$command $quotedlist \$filename
+#
shell_quote()
-{
+{(
local result=''
- local arg
+ local arg qarg
+ LC_COLLATE=C ; export LC_COLLATE # so [a-zA-Z0-9] works in ASCII
for arg in $@ ; do
- # Append a space if necessary
- result=${result}${result:+ }
- # Convert each embedded ' to '\'',
- # then insert ' at the beginning of the first line,
- # and append ' at the end of the last line.
- result=${result}$(printf %s\n $arg | \
- sed -e s/'/'''/g -e 1s/^/'/ -e \$s/\$/'/)
+ case ${arg} in
+ '')
+ qarg=''
+ ;;
+ *[!-./a-zA-Z0-9]*)
+ # Convert each embedded ' to '\'',
+ # then insert ' at the beginning of the first line,
+ # and append ' at the end of the last line.
+ # Finally, elide unnecessary '' pairs at the
+ # beginning and end of the result and as part of
+ # '\'''\'' sequences that result from multiple
+ # adjacent quotes in he input.
+ qarg=$(printf %s\n $arg | \
+ ${SED:-sed} -e s/'/'''/g \
+-e 1s/^/'/ -e \$s/\$/'/ \
+-e 1s/^''// -e \$s/''\$// \
+-e s/'''/'/g
+)
+ ;;
+ *)
+ # Arg is not the empty string, and does not contain
+ # any unsafe characters. Leave it unchanged for
+ # readability.
+ qarg=${arg}
+ ;;
+ esac
+ result=${result}${result:+ }${qarg}
done
printf %s\n $result
+)}
+
+# Convert arg $1 to a basic regular expression (as in sed)
+# that will match the arg. This works by inserting backslashes
+# before characters that are special in basic regular expressions.
+# It also inserts backslashes before the extra characters specified
+# in $2 (which defaults to /,).
+# XXX: Does not handle embedded newlines.
+# Usage: regex=$(bre_quote ${string})
+bre_quote()
+{
+ local arg=$1
+ local extra=${2-/,}
+ printf %s\n ${arg} | sed -e 's/[][^$.*\\'${extra}']/\\/g'
}
install_dir() {
- # $1 = target directory
+ # $1 = target directory (relative to ${DESTDIR})
- if yesno Create ${1}; then
- verbose Creating ${1}
- mkdir -p ${1} || exit 1
+ NEED_ANYTHING=true
+ if yesno Create ${DESTDIR}${1}; then
+ verbose Creating ${DESTDIR}${1}
+ mkdir -p ${DESTDIR}${1} || exit 1
NEED_MTREE=true
fi
}
install_file() {
- # $1 = target file
+ # $1 = target file (relative to ${DESTDIR})
+ NEED_ANYTHING=true
# Install the new file
- verbose Installing ${1}
- cp -p ${TEMPROOT}${1} ${1} rm -f ${TEMPROOT}${1}
+ verbose Installing ${DESTDIR}${1}
+ cp -p ${TEMPROOT}${1} ${DESTDIR}${1} rm -f ${TEMPROOT}${1}
# Check if this was a special file
case ${1} in
@@ -188,14 +230,20 @@ install_file() {
}
install_checksum() {
- # $1
CVS commit: [tls-earlyentropy] src/usr.sbin/ifmcstat
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:59:31 UTC 2014
Modified Files:
src/usr.sbin/ifmcstat [tls-earlyentropy]: Makefile ifmcstat.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.72.1 src/usr.sbin/ifmcstat/Makefile
cvs rdiff -u -r1.12 -r1.12.2.1 src/usr.sbin/ifmcstat/ifmcstat.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/ifmcstat/Makefile
diff -u src/usr.sbin/ifmcstat/Makefile:1.3 src/usr.sbin/ifmcstat/Makefile:1.3.72.1
--- src/usr.sbin/ifmcstat/Makefile:1.3 Fri Aug 2 03:58:10 2002
+++ src/usr.sbin/ifmcstat/Makefile Sun Aug 10 06:59:31 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2002/08/02 03:58:10 simonb Exp $
+# $NetBSD: Makefile,v 1.3.72.1 2014/08/10 06:59:31 tls Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
PROG= ifmcstat
MAN= ifmcstat.8
-LDADD= -lkvm
-DPADD= ${LIBKVM}
+LDADD+= -lutil
+DPADD+= ${LIBUTIL}
CPPFLAGS+= -DINET6
Index: src/usr.sbin/ifmcstat/ifmcstat.c
diff -u src/usr.sbin/ifmcstat/ifmcstat.c:1.12 src/usr.sbin/ifmcstat/ifmcstat.c:1.12.2.1
--- src/usr.sbin/ifmcstat/ifmcstat.c:1.12 Sat Oct 19 17:16:25 2013
+++ src/usr.sbin/ifmcstat/ifmcstat.c Sun Aug 10 06:59:31 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ifmcstat.c,v 1.12 2013/10/19 17:16:25 christos Exp $ */
+/* $NetBSD: ifmcstat.c,v 1.12.2.1 2014/08/10 06:59:31 tls Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -28,7 +28,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
+#include sys/cdefs.h
+__RCSID($NetBSD: ifmcstat.c,v 1.12.2.1 2014/08/10 06:59:31 tls Exp $);
+#include err.h
+#include errno.h
#include stdio.h
#include stdlib.h
#include fcntl.h
@@ -36,77 +40,27 @@
#include nlist.h
#include string.h
#include limits.h
+#include util.h
#include sys/types.h
#include sys/socket.h
+#include sys/sysctl.h
#include net/if.h
-#if defined(__FreeBSD__) __FreeBSD__ = 3
-# include net/if_var.h
-#endif
#include net/if_types.h
#include net/if_dl.h
#include netinet/in.h
-#ifndef __NetBSD__
-# ifdef __FreeBSD__
-# define KERNEL
-# endif
-# include netinet/if_ether.h
-# ifdef __FreeBSD__
-# undef KERNEL
-# endif
-#else
-# include net/if_ether.h
-#endif
+#include net/if_ether.h
#include netinet/in_var.h
#include arpa/inet.h
#include netdb.h
-kvm_t *kvmd;
+static const char *inet6_n2a(void *);
+static void print_ether_mcast(u_short);
+static void print_inet6_mcast(u_short, const char *);
-struct nlist nl[] = {
-#define N_IFNET 0
- { _ifnet, 0, 0, 0, 0 },
-#if !(defined(__FreeBSD__) __FreeBSD__ = 3)
-#define N_IN6_MK 1
- { _in6_mk, 0, 0, 0, 0 },
-#endif
- { , 0, 0, 0, 0 },
-};
-
-const char *inet6_n2a __P((struct in6_addr *));
-int main __P((void));
-char *ifname __P((struct ifnet *));
-void kread __P((u_long, void *, int));
-#if !(defined(__FreeBSD__) __FreeBSD__ = 3)
-void acmc __P((struct ether_multi *));
-#endif
-void if6_addrlist __P((struct ifaddr *));
-void in6_multilist __P((struct in6_multi *));
-struct in6_multi * in6_multientry __P((struct in6_multi *));
-
-#if !defined(__NetBSD__) !(defined(__FreeBSD__) __FreeBSD__ = 3) !defined(__OpenBSD__)
-#ifdef __bsdi__
-struct ether_addr {
- u_int8_t ether_addr_octet[6];
-};
-#endif
-static char *ether_ntoa __P((struct ether_addr *));
-#endif
-
-#define KREAD(addr, buf, type) \
- kread((u_long)addr, (void *)buf, sizeof(type))
-
-#ifdef N_IN6_MK
-struct multi6_kludge {
- LIST_ENTRY(multi6_kludge) mk_entry;
- struct ifnet *mk_ifp;
- struct in6_multihead mk_head;
-};
-#endif
-
-const char *inet6_n2a(p)
- struct in6_addr *p;
+static const char *
+inet6_n2a(void *p)
{
static char buf[NI_MAXHOST];
struct sockaddr_in6 sin6;
@@ -115,7 +69,7 @@ const char *inet6_n2a(p)
memset(sin6, 0, sizeof(sin6));
sin6.sin6_family = AF_INET6;
sin6.sin6_len = sizeof(struct sockaddr_in6);
- sin6.sin6_addr = *p;
+ memcpy(sin6.sin6_addr, p, sizeof(sin6.sin6_addr));
inet6_getscopeid(sin6, INET6_IS_ADDR_LINKLOCAL|
INET6_IS_ADDR_MC_LINKLOCAL);
if (getnameinfo((struct sockaddr *)sin6, sin6.sin6_len,
@@ -125,263 +79,165 @@ const char *inet6_n2a(p)
return (invalid);
}
-int main()
+int
+main(void)
{
- char buf[_POSIX2_LINE_MAX], ifnam[IFNAMSIZ];
- struct ifnet *ifp, *nifp, ifnet;
-#ifndef __NetBSD__
- struct arpcom arpcom;
-#else
- struct ethercom ec;
- union {
- struct sockaddr_storage st;
- struct sockaddr_dl sdl;
- } su;
- struct sockaddr_dl *sdlp;
- sdlp = su.sdl;
-#endif
-
- if ((kvmd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, buf)) == NULL) {
- perror(kvm_openfiles);
- exit(1);
- }
- if (kvm_nlist(kvmd, nl) 0) {
- perror(kvm_nlist);
- exit(1);
- }
- if (nl[N_IFNET].n_value == 0) {
- printf(symbol %s not found\n, nl[N_IFNET].n_name);
- exit(1);
- }
- KREAD(nl[N_IFNET].n_value, ifp, struct ifnet *);
- while (ifp) {
- KREAD(ifp, ifnet, struct ifnet);
- printf(%s:\n, if_indextoname(ifnet.if_index,
CVS commit: [tls-earlyentropy] src/usr.sbin/inetd
Module Name:src Committed By: tls Date: Sun Aug 10 06:59:34 UTC 2014 Modified Files: src/usr.sbin/inetd [tls-earlyentropy]: inetd.c Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.121 -r1.121.6.1 src/usr.sbin/inetd/inetd.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/inetd/inetd.c diff -u src/usr.sbin/inetd/inetd.c:1.121 src/usr.sbin/inetd/inetd.c:1.121.6.1 --- src/usr.sbin/inetd/inetd.c:1.121 Thu Dec 13 19:38:40 2012 +++ src/usr.sbin/inetd/inetd.c Sun Aug 10 06:59:34 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: inetd.c,v 1.121 2012/12/13 19:38:40 christos Exp $ */ +/* $NetBSD: inetd.c,v 1.121.6.1 2014/08/10 06:59:34 tls Exp $ */ /*- * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ __COPYRIGHT(@(#) Copyright (c) 1983, 19 #if 0 static char sccsid[] = @(#)inetd.c 8.4 (Berkeley) 4/13/94; #else -__RCSID($NetBSD: inetd.c,v 1.121 2012/12/13 19:38:40 christos Exp $); +__RCSID($NetBSD: inetd.c,v 1.121.6.1 2014/08/10 06:59:34 tls Exp $); #endif #endif /* not lint */ @@ -762,11 +762,11 @@ reapchild(void) if (WIFEXITED(status) WEXITSTATUS(status)) syslog(LOG_WARNING, - %s: exit status 0x%x, + %s: exit status %u, sep-se_server, WEXITSTATUS(status)); else if (WIFSIGNALED(status)) syslog(LOG_WARNING, - %s: exit signal 0x%x, + %s: exit signal %u, sep-se_server, WTERMSIG(status)); sep-se_wait = 1; ev = allocchange();
CVS commit: [tls-earlyentropy] src/usr.sbin/envstat
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:59:27 UTC 2014
Modified Files:
src/usr.sbin/envstat [tls-earlyentropy]: envstat.8 envstat.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.61.16.1 src/usr.sbin/envstat/envstat.8
cvs rdiff -u -r1.94 -r1.94.6.1 src/usr.sbin/envstat/envstat.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/envstat/envstat.8
diff -u src/usr.sbin/envstat/envstat.8:1.61 src/usr.sbin/envstat/envstat.8:1.61.16.1
--- src/usr.sbin/envstat/envstat.8:1.61 Thu Feb 9 18:10:26 2012
+++ src/usr.sbin/envstat/envstat.8 Sun Aug 10 06:59:27 2014
@@ -1,6 +1,6 @@
-.\ $NetBSD: envstat.8,v 1.61 2012/02/09 18:10:26 riz Exp $
+.\ $NetBSD: envstat.8,v 1.61.16.1 2014/08/10 06:59:27 tls Exp $
.\
-.\ Copyright (c) 2000, 2007, 2008, 2009 The NetBSD Foundation, Inc.
+.\ Copyright (c) 2000, 2007, 2008, 2009, 2014 The NetBSD Foundation, Inc.
.\ All rights reserved.
.\
.\ This code is derived from software contributed to The NetBSD Foundation
@@ -27,7 +27,7 @@
.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\ POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd June 7, 2011
+.Dd May 18, 2014
.Dt ENVSTAT 8
.Os
.Sh NAME
@@ -166,6 +166,8 @@ Volts AC
Watts
.It Wh
Watt-hours
+.It %rH
+relative Humidity
.El
.Sh EXAMPLES
To display the
@@ -217,6 +219,7 @@ invalid states every second:
.Xr envctrl 4 ,
.Xr envsys 4 ,
.Xr finsio 4 ,
+.Xr hythygtemp 4 ,
.Xr ipmi 4 ,
.Xr itesio 4 ,
.Xr lm 4 ,
Index: src/usr.sbin/envstat/envstat.c
diff -u src/usr.sbin/envstat/envstat.c:1.94 src/usr.sbin/envstat/envstat.c:1.94.6.1
--- src/usr.sbin/envstat/envstat.c:1.94 Fri Dec 14 05:29:28 2012
+++ src/usr.sbin/envstat/envstat.c Sun Aug 10 06:59:27 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: envstat.c,v 1.94 2012/12/14 05:29:28 pgoyette Exp $ */
+/* $NetBSD: envstat.c,v 1.94.6.1 2014/08/10 06:59:27 tls Exp $ */
/*-
* Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -27,7 +27,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: envstat.c,v 1.94 2012/12/14 05:29:28 pgoyette Exp $);
+__RCSID($NetBSD: envstat.c,v 1.94.6.1 2014/08/10 06:59:27 tls Exp $);
#endif /* not lint */
#include stdio.h
@@ -975,6 +975,8 @@ do { \
stype = Wh;
else if (strcmp(sensor-type, Ampere hour) == 0)
stype = Ah;
+ else if (strcmp(sensor-type, relative Humidity) == 0)
+stype = %rH;
else
stype = ?;
CVS commit: [tls-earlyentropy] src/usr.sbin/makemandb
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:59:45 UTC 2014
Modified Files:
src/usr.sbin/makemandb [tls-earlyentropy]: apropos-utils.c makemandb.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.4.1 src/usr.sbin/makemandb/apropos-utils.c
cvs rdiff -u -r1.22 -r1.22.2.1 src/usr.sbin/makemandb/makemandb.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/makemandb/apropos-utils.c
diff -u src/usr.sbin/makemandb/apropos-utils.c:1.15 src/usr.sbin/makemandb/apropos-utils.c:1.15.4.1
--- src/usr.sbin/makemandb/apropos-utils.c:1.15 Tue Apr 2 17:16:50 2013
+++ src/usr.sbin/makemandb/apropos-utils.c Sun Aug 10 06:59:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: apropos-utils.c,v 1.15 2013/04/02 17:16:50 christos Exp $ */
+/* $NetBSD: apropos-utils.c,v 1.15.4.1 2014/08/10 06:59:45 tls Exp $ */
/*-
* Copyright (c) 2011 Abhinav Upadhyay er.abhinav.upadh...@gmail.com
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: apropos-utils.c,v 1.15 2013/04/02 17:16:50 christos Exp $);
+__RCSID($NetBSD: apropos-utils.c,v 1.15.4.1 2014/08/10 06:59:45 tls Exp $);
#include sys/queue.h
#include sys/stat.h
@@ -704,9 +704,9 @@ callback_html(void *data, const char *se
break;
}
}
- qsnippet[++i] = 0;
+ qsnippet[i] = 0;
(*callback)(orig_data-data, section, name, name_desc,
- (const char *)qsnippet, qsnippet_length);
+ (const char *)qsnippet, strlen(qsnippet));
free(qsnippet);
return 0;
}
Index: src/usr.sbin/makemandb/makemandb.c
diff -u src/usr.sbin/makemandb/makemandb.c:1.22 src/usr.sbin/makemandb/makemandb.c:1.22.2.1
--- src/usr.sbin/makemandb/makemandb.c:1.22 Mon Feb 10 00:23:36 2014
+++ src/usr.sbin/makemandb/makemandb.c Sun Aug 10 06:59:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: makemandb.c,v 1.22 2014/02/10 00:23:36 chs Exp $ */
+/* $NetBSD: makemandb.c,v 1.22.2.1 2014/08/10 06:59:45 tls Exp $ */
/*
* Copyright (c) 2011 Abhinav Upadhyay er.abhinav.upadh...@gmail.com
* Copyright (c) 2011 Kristaps Dzonsons krist...@bsd.lv
@@ -17,7 +17,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: makemandb.c,v 1.22 2014/02/10 00:23:36 chs Exp $);
+__RCSID($NetBSD: makemandb.c,v 1.22.2.1 2014/08/10 06:59:45 tls Exp $);
#include sys/stat.h
#include sys/types.h
@@ -124,6 +124,7 @@ static void update_db(sqlite3 *, struct
__dead static void usage(void);
static void optimize(sqlite3 *);
static char *parse_escape(const char *);
+static void replace_hyph(char *);
static makemandb_flags mflags = { .verbosity = 1 };
typedef void (*pman_nf)(const struct man_node *n, mandb_rec *);
@@ -978,6 +979,7 @@ pmdoc_Nd(const struct mdoc_node *n, mand
*/
char *buf = NULL;
char *temp;
+ char *nd_text;
if (n == NULL)
return;
@@ -995,7 +997,10 @@ pmdoc_Nd(const struct mdoc_node *n, mand
free(buf);
free(temp);
} else {
- concat(rec-name_desc, n-string);
+ nd_text = estrdup(n-string);
+ replace_hyph(nd_text);
+ concat(rec-name_desc, nd_text);
+ free(nd_text);
}
rec-xr_found = 0;
} else if (mdocs[n-tok] == pmdoc_Xr) {
@@ -1713,7 +1718,7 @@ insert_into_db(sqlite3 *db, mandb_rec *r
rc = sqlite3_step(stmt);
sqlite3_finalize(stmt);
- if (rc == SQLITE_CONSTRAINT) {
+ if (rc == SQLITE_CONSTRAINT_UNIQUE) {
/* The *most* probable reason for reaching here is that
* the UNIQUE contraint on the file column of the mandb_meta
* table was violated.
@@ -2009,6 +2014,10 @@ replace_hyph(char *str)
char *iter = str;
while ((iter = strchr(iter, ASCII_HYPH)) != NULL)
*iter = '-';
+
+ iter = str;
+ while ((iter = strchr(iter, ASCII_NBRSP)) != NULL)
+ *iter = '-';
}
static char *
CVS commit: [tls-earlyentropy] src/usr.sbin/mlxctl
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:59:51 UTC 2014
Modified Files:
src/usr.sbin/mlxctl [tls-earlyentropy]: Makefile dklist.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.18.1 src/usr.sbin/mlxctl/Makefile
cvs rdiff -u -r1.9 -r1.9.22.1 src/usr.sbin/mlxctl/dklist.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/mlxctl/Makefile
diff -u src/usr.sbin/mlxctl/Makefile:1.3 src/usr.sbin/mlxctl/Makefile:1.3.18.1
--- src/usr.sbin/mlxctl/Makefile:1.3 Sun Aug 14 17:57:44 2011
+++ src/usr.sbin/mlxctl/Makefile Sun Aug 10 06:59:51 2014
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2011/08/14 17:57:44 christos Exp $
+# $NetBSD: Makefile,v 1.3.18.1 2014/08/10 06:59:51 tls Exp $
PROG= mlxctl
SRCS= cmds.c config.c dklist.c main.c util.c
MAN= mlxctl.8
-LDADD= -lkvm
-DPADD= ${LIBKVM}
+LDADD= -lutil
+DPADD= ${LIButil}
.include bsd.prog.mk
Index: src/usr.sbin/mlxctl/dklist.c
diff -u src/usr.sbin/mlxctl/dklist.c:1.9 src/usr.sbin/mlxctl/dklist.c:1.9.22.1
--- src/usr.sbin/mlxctl/dklist.c:1.9 Fri Apr 17 04:03:39 2009
+++ src/usr.sbin/mlxctl/dklist.c Sun Aug 10 06:59:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dklist.c,v 1.9 2009/04/17 04:03:39 lukem Exp $ */
+/* $NetBSD: dklist.c,v 1.9.22.1 2014/08/10 06:59:51 tls Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -63,53 +63,32 @@
#ifndef lint
#include sys/cdefs.h
-__RCSID($NetBSD: dklist.c,v 1.9 2009/04/17 04:03:39 lukem Exp $);
+__RCSID($NetBSD: dklist.c,v 1.9.22.1 2014/08/10 06:59:51 tls Exp $);
#endif /* not lint */
#include sys/types.h
-#include sys/disk.h
+#include sys/iostat.h
#include sys/ioctl.h
+#include sys/sysctl.h
#include dev/ic/mlxreg.h
#include dev/ic/mlxio.h
+#include ctype.h
#include err.h
+#include errno.h
#include fcntl.h
-#include kvm.h
#include limits.h
-#include nlist.h
#include stdio.h
#include stdlib.h
#include string.h
-#include ctype.h
#include unistd.h
+#include util.h
#include extern.h
static SIMPLEQ_HEAD(, mlx_disk) mlx_disks;
-static struct nlist namelist[] = {
-#define X_DISK_COUNT 0
- { _iostat_count, 0, 0, 0, 0 }, /* number of disks */
-#define X_DISKLIST 1
- { _iostatlist, 0, 0, 0, 0 }, /* TAILQ of disks */
- { NULL, 0, 0, 0, 0 },
-};
-
-#define KVM_ERROR(_string) { \
- warnx(%s, (_string)); \
- errx(1, %s, kvm_geterr(kd)); \
-}
-
-/*
- * Dereference the namelist pointer `v' and fill in the local copy
- * 'p' which is of size 's'.
- */
-#define deref_nl(kd, v, p, s) \
-deref_kptr(kd, (void *)namelist[(v)].n_value, (p), (s));
-
-static void deref_kptr(kvm_t *, void *, void *, size_t);
-
void
mlx_disk_init(void)
{
@@ -170,59 +149,20 @@ mlx_disk_add(const char *name)
void
mlx_disk_add_all(void)
{
- struct iostatlist_head iostat_head;
- struct io_stats cur_drive, *drv;
-char errbuf[_POSIX2_LINE_MAX];
- char buf[12];
- int i, ndrives;
- kvm_t *kd;
-
- /* Open the kernel. */
-if ((kd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY, errbuf)) == NULL)
- errx(1, kvm_openfiles: %s, errbuf);
-
- /* Obtain the namelist symbols from the kernel. */
- if (kvm_nlist(kd, namelist))
- KVM_ERROR(kvm_nlist failed to read symbols.);
-
- /* Get the number of attached drives. */
- deref_nl(kd, X_DISK_COUNT, ndrives, sizeof(ndrives));
-
- if (ndrives 0)
- errx(EXIT_FAILURE, invalid _disk_count %d., ndrives);
- if (ndrives == 0)
- errx(EXIT_FAILURE, no drives attached.);
+ struct io_sysctl *data;
+ size_t i, len;
+ static const int mib[3] = { CTL_HW, HW_IOSTATS, sizeof(*data) };
- /* Get a pointer to the first disk. */
- deref_nl(kd, X_DISKLIST, iostat_head, sizeof(iostat_head));
- drv = TAILQ_FIRST(iostat_head);
-
- /* Try to add each disk to the list. */
- for (i = 0; i ndrives; i++) {
- deref_kptr(kd, drv, cur_drive, sizeof(cur_drive));
- deref_kptr(kd, cur_drive.io_name, buf, sizeof(buf));
- if (cur_drive.io_type == IOSTAT_DISK)
- mlx_disk_add0(buf);
- drv = TAILQ_NEXT(cur_drive, io_link);
- }
-
- kvm_close(kd);
-}
+ data = asysctl(mib, __arraycount(mib), len);
+ len /= sizeof(*data);
-/*
- * Dereference the kernel pointer `kptr' and fill in the local copy pointed
- * to by `ptr'. The storage space must be pre-allocated, and the size of
- * the copy passed in `len'.
- */
-static void
-deref_kptr(kvm_t *kd, void *kptr, void *ptr, size_t len)
-{
- char buf[128];
+ if (data == NULL || len == 0)
+ errx(EXIT_FAILURE, no drives attached.);
- if ((size_t)kvm_read(kd, (u_long)kptr, (char *)ptr, len) != len) {
- memset(buf, 0, sizeof(buf));
- snprintf(buf, sizeof buf, can't dereference kptr 0x%lx,
- (u_long)kptr);
- KVM_ERROR(buf);
+ for (i = 0; i len; ++i) {
+ if (data[i].type == IOSTAT_DISK)
+ mlx_disk_add0(data[i].name);
}
+
+ free(data);
}
CVS commit: [tls-earlyentropy] src/usr.sbin/lpr
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:59:40 UTC 2014
Modified Files:
src/usr.sbin/lpr [tls-earlyentropy]: Makefile
src/usr.sbin/lpr/SMM.doc [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.74.1 src/usr.sbin/lpr/Makefile
cvs rdiff -u -r1.5 -r1.5.72.1 src/usr.sbin/lpr/SMM.doc/Makefile
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/lpr/Makefile
diff -u src/usr.sbin/lpr/Makefile:1.10 src/usr.sbin/lpr/Makefile:1.10.74.1
--- src/usr.sbin/lpr/Makefile:1.10 Tue Jan 9 03:13:42 2001
+++ src/usr.sbin/lpr/Makefile Sun Aug 10 06:59:40 2014
@@ -1,10 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2001/01/09 03:13:42 lukem Exp $
+# $NetBSD: Makefile,v 1.10.74.1 2014/08/10 06:59:40 tls Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
SUBDIR= common_source .WAIT lp lpc lpd lpq lpr lprm lptest pac filters
-
-.if make(install)
SUBDIR+= SMM.doc
-.endif
.include bsd.subdir.mk
Index: src/usr.sbin/lpr/SMM.doc/Makefile
diff -u src/usr.sbin/lpr/SMM.doc/Makefile:1.5 src/usr.sbin/lpr/SMM.doc/Makefile:1.5.72.1
--- src/usr.sbin/lpr/SMM.doc/Makefile:1.5 Thu Jul 10 10:34:48 2003
+++ src/usr.sbin/lpr/SMM.doc/Makefile Sun Aug 10 06:59:40 2014
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2003/07/10 10:34:48 lukem Exp $
+# $NetBSD: Makefile,v 1.5.72.1 2014/08/10 06:59:40 tls Exp $
# @(#)Makefile 8.1 (Berkeley) 6/8/93
-DIR= smm/07.lpd
+SECTION=reference/ref8
+ARTICLE=lpd
SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t
MACROS= -ms
-
-paper.ps: ${SRCS}
- ${TOOL_SOELIM} -I${.CURDIR} ${.ALLSRC} | ${TOOL_TBL} | \
- ${TOOL_ROFF_PS} ${MACROS} ${.TARGET}
+ROFF_TBL=yes
+EXTRAHTMLFILES=lpd1.png lpd2.png lpd3.png
.include bsd.doc.mk
CVS commit: [tls-earlyentropy] src/usr.sbin/makefs
Module Name:src Committed By: tls Date: Sun Aug 10 06:59:43 UTC 2014 Modified Files: src/usr.sbin/makefs/cd9660 [tls-earlyentropy]: iso9660_rrip.c src/usr.sbin/makefs/msdos [tls-earlyentropy]: msdosfs_vfsops.c Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.13.2.1 src/usr.sbin/makefs/cd9660/iso9660_rrip.c cvs rdiff -u -r1.7 -r1.7.8.1 src/usr.sbin/makefs/msdos/msdosfs_vfsops.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/iso9660_rrip.c diff -u src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.13 src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.13.2.1 --- src/usr.sbin/makefs/cd9660/iso9660_rrip.c:1.13 Tue Jul 30 16:02:23 2013 +++ src/usr.sbin/makefs/cd9660/iso9660_rrip.c Sun Aug 10 06:59:43 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: iso9660_rrip.c,v 1.13 2013/07/30 16:02:23 reinoud Exp $ */ +/* $NetBSD: iso9660_rrip.c,v 1.13.2.1 2014/08/10 06:59:43 tls Exp $ */ /* * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan @@ -44,7 +44,7 @@ #include sys/cdefs.h #if defined(__RCSID) !defined(__lint) -__RCSID($NetBSD: iso9660_rrip.c,v 1.13 2013/07/30 16:02:23 reinoud Exp $); +__RCSID($NetBSD: iso9660_rrip.c,v 1.13.2.1 2014/08/10 06:59:43 tls Exp $); #endif /* !__lint */ static void cd9660_rrip_initialize_inode(cd9660node *); @@ -657,13 +657,14 @@ cd9660node_rrip_pn(struct ISO_SUSP_ATTRI pn_field-attr.rr_entry.PN.h.length[0] = 20; pn_field-attr.rr_entry.PN.h.version[0] = 1; - if (sizeof (fnode-inode-st.st_dev) 32) - cd9660_bothendian_dword((uint64_t)fnode-inode-st.st_dev 32, + if (sizeof (fnode-inode-st.st_rdev) 4) + cd9660_bothendian_dword( + (uint64_t)fnode-inode-st.st_rdev 32, pn_field-attr.rr_entry.PN.high); else cd9660_bothendian_dword(0, pn_field-attr.rr_entry.PN.high); - cd9660_bothendian_dword(fnode-inode-st.st_dev 0x, + cd9660_bothendian_dword(fnode-inode-st.st_rdev 0x, pn_field-attr.rr_entry.PN.low); return 1; } Index: src/usr.sbin/makefs/msdos/msdosfs_vfsops.c diff -u src/usr.sbin/makefs/msdos/msdosfs_vfsops.c:1.7 src/usr.sbin/makefs/msdos/msdosfs_vfsops.c:1.7.8.1 --- src/usr.sbin/makefs/msdos/msdosfs_vfsops.c:1.7 Wed Jan 30 19:19:19 2013 +++ src/usr.sbin/makefs/msdos/msdosfs_vfsops.c Sun Aug 10 06:59:43 2014 @@ -50,7 +50,7 @@ #endif #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: msdosfs_vfsops.c,v 1.7 2013/01/30 19:19:19 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: msdosfs_vfsops.c,v 1.7.8.1 2014/08/10 06:59:43 tls Exp $); #include sys/param.h @@ -407,7 +407,7 @@ error_exit: free(pmp); } errno = error; - return pmp; + return NULL; } int
CVS commit: [tls-earlyentropy] src/usr.sbin/services_mkdb
Module Name:src Committed By: tls Date: Sun Aug 10 07:00:21 UTC 2014 Modified Files: src/usr.sbin/services_mkdb [tls-earlyentropy]: uniq.c Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.22.1 src/usr.sbin/services_mkdb/uniq.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/services_mkdb/uniq.c diff -u src/usr.sbin/services_mkdb/uniq.c:1.5 src/usr.sbin/services_mkdb/uniq.c:1.5.22.1 --- src/usr.sbin/services_mkdb/uniq.c:1.5 Sun Apr 25 00:54:46 2010 +++ src/usr.sbin/services_mkdb/uniq.c Sun Aug 10 07:00:21 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: uniq.c,v 1.5 2010/04/25 00:54:46 joerg Exp $ */ +/* $NetBSD: uniq.c,v 1.5.22.1 2014/08/10 07:00:21 tls Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include sys/cdefs.h -__RCSID($NetBSD: uniq.c,v 1.5 2010/04/25 00:54:46 joerg Exp $); +__RCSID($NetBSD: uniq.c,v 1.5.22.1 2014/08/10 07:00:21 tls Exp $); #include stdio.h #include string.h @@ -96,6 +96,7 @@ uniq(const char *fname) break; case -1: err(1, put); + /*NOTREACHED*/ default: abort(); break;
CVS commit: [tls-earlyentropy] src/usr.sbin/pstat
Module Name:src
Committed By: tls
Date: Sun Aug 10 07:00:07 UTC 2014
Modified Files:
src/usr.sbin/pstat [tls-earlyentropy]: pstat.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.123.2.1 src/usr.sbin/pstat/pstat.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/pstat/pstat.c
diff -u src/usr.sbin/pstat/pstat.c:1.123 src/usr.sbin/pstat/pstat.c:1.123.2.1
--- src/usr.sbin/pstat/pstat.c:1.123 Mon Mar 24 13:42:41 2014
+++ src/usr.sbin/pstat/pstat.c Sun Aug 10 07:00:07 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pstat.c,v 1.123 2014/03/24 13:42:41 hannken Exp $ */
+/* $NetBSD: pstat.c,v 1.123.2.1 2014/08/10 07:00:07 tls Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = @(#)pstat.c 8.16 (Berkeley) 5/9/95;
#else
-__RCSID($NetBSD: pstat.c,v 1.123 2014/03/24 13:42:41 hannken Exp $);
+__RCSID($NetBSD: pstat.c,v 1.123.2.1 2014/08/10 07:00:07 tls Exp $);
#endif
#endif /* not lint */
@@ -330,6 +330,9 @@ vnodemode(void)
maddr = vp-v_mount;
mount_print(mp);
vnode_header();
+ /*
+ * XXX do this in a more fs-independent way
+ */
if (FSTYPE_IS(mp, MOUNT_FFS) ||
FSTYPE_IS(mp, MOUNT_MFS)) {
ufs_header();
@@ -455,8 +458,6 @@ const struct flagbit_desc ufs_flags[] =
{ IN_ACCESSED, 'a' },
{ IN_SHLOCK, 'S' },
{ IN_EXLOCK, 'E' },
- { IN_CLEANING, 'c' },
- { IN_ADIROP, 'D' },
{ IN_SPACECOUNTED, 's' },
{ 0, '\0' },
};
CVS commit: [tls-earlyentropy] src/usr.sbin/schedctl
Module Name:src
Committed By: tls
Date: Sun Aug 10 07:00:12 UTC 2014
Modified Files:
src/usr.sbin/schedctl [tls-earlyentropy]: schedctl.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.18.1 src/usr.sbin/schedctl/schedctl.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/schedctl/schedctl.c
diff -u src/usr.sbin/schedctl/schedctl.c:1.15 src/usr.sbin/schedctl/schedctl.c:1.15.18.1
--- src/usr.sbin/schedctl/schedctl.c:1.15 Wed Aug 31 13:32:41 2011
+++ src/usr.sbin/schedctl/schedctl.c Sun Aug 10 07:00:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: schedctl.c,v 1.15 2011/08/31 13:32:41 joerg Exp $ */
+/* $NetBSD: schedctl.c,v 1.15.18.1 2014/08/10 07:00:12 tls Exp $ */
/*
* Copyright (c) 2008, Mindaugas Rasiukevicius rmind at NetBSD org
@@ -33,9 +33,10 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: schedctl.c,v 1.15 2011/08/31 13:32:41 joerg Exp $);
+__RCSID($NetBSD: schedctl.c,v 1.15.18.1 2014/08/10 07:00:12 tls Exp $);
#endif
+#include stdbool.h
#include stdio.h
#include stdlib.h
#include string.h
@@ -60,7 +61,7 @@ static const char *class_str[] = {
static void sched_set(pid_t, lwpid_t, int, struct sched_param *, cpuset_t *);
static void thread_info(pid_t, lwpid_t);
static cpuset_t *makecpuset(char *);
-static char *showcpuset(cpuset_t *);
+static void printcpuset(cpuset_t *);
__dead static void usage(void);
static u_int ncpu;
@@ -205,7 +206,6 @@ thread_info(pid_t pid, lwpid_t lid)
{
struct sched_param sp;
cpuset_t *cpuset;
- char *cpus;
int error, policy;
cpuset = cpuset_create();
@@ -224,9 +224,9 @@ thread_info(pid_t pid, lwpid_t lid)
printf( Priority: %d\n, sp.sched_priority);
printf( Class:%s\n, class_str[policy]);
- cpus = showcpuset(cpuset);
- printf( Affinity (CPUs): %s\n, cpus);
- free(cpus);
+ printf( Affinity (CPUs): );
+ printcpuset(cpuset);
+ printf(\n);
cpuset_destroy(cpuset);
}
@@ -280,31 +280,26 @@ makecpuset(char *str)
return cpuset;
}
-static char *
-showcpuset(cpuset_t *cpuset)
+static void
+printcpuset(cpuset_t *cpuset)
{
- char *buf;
- size_t size;
unsigned int i;
+ bool seen;
- size = 3 * ncpu; /* XXX */
- buf = malloc(size + 1);
- if (buf == NULL)
- err(EXIT_FAILURE, malloc);
- memset(buf, '\0', size + 1);
-
- for (i = 0; i ncpu; i++)
- if (cpuset_isset(i, cpuset))
- snprintf(buf, size, %s%d,, buf, i);
-
- i = strlen(buf);
- if (i != 0) {
- buf[i - 1] = '\0';
- } else {
- strncpy(buf, none, size);
+ seen = false;
+ for (i = 0; i ncpu; i++) {
+ if (cpuset_isset(i, cpuset)) {
+ if (seen) {
+putchar(',');
+ }
+ printf(%d, i);
+ seen = true;
+ }
}
- return buf;
+ if (!seen) {
+ printf(none);
+ }
}
static void
CVS commit: [tls-earlyentropy] src/usr.sbin/mopd
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:59:53 UTC 2014
Modified Files:
src/usr.sbin/mopd [tls-earlyentropy]: Makefile.inc
src/usr.sbin/mopd/common [tls-earlyentropy]: Makefile log.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.52.1 src/usr.sbin/mopd/Makefile.inc
cvs rdiff -u -r1.19 -r1.19.8.1 src/usr.sbin/mopd/common/Makefile
cvs rdiff -u -r1.2 -r1.2.38.1 src/usr.sbin/mopd/common/log.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/mopd/Makefile.inc
diff -u src/usr.sbin/mopd/Makefile.inc:1.10 src/usr.sbin/mopd/Makefile.inc:1.10.52.1
--- src/usr.sbin/mopd/Makefile.inc:1.10 Mon May 28 12:06:37 2007
+++ src/usr.sbin/mopd/Makefile.inc Sun Aug 10 06:59:53 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.10 2007/05/28 12:06:37 tls Exp $
+# $NetBSD: Makefile.inc,v 1.10.52.1 2014/08/10 06:59:53 tls Exp $
.include bsd.own.mk
@@ -6,8 +6,8 @@ USE_FORT?=yes # network server
LIBCOMMON != cd ${.CURDIR}/../common ${PRINTOBJDIR}
CPPFLAGS+=-I${.CURDIR}/../common
-DPADD+= ${LIBKVM} ${LIBCOMMON}/libcommon.a
-LDADD+= -lkvm -L${LIBCOMMON} -lcommon
+DPADD+= ${LIBCOMMON}/libcommon.a
+LDADD+= -L${LIBCOMMON} -lcommon
.if exists(${.CURDIR}/../../Makefile.inc)
.include ${.CURDIR}/../../Makefile.inc
Index: src/usr.sbin/mopd/common/Makefile
diff -u src/usr.sbin/mopd/common/Makefile:1.19 src/usr.sbin/mopd/common/Makefile:1.19.8.1
--- src/usr.sbin/mopd/common/Makefile:1.19 Fri Aug 10 12:10:29 2012
+++ src/usr.sbin/mopd/common/Makefile Sun Aug 10 06:59:53 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/08/10 12:10:29 joerg Exp $
+# $NetBSD: Makefile,v 1.19.8.1 2014/08/10 06:59:53 tls Exp $
LIBISPRIVATE= yes
@@ -21,4 +21,3 @@ version.c: VERSION
.include bsd.lib.mk
COPTS.print.c+= -Wno-pointer-sign
-COPTS.log.c+= -Wno-format-nonliteral
Index: src/usr.sbin/mopd/common/log.c
diff -u src/usr.sbin/mopd/common/log.c:1.2 src/usr.sbin/mopd/common/log.c:1.2.38.1
--- src/usr.sbin/mopd/common/log.c:1.2 Mon Apr 28 20:24:17 2008
+++ src/usr.sbin/mopd/common/log.c Sun Aug 10 06:59:53 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: log.c,v 1.2 2008/04/28 20:24:17 martin Exp $ */
+/* $NetBSD: log.c,v 1.2.38.1 2014/08/10 06:59:53 tls Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: log.c,v 1.2 2008/04/28 20:24:17 martin Exp $);
+__RCSID($NetBSD: log.c,v 1.2.38.1 2014/08/10 06:59:53 tls Exp $);
#endif
#include err.h
@@ -47,13 +47,15 @@ mopLogErr(const char *fmt, ...)
{
va_list ap;
char buf[1024];
+ int error;
va_start(ap, fmt);
if (mopInteractive)
verr(1, fmt, ap);
else {
- snprintf(buf, sizeof(buf), %s: %%m, buf);
- vsyslog(LOG_ERR, buf, ap);
+ error = errno;
+ vsnprintf(buf, sizeof(buf), fmt, ap);
+ syslog(LOG_ERR, %s: %s, buf, strerror(error));
}
va_end(ap);
exit(1);
@@ -64,13 +66,15 @@ mopLogWarn(const char *fmt, ...)
{
va_list ap;
char buf[1024];
+ int error;
va_start(ap, fmt);
if (mopInteractive)
vwarn(fmt, ap);
else {
- snprintf(buf, sizeof(buf), %s: %%m, buf);
- vsyslog(LOG_WARNING, buf, ap);
+ error = errno;
+ vsnprintf(buf, sizeof(buf), fmt, ap);
+ syslog(LOG_WARNING, %s: %s, buf, strerror(error));
}
va_end(ap);
}
CVS commit: [tls-earlyentropy] src/usr.sbin/puffs/mount_psshfs
Module Name:src Committed By: tls Date: Sun Aug 10 07:00:09 UTC 2014 Modified Files: src/usr.sbin/puffs/mount_psshfs [tls-earlyentropy]: mount_psshfs.8 Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.26.6.1 src/usr.sbin/puffs/mount_psshfs/mount_psshfs.8 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/puffs/mount_psshfs/mount_psshfs.8 diff -u src/usr.sbin/puffs/mount_psshfs/mount_psshfs.8:1.26 src/usr.sbin/puffs/mount_psshfs/mount_psshfs.8:1.26.6.1 --- src/usr.sbin/puffs/mount_psshfs/mount_psshfs.8:1.26 Tue Dec 25 20:31:03 2012 +++ src/usr.sbin/puffs/mount_psshfs/mount_psshfs.8 Sun Aug 10 07:00:09 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: mount_psshfs.8,v 1.26 2012/12/25 20:31:03 reed Exp $ +.\ $NetBSD: mount_psshfs.8,v 1.26.6.1 2014/08/10 07:00:09 tls Exp $ .\ .\ Copyright (c) 2007-2009 Antti Kantee. All rights reserved. .\ @@ -198,7 +198,7 @@ Do not expect the file system to behave .Pp Depending on if the server supports the .Xr sftp 1 -stavfs protocol extension, +statvfs protocol extension, free disk space may be displayed for the mount by .Xr df 1 . This information reflects the status at the server's mountpoint
CVS commit: [tls-earlyentropy] src/usr.sbin/postinstall
Module Name:src
Committed By: tls
Date: Sun Aug 10 07:00:05 UTC 2014
Modified Files:
src/usr.sbin/postinstall [tls-earlyentropy]: postinstall
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.165.2.1 src/usr.sbin/postinstall/postinstall
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/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.165 src/usr.sbin/postinstall/postinstall:1.165.2.1
--- src/usr.sbin/postinstall/postinstall:1.165 Sat Mar 8 16:36:24 2014
+++ src/usr.sbin/postinstall/postinstall Sun Aug 10 07:00:04 2014
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.165 2014/03/08 16:36:24 martin Exp $
+# $NetBSD: postinstall,v 1.165.2.1 2014/08/10 07:00:04 tls Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -58,6 +58,8 @@
: ${HOST_SH:=sh}
: ${MAKE:=make}
: ${PWD_MKDB:=/usr/sbin/pwd_mkdb}
+: ${SED:=sed}
+: ${SORT:=sort}
: ${STAT:=stat}
#
@@ -110,22 +112,71 @@ mkdtemp()
#eval set -- $quotedlist
# or like this:
#eval \$command $quotedlist \$filename
+#
shell_quote()
-{
+{(
local result=''
- local arg
+ local arg qarg
+ LC_COLLATE=C ; export LC_COLLATE # so [a-zA-Z0-9] works in ASCII
for arg in $@ ; do
- # Append a space if necessary
- result=${result}${result:+ }
- # Convert each embedded ' to '\'',
- # then insert ' at the beginning of the first line,
- # and append ' at the end of the last line.
- result=${result}$(printf %s\n $arg | \
- sed -e s/'/'''/g -e 1s/^/'/ -e \$s/\$/'/)
+ case ${arg} in
+ '')
+ qarg=''
+ ;;
+ *[!-./a-zA-Z0-9]*)
+ # Convert each embedded ' to '\'',
+ # then insert ' at the beginning of the first line,
+ # and append ' at the end of the last line.
+ # Finally, elide unnecessary '' pairs at the
+ # beginning and end of the result and as part of
+ # '\'''\'' sequences that result from multiple
+ # adjacent quotes in he input.
+ qarg=$(printf %s\n $arg | \
+ ${SED:-sed} -e s/'/'''/g \
+-e 1s/^/'/ -e \$s/\$/'/ \
+-e 1s/^''// -e \$s/''\$// \
+-e s/'''/'/g
+)
+ ;;
+ *)
+ # Arg is not the empty string, and does not contain
+ # any unsafe characters. Leave it unchanged for
+ # readability.
+ qarg=${arg}
+ ;;
+ esac
+ result=${result}${result:+ }${qarg}
done
printf %s\n $result
-}
+)}
+# Convert arg $1 to a basic regular expression (as in sed)
+# that will match the arg. This works by inserting backslashes
+# before characters that are special in basic regular expressions.
+# It also inserts backslashes before the extra characters specified
+# in $2 (which defaults to /,).
+# XXX: Does not handle embedded newlines.
+# Usage: regex=$(bre_quote ${string})
+bre_quote()
+{
+ local arg=$1
+ local extra=${2-/,}
+ printf %s\n ${arg} | ${SED} -e 's/[][^$.*\\'${extra}']/\\/g'
+}
+
+# unprefix dir
+# Remove any dir prefix from a list of paths on stdin,
+# and write the result to stdout. Useful for converting
+# from ${DEST_DIR}/path to /path.
+#
+unprefix()
+{
+ [ $# -eq 1 ] || err 3 USAGE: unprefix dir
+ local prefix=${1%/}
+ prefix=$(bre_quote ${prefix})
+
+ ${SED} -e s,^${prefix}/,/,
+}
# additem item description
# Add item to list of supported items to check/fix,
@@ -448,8 +499,8 @@ file_exists_exact()
# obsolete_paths op
# Obsolete the list of paths provided on stdin.
-# Each path is relative to ${DEST_DIR}, and should
-# be an absolute path or start with `./'.
+# Each path should start with '/' or './', and
+# will be interpreted relative to ${DEST_DIR}.
#
obsolete_paths()
{
@@ -561,6 +612,37 @@ function checklib(results, line, regex)
)
}
+# obsolete_stand dir
+# Prints the names of all obsolete files and subdirs below the
+# provided dir. dir should be something like /stand/${MACHINE}.
+# The input dir and all output paths are interpreted
+# relative to ${DEST_DIR}.
+#
+# Assumes that the numerically largest subdir is current, and all
+# others are obsolete.
+#
+obsolete_stand()
+{
+ [ $# -eq 1 ] || err 3 USAGE: obsolete_stand dir
+ local dir=$1
+ local subdir
+
+ if ! [ -d ${DEST_DIR}/${dir} ]; then
+ msg ${DEST_DIR}${dir} doesn't exist; can't check for obsolete files
+ return 1
+ fi
+
+ ( cd ${DEST_DIR}${dir} ls -1d [0-9]*[0-9]/. ) \
+ | ${GREP} -v '[^0-9./]' \
+ | sort -t. -r -k1n -k2n -k3n \
+ | tail -n +2 \
+ | while read subdir ; do
+ subdir=${subdir%/.}
+ find ${DEST_DIR}/${dir#/}/${subdir} -depth -print
+ done \
+ | unprefix ${DEST_DIR}
+}
+
# modify_file op srcfile scratchfile awkprog
# Apply awkprog to srcfile sending output to scratchfile, and
# if appropriate replace srcfile with scratchfile.
@@ -718,9 +800,9 @@ do_ddbonpanic()
result=1
else
echo ${DEST_DIR}/etc/sysctl.conf
- sed ${SRC_DIR}/etc/sysctl.conf \
+ ${SED} ${SRC_DIR}/etc/sysctl.conf \
-e '/^ddb\.onpanic/q' | \
- sed -e
CVS commit: [tls-earlyentropy] src/usr.sbin/ndp
Module Name:src Committed By: tls Date: Sun Aug 10 06:59:59 UTC 2014 Modified Files: src/usr.sbin/ndp [tls-earlyentropy]: ndp.8 ndp.c Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.26.2.1 src/usr.sbin/ndp/ndp.8 cvs rdiff -u -r1.42 -r1.42.2.1 src/usr.sbin/ndp/ndp.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/ndp/ndp.8 diff -u src/usr.sbin/ndp/ndp.8:1.26 src/usr.sbin/ndp/ndp.8:1.26.2.1 --- src/usr.sbin/ndp/ndp.8:1.26 Thu Mar 20 13:34:35 2014 +++ src/usr.sbin/ndp/ndp.8 Sun Aug 10 06:59:59 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: ndp.8,v 1.26 2014/03/20 13:34:35 roy Exp $ +.\ $NetBSD: ndp.8,v 1.26.2.1 2014/08/10 06:59:59 tls Exp $ .\ $KAME: ndp.8,v 1.33 2005/10/19 14:57:42 suz Exp $ .\ .\ Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -28,7 +28,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd March 20, 2014 +.Dd June 5, 2014 .Dt NDP 8 .Os .\ @@ -189,6 +189,12 @@ variable is non-0, or the flag .Ic override_rtadv is on. This flag is set to 1 by default. +.It Ic auto_linklocal +Specify whether or not to perform automatic link-local address configuration on +.Ar interface . +This flag is set by +.Li net.inet6.ip6.auto_linklocal +sysctl variable. .It Ic override_rtadv Specify whether or not to override the .Li net.inet6.ip6.accept_rtadv Index: src/usr.sbin/ndp/ndp.c diff -u src/usr.sbin/ndp/ndp.c:1.42 src/usr.sbin/ndp/ndp.c:1.42.2.1 --- src/usr.sbin/ndp/ndp.c:1.42 Tue Dec 17 20:26:46 2013 +++ src/usr.sbin/ndp/ndp.c Sun Aug 10 06:59:59 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ndp.c,v 1.42 2013/12/17 20:26:46 martin Exp $ */ +/* $NetBSD: ndp.c,v 1.42.2.1 2014/08/10 06:59:59 tls Exp $ */ /* $KAME: ndp.c,v 1.121 2005/07/13 11:30:13 keiichi Exp $ */ /* @@ -918,6 +918,9 @@ ifinfo(char *ifname, int argc, char **ar #ifdef ND6_IFF_OVERRIDE_RTADV SETFLAG(override_rtadv, ND6_IFF_OVERRIDE_RTADV); #endif +#ifdef ND6_IFF_AUTO_LINKLOCAL + SETFLAG(auto_linklocal, ND6_IFF_AUTO_LINKLOCAL); +#endif #ifdef ND6_IFF_PREFER_SOURCE SETFLAG(prefer_source, ND6_IFF_PREFER_SOURCE); #endif @@ -996,6 +999,10 @@ ifinfo(char *ifname, int argc, char **ar if ((ND.flags ND6_IFF_OVERRIDE_RTADV)) (void)printf(override_rtadv ); #endif +#ifdef ND6_IFF_AUTO_LINKLOCAL + if ((ND.flags ND6_IFF_AUTO_LINKLOCAL)) + (void)printf(auto_linklocal ); +#endif #ifdef ND6_IFF_PREFER_SOURCE if ((ND.flags ND6_IFF_PREFER_SOURCE)) (void)printf(prefer_source );
CVS commit: [tls-earlyentropy] src/usr.sbin/npf
Module Name:src
Committed By: tls
Date: Sun Aug 10 07:00:01 UTC 2014
Modified Files:
src/usr.sbin/npf [tls-earlyentropy]: Makefile
src/usr.sbin/npf/npfctl [tls-earlyentropy]: npf.conf.5 npf_bpf_comp.c
npf_build.c npf_scan.l npf_show.c npfctl.8 npfctl.c npfctl.h
src/usr.sbin/npf/npftest [tls-earlyentropy]: README
src/usr.sbin/npf/npftest/libnpftest [tls-earlyentropy]: npf_bpf_test.c
npf_nat_test.c npf_perf_test.c npf_rule_test.c npf_state_test.c
npf_test_subr.c
Added Files:
src/usr.sbin/npf [tls-earlyentropy]: npf.7
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.6.1 src/usr.sbin/npf/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/usr.sbin/npf/npf.7
cvs rdiff -u -r1.39 -r1.39.2.1 src/usr.sbin/npf/npfctl/npf.conf.5
cvs rdiff -u -r1.4 -r1.4.2.1 src/usr.sbin/npf/npfctl/npf_bpf_comp.c
cvs rdiff -u -r1.36 -r1.36.2.1 src/usr.sbin/npf/npfctl/npf_build.c \
src/usr.sbin/npf/npfctl/npfctl.h
cvs rdiff -u -r1.20 -r1.20.2.1 src/usr.sbin/npf/npfctl/npf_scan.l
cvs rdiff -u -r1.13 -r1.13.2.1 src/usr.sbin/npf/npfctl/npf_show.c
cvs rdiff -u -r1.15 -r1.15.2.1 src/usr.sbin/npf/npfctl/npfctl.8
cvs rdiff -u -r1.40 -r1.40.2.1 src/usr.sbin/npf/npfctl/npfctl.c
cvs rdiff -u -r1.4 -r1.4.6.1 src/usr.sbin/npf/npftest/README
cvs rdiff -u -r1.4 -r1.4.2.1 \
src/usr.sbin/npf/npftest/libnpftest/npf_bpf_test.c
cvs rdiff -u -r1.8 -r1.8.2.1 \
src/usr.sbin/npf/npftest/libnpftest/npf_nat_test.c
cvs rdiff -u -r1.3 -r1.3.2.1 \
src/usr.sbin/npf/npftest/libnpftest/npf_perf_test.c
cvs rdiff -u -r1.10 -r1.10.2.1 \
src/usr.sbin/npf/npftest/libnpftest/npf_rule_test.c
cvs rdiff -u -r1.5 -r1.5.2.1 \
src/usr.sbin/npf/npftest/libnpftest/npf_state_test.c
cvs rdiff -u -r1.9.2.1 -r1.9.2.2 \
src/usr.sbin/npf/npftest/libnpftest/npf_test_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/npf/Makefile
diff -u src/usr.sbin/npf/Makefile:1.4 src/usr.sbin/npf/Makefile:1.4.6.1
--- src/usr.sbin/npf/Makefile:1.4 Thu Sep 13 21:02:50 2012
+++ src/usr.sbin/npf/Makefile Sun Aug 10 07:00:01 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/09/13 21:02:50 martin Exp $
+# $NetBSD: Makefile,v 1.4.6.1 2014/08/10 07:00:01 tls Exp $
.include bsd.own.mk
@@ -8,4 +8,7 @@ SUBDIR= npfctl
SUBDIR+= npftest
.endif
+MAN= npf.7
+
+.include bsd.man.mk
.include bsd.subdir.mk
Index: src/usr.sbin/npf/npfctl/npf.conf.5
diff -u src/usr.sbin/npf/npfctl/npf.conf.5:1.39 src/usr.sbin/npf/npfctl/npf.conf.5:1.39.2.1
--- src/usr.sbin/npf/npfctl/npf.conf.5:1.39 Fri Feb 14 01:52:58 2014
+++ src/usr.sbin/npf/npfctl/npf.conf.5 Sun Aug 10 07:00:01 2014
@@ -1,4 +1,4 @@
-.\$NetBSD: npf.conf.5,v 1.39 2014/02/14 01:52:58 rmind Exp $
+.\$NetBSD: npf.conf.5,v 1.39.2.1 2014/08/10 07:00:01 tls Exp $
.\
.\ Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -27,7 +27,7 @@
.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\ POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd February 14, 2014
+.Dd August 2, 2014
.Dt NPF.CONF 5
.Os
.Sh NAME
@@ -155,6 +155,25 @@ block out final pcap-filter tcp and dst
.Pp
Fragments are not selectable since NPF always reassembles packets
before further processing.
+.Ss Stateful
+Stateful packet inspection is enabled using
+.Cd stateful
+or
+.Cd stateful-ends
+keywords.
+The former creates a state which is uniquely identified by a 5-tuple (source
+and destination IP addresses, port numbers and an interface identifier).
+The latter excludes the interface identifier and must be used with
+precaution.
+In both cases, a full TCP state tracking is performed for TCP connections
+and a limited tracking for message-based protocols (UDP and ICMP).
+.Pp
+By default, a stateful rule implies SYN-only flag check (flags S/SAFR)
+for the TCP packets.
+It is not advisable to change this behavior; however,
+it can be overridden with the
+.Cd flags
+keyword.
.Ss Map
Network Address Translation (NAT) is expressed in a form of segment mapping.
The translation may be dynamic (stateful) or static (stateless).
@@ -252,7 +271,8 @@ rule-list = [ rule new-line ] rule-list
npf-filter = [ family family-opt ] [ proto protocol [ proto-opts ] ]
( all | filt-opts )
-static-rule = ( block [ block-opts ] | pass ) [ stateful ]
+static-rule = ( block [ block-opts ] | pass )
+ [ stateful | stateful-ends ]
[ in | out ] [ final ] [ on interface ]
( npf-filter | pcap-filter pcap-filter-expr )
[ apply proc-name ]
@@ -332,6 +352,7 @@ group default {
.\ -
.Sh SEE ALSO
.Xr bpf 4 ,
+.Xr npf 7 ,
.Xr pcap-filter 7 ,
.Xr npfctl 8
.Sh HISTORY
Index: src/usr.sbin/npf/npfctl/npf_bpf_comp.c
diff -u src/usr.sbin/npf/npfctl/npf_bpf_comp.c:1.4 src/usr.sbin/npf/npfctl/npf_bpf_comp.c:1.4.2.1
--- src/usr.sbin/npf/npfctl/npf_bpf_comp.c:1.4 Sat Mar 15 08:46:01 2014
+++
CVS commit: [tls-earlyentropy] src/usr.sbin/timed
Module Name:src
Committed By: tls
Date: Sun Aug 10 07:00:31 UTC 2014
Modified Files:
src/usr.sbin/timed [tls-earlyentropy]: Makefile
src/usr.sbin/timed/SMM.doc/timed [tls-earlyentropy]: Makefile
src/usr.sbin/timed/SMM.doc/timedop [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.84.1 src/usr.sbin/timed/Makefile
cvs rdiff -u -r1.5 -r1.5.72.1 src/usr.sbin/timed/SMM.doc/timed/Makefile
cvs rdiff -u -r1.2 -r1.2.84.1 src/usr.sbin/timed/SMM.doc/timedop/Makefile
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/timed/Makefile
diff -u src/usr.sbin/timed/Makefile:1.4 src/usr.sbin/timed/Makefile:1.4.84.1
--- src/usr.sbin/timed/Makefile:1.4 Sun Dec 21 16:14:41 1997
+++ src/usr.sbin/timed/Makefile Sun Aug 10 07:00:31 2014
@@ -1,10 +1,7 @@
-# $NetBSD: Makefile,v 1.4 1997/12/21 16:14:41 christos Exp $
+# $NetBSD: Makefile,v 1.4.84.1 2014/08/10 07:00:31 tls Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
SUBDIR= timed timedc
-
-.if make(install)
SUBDIR+= SMM.doc
-.endif
.include bsd.subdir.mk
Index: src/usr.sbin/timed/SMM.doc/timed/Makefile
diff -u src/usr.sbin/timed/SMM.doc/timed/Makefile:1.5 src/usr.sbin/timed/SMM.doc/timed/Makefile:1.5.72.1
--- src/usr.sbin/timed/SMM.doc/timed/Makefile:1.5 Thu Jul 10 10:34:49 2003
+++ src/usr.sbin/timed/SMM.doc/timed/Makefile Sun Aug 10 07:00:31 2014
@@ -1,13 +1,18 @@
-# $NetBSD: Makefile,v 1.5 2003/07/10 10:34:49 lukem Exp $
+# $NetBSD: Makefile,v 1.5.72.1 2014/08/10 07:00:31 tls Exp $
#
# @(#)Makefile 8.2 (Berkeley) 5/11/94
-DIR= smm/12.timed
+SECTION=reference/ref5
+ARTICLE=timed
SRCS= timed.ms
+DEPSRCS=time date unused loop # spell.ok?
MACROS= -ms
-
-paper.ps: ${SRCS}
- ${TOOL_SOELIM} -I${.CURDIR} ${.ALLSRC} | ${TOOL_TBL} | \
- ${TOOL_ROFF_PS} ${MACROS} ${.TARGET}
+ROFF_TBL=yes
+EXTRAHTMLFILES=\
+ timed1.png timed2.png timed3.png timed4.png timed5.png \
+ timed6.png timed7.png timed8.png timed9.png timed10.png \
+ timed11.png timed12.png timed13.png timed14.png timed15.png \
+ timed16.png timed17.png timed18.png timed19.png timed20.png \
+ timed21.png timed22.png timed23.png timed24.png
.include bsd.doc.mk
Index: src/usr.sbin/timed/SMM.doc/timedop/Makefile
diff -u src/usr.sbin/timed/SMM.doc/timedop/Makefile:1.2 src/usr.sbin/timed/SMM.doc/timedop/Makefile:1.2.84.1
--- src/usr.sbin/timed/SMM.doc/timedop/Makefile:1.2 Fri Jan 9 08:11:58 1998
+++ src/usr.sbin/timed/SMM.doc/timedop/Makefile Sun Aug 10 07:00:31 2014
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.2 1998/01/09 08:11:58 perry Exp $
+# $NetBSD: Makefile,v 1.2.84.1 2014/08/10 07:00:31 tls Exp $
#
# @(#)Makefile 8.1 (Berkeley) 6/8/93
-DIR= smm/11.timedop
+SECTION=reference/ref8
+ARTICLE=timed
SRCS= timed.ms
MACROS= -ms
+EXTRAHTMLFILES=timed1.png timed2.png
.include bsd.doc.mk
CVS commit: [tls-earlyentropy] src/usr.sbin/sysinst
Module Name:src Committed By: tls Date: Sun Aug 10 07:00:29 UTC 2014 Added Files: src/usr.sbin/sysinst [tls-earlyentropy]: Makefile Makefile.inc SPELLING.en TODO aout2elf.c bsddisklabel.c checkrc.c configmenu.c defs.h disks.c disks_lfs.c endian.h factor.c geom.c install.c label.c main.c mbr.c mbr.h menus.mbr menus.mi msg.mbr.de msg.mbr.en msg.mbr.es msg.mbr.fr msg.mbr.pl msg.mi.de msg.mi.en msg.mi.es msg.mi.fr msg.mi.pl msg_xlat.sh net.c partman.c run.c savenewlabel.c sizemultname.c target.c txtwalk.c txtwalk.h unif.awk upgrade.c util.c wskbd.c src/usr.sbin/sysinst/arch/acorn26 [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/acorn32 [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/alpha [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/amd64 [tls-earlyentropy]: Makefile md.c md.h src/usr.sbin/sysinst/arch/amiga [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr msg.md.de msg.md.en msg.md.es msg.md.fr src/usr.sbin/sysinst/arch/arc [tls-earlyentropy]: Makefile md.c md.h menus.md.en msg.md.en src/usr.sbin/sysinst/arch/atari [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es msg.md.de msg.md.en msg.md.es src/usr.sbin/sysinst/arch/bebox [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/cats [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/cobalt [tls-earlyentropy]: Makefile md.c md.h menus.md.en msg.md.en src/usr.sbin/sysinst/arch/dummy [tls-earlyentropy]: Makefile md.c md.h msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/emips [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/evbarm [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/evbmips [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/evbppc [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/evbsh3 [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/ews4800mips [tls-earlyentropy]: Makefile md.c md.h menus.md.en msg.md.en src/usr.sbin/sysinst/arch/hp300 [tls-earlyentropy]: Makefile md.c md.h menus.md.en msg.md.en src/usr.sbin/sysinst/arch/hpcarm [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/hpcmips [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/hpcsh [tls-earlyentropy]: Makefile md.c md.h menus.md.en msg.md.en src/usr.sbin/sysinst/arch/hppa [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/i386 [tls-earlyentropy]: Makefile md.c md.h menus.md msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/landisk [tls-earlyentropy]: Makefile md.c md.h menus.md.en menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es msg.md.fr msg.md.pl src/usr.sbin/sysinst/arch/luna68k [tls-earlyentropy]: Makefile md.c md.h menus.md.en msg.md.en src/usr.sbin/sysinst/arch/mac68k [tls-earlyentropy]: Makefile md.c md.h menus.md.de menus.md.en menus.md.es menus.md.pl
CVS commit: [tls-earlyentropy] src/usr.sbin/vnconfig
Module Name:src
Committed By: tls
Date: Sun Aug 10 07:00:33 UTC 2014
Modified Files:
src/usr.sbin/vnconfig [tls-earlyentropy]: vnconfig.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.41.4.1 src/usr.sbin/vnconfig/vnconfig.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/vnconfig/vnconfig.c
diff -u src/usr.sbin/vnconfig/vnconfig.c:1.41 src/usr.sbin/vnconfig/vnconfig.c:1.41.4.1
--- src/usr.sbin/vnconfig/vnconfig.c:1.41 Sun Jun 9 13:25:40 2013
+++ src/usr.sbin/vnconfig/vnconfig.c Sun Aug 10 07:00:33 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vnconfig.c,v 1.41 2013/06/09 13:25:40 christos Exp $ */
+/* $NetBSD: vnconfig.c,v 1.41.4.1 2014/08/10 07:00:33 tls Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -318,9 +318,10 @@ config(char *dev, char *file, char *geom
int ffd;
ffd = open(file, readonly ? O_RDONLY : O_RDWR);
- if (ffd 0)
+ if (ffd 0) {
warn(%s, file);
- else {
+ rv = -1;
+ } else {
(void) close(ffd);
rv = ioctl(fd, VNDIOCSET, vndio);
CVS commit: [tls-earlyentropy] src/usr.sbin/wlanctl
Module Name:src
Committed By: tls
Date: Sun Aug 10 07:00:35 UTC 2014
Modified Files:
src/usr.sbin/wlanctl [tls-earlyentropy]: wlanctl.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.18.1 src/usr.sbin/wlanctl/wlanctl.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/wlanctl/wlanctl.c
diff -u src/usr.sbin/wlanctl/wlanctl.c:1.13 src/usr.sbin/wlanctl/wlanctl.c:1.13.18.1
--- src/usr.sbin/wlanctl/wlanctl.c:1.13 Wed Aug 31 13:32:41 2011
+++ src/usr.sbin/wlanctl/wlanctl.c Sun Aug 10 07:00:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: wlanctl.c,v 1.13 2011/08/31 13:32:41 joerg Exp $ */
+/* $NetBSD: wlanctl.c,v 1.13.18.1 2014/08/10 07:00:35 tls Exp $ */
/*-
* Copyright (c) 2005 David Young. All rights reserved.
*
@@ -56,7 +56,6 @@ struct flagname {
};
struct cmdflags {
- int cf_v; /* verbose */
int cf_a; /* all 802.11 interfaces */
int cf_p; /* public (i.e. non-private) dests */
};
@@ -179,7 +178,8 @@ print_channel(u_int16_t chanidx, u_int16
* hdr_type: header type: IEEE80211_SYSCTL_T_NODE - generic node,
*IEEE80211_SYSCTL_T_RSSADAPT - rssadapt(9) info,
*IEEE80211_SYSCTL_T_DRVSPEC - driver specific.
- * cf: command flags, cf_v != 0 - verbose
+ * cf: command flags: cf_a != 0 - all 802.11 interfaces
+ * cf_p != 0 - public dests
*/
static int
dump_nodes(const char *ifname_arg, int hdr_type, struct cmdflags *cf)
@@ -287,8 +287,10 @@ dump_nodes(const char *ifname_arg, int h
static void
usage(void)
{
- fprintf(stderr, usage: %s [ -p ] [ -v ] -a\n
- \t[ -v ] interface [ interface ... ]\n, getprogname());
+ fprintf(stderr,
+ Usage: %s [ -p ] -a\n
+ %s [ -p ] interface [ interface ... ]\n,
+ getprogname(), getprogname());
exit(EXIT_FAILURE);
}
@@ -299,7 +301,7 @@ parse_args(int *argcp, char ***argvp, st
(void)memset(cf, 0, sizeof(*cf));
- while ((ch = getopt(*argcp, *argvp, apv)) != -1) {
+ while ((ch = getopt(*argcp, *argvp, ap)) != -1) {
switch (ch) {
case 'a':
cf-cf_a = 1;
@@ -307,9 +309,6 @@ parse_args(int *argcp, char ***argvp, st
case 'p':
cf-cf_p = 1;
break;
- case 'v':
- cf-cf_v = 1;
- break;
default:
warnx(unknown option -%c, ch);
usage();
CVS commit: [tls-earlyentropy] src/x11/share/fonts
Module Name:src
Committed By: tls
Date: Sun Aug 10 07:00:45 UTC 2014
Modified Files:
src/x11/share/fonts/bdf [tls-earlyentropy]: Makefile.bdf
src/x11/share/fonts/encodings [tls-earlyentropy]: Makefile.enc
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.2.1 src/x11/share/fonts/bdf/Makefile.bdf
cvs rdiff -u -r1.9 -r1.9.2.1 src/x11/share/fonts/encodings/Makefile.enc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/x11/share/fonts/bdf/Makefile.bdf
diff -u src/x11/share/fonts/bdf/Makefile.bdf:1.8 src/x11/share/fonts/bdf/Makefile.bdf:1.8.2.1
--- src/x11/share/fonts/bdf/Makefile.bdf:1.8 Mon Jan 27 08:18:08 2014
+++ src/x11/share/fonts/bdf/Makefile.bdf Sun Aug 10 07:00:45 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bdf,v 1.8 2014/01/27 08:18:08 apb Exp $
+# $NetBSD: Makefile.bdf,v 1.8.2.1 2014/08/10 07:00:45 tls Exp $
# Font files built using this makefile are cleaned in two ways:
#
@@ -17,7 +17,7 @@ FILESDIR= ${X11FONTDIR}/${FONTSUBDIR}
.PATH: ${X11SRCDIR.xc}/fonts/bdf/${FONTSUBDIR}
FONTSUFFIX= .gz
-FONTGZIP= | ${TOOL_GZIP} ${GZIPLEVEL:U-9} -ncf
+FONTGZIP= | ${TOOL_GZIP_N} ${GZIPLEVEL:U-9} -cf
.include ${NETBSDSRCDIR}/x11/tools/bdftopcf/Makefile.bdftopcf
.include ${NETBSDSRCDIR}/x11/tools/ucs2any/Makefile.ucs2any
Index: src/x11/share/fonts/encodings/Makefile.enc
diff -u src/x11/share/fonts/encodings/Makefile.enc:1.9 src/x11/share/fonts/encodings/Makefile.enc:1.9.2.1
--- src/x11/share/fonts/encodings/Makefile.enc:1.9 Mon Jan 27 08:18:08 2014
+++ src/x11/share/fonts/encodings/Makefile.enc Sun Aug 10 07:00:45 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.enc,v 1.9 2014/01/27 08:18:08 apb Exp $
+# $NetBSD: Makefile.enc,v 1.9.2.1 2014/08/10 07:00:45 tls Exp $
FILESDIR= ${X11FONTDIR}/${ENCDIR}
.PATH: ${X11SRCDIR.xc}/fonts/${ENCDIR}
@@ -11,7 +11,7 @@ CLEANFILES+= ${GZFILES:S/.gz$/.gz.tmp/}
.SUFFIXES: .enc .enc.gz
.enc.enc.gz:
${_MKTARGET_CREATE}
- ${TOOL_GZIP} -9nfc ${.IMPSRC} ${.TARGET}.tmp \
+ ${TOOL_GZIP_N} -9fc ${.IMPSRC} ${.TARGET}.tmp \
mv ${.TARGET}.tmp ${.TARGET}
CVS commit: [tls-earlyentropy] src/x11/lib/GLU
Module Name:src
Committed By: tls
Date: Sun Aug 10 07:00:41 UTC 2014
Modified Files:
src/x11/lib/GLU [tls-earlyentropy]: Makefile
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.2.1 src/x11/lib/GLU/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/x11/lib/GLU/Makefile
diff -u src/x11/lib/GLU/Makefile:1.10 src/x11/lib/GLU/Makefile:1.10.2.1
--- src/x11/lib/GLU/Makefile:1.10 Thu Sep 12 17:14:20 2013
+++ src/x11/lib/GLU/Makefile Sun Aug 10 07:00:41 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/09/12 17:14:20 joerg Exp $
+# $NetBSD: Makefile,v 1.10.2.1 2014/08/10 07:00:41 tls Exp $
NOLINT= 1 # XTODO: tess.ln SIGSEGVs lint :(
@@ -69,7 +69,7 @@ LIBDPLIBS=\
.include bsd.lib.mk
# Many const char * vs char * issues in xsrc/xfree
-.if defined(HAVE_GCC) ${HAVE_GCC} = 45
+.if defined(HAVE_GCC)
# XXX -Wno-deprecated doesn't work?
CXXFLAGS+= -Wno-error
.endif
CVS commit: [tls-earlyentropy] src/usr.sbin/mtree
Module Name:src
Committed By: tls
Date: Sun Aug 10 06:59:56 UTC 2014
Modified Files:
src/usr.sbin/mtree [tls-earlyentropy]: create.c extern.h mtree.c spec.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.72.2.1 src/usr.sbin/mtree/create.c
cvs rdiff -u -r1.38 -r1.38.6.1 src/usr.sbin/mtree/extern.h
cvs rdiff -u -r1.48 -r1.48.4.1 src/usr.sbin/mtree/mtree.c
cvs rdiff -u -r1.88 -r1.88.2.1 src/usr.sbin/mtree/spec.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/mtree/create.c
diff -u src/usr.sbin/mtree/create.c:1.72 src/usr.sbin/mtree/create.c:1.72.2.1
--- src/usr.sbin/mtree/create.c:1.72 Thu Oct 17 17:22:59 2013
+++ src/usr.sbin/mtree/create.c Sun Aug 10 06:59:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: create.c,v 1.72 2013/10/17 17:22:59 christos Exp $ */
+/* $NetBSD: create.c,v 1.72.2.1 2014/08/10 06:59:56 tls Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = @(#)create.c 8.1 (Berkeley) 6/6/93;
#else
-__RCSID($NetBSD: create.c,v 1.72 2013/10/17 17:22:59 christos Exp $);
+__RCSID($NetBSD: create.c,v 1.72.2.1 2014/08/10 06:59:56 tls Exp $);
#endif
#endif /* not lint */
@@ -91,13 +91,14 @@ static u_long flags;
#endif
static int dcmp(const FTSENT *FTS_CONST *, const FTSENT *FTS_CONST *);
-static void output(int, int *, const char *, ...)
- __attribute__((__format__(__printf__, 3, 4)));
-static int statd(FTS *, FTSENT *, uid_t *, gid_t *, mode_t *, u_long *);
-static void statf(int, FTSENT *);
+static void output(FILE *, int, int *, const char *, ...)
+__printflike(4, 5);
+static int statd(FILE *, FTS *, FTSENT *, uid_t *, gid_t *, mode_t *,
+u_long *);
+static void statf(FILE *, int, FTSENT *);
void
-cwalk(void)
+cwalk(FILE *fp)
{
FTS *t;
FTSENT *p;
@@ -121,7 +122,7 @@ cwalk(void)
}
if (!nflag)
- printf(
+ fprintf(fp,
#\t user: %s\n#\tmachine: %s\n#\t tree: %s\n
#\t date: %s,
user, host, fullpath, ctime(clocktime));
@@ -142,21 +143,21 @@ cwalk(void)
switch(p-fts_info) {
case FTS_D:
if (!bflag)
-printf(\n);
+fprintf(fp, \n);
if (!nflag)
-printf(# %s\n, p-fts_path);
- statd(t, p, uid, gid, mode, flags);
- statf(indent, p);
+fprintf(fp, # %s\n, p-fts_path);
+ statd(fp, t, p, uid, gid, mode, flags);
+ statf(fp, indent, p);
break;
case FTS_DP:
if (p-fts_level 0)
if (!nflag)
- printf(%*s# %s\n, indent, ,
+ fprintf(fp, %*s# %s\n, indent, ,
p-fts_path);
if (p-fts_level 0 || flavor == F_FREEBSD9) {
-printf(%*s..\n, indent, );
+fprintf(fp, %*s..\n, indent, );
if (!bflag)
- printf(\n);
+ fprintf(fp, \n);
}
break;
case FTS_DNR:
@@ -167,7 +168,7 @@ cwalk(void)
break;
default:
if (!dflag)
-statf(indent, p);
+statf(fp, indent, p);
break;
}
@@ -178,7 +179,7 @@ cwalk(void)
}
static void
-statf(int indent, FTSENT *p)
+statf(FILE *fp, int indent, FTSENT *p)
{
u_int32_t len, val;
int fd, offset;
@@ -187,51 +188,54 @@ statf(int indent, FTSENT *p)
char *digestbuf;
#endif
- offset = printf(%*s%s%s, indent, ,
+ offset = fprintf(fp, %*s%s%s, indent, ,
S_ISDIR(p-fts_statp-st_mode) ? : , vispath(p-fts_name));
if (offset (INDENTNAMELEN + indent))
offset = MAXLINELEN;
else
- offset += printf(%*s, (INDENTNAMELEN + indent) - offset, );
+ offset += fprintf(fp, %*s,
+ (INDENTNAMELEN + indent) - offset, );
if (!S_ISREG(p-fts_statp-st_mode) (flavor == F_NETBSD6 || !dflag))
- output(indent, offset, type=%s,
+ output(fp, indent, offset, type=%s,
inotype(p-fts_statp-st_mode));
if (keys (F_UID | F_UNAME) p-fts_statp-st_uid != uid) {
if (keys F_UNAME
(name = user_from_uid(p-fts_statp-st_uid, 1)) != NULL)
- output(indent, offset, uname=%s, name);
+ output(fp, indent, offset, uname=%s, name);
if (keys F_UID || (keys F_UNAME name == NULL))
- output(indent, offset, uid=%u, p-fts_statp-st_uid);
+ output(fp, indent, offset, uid=%u,
+ p-fts_statp-st_uid);
}
if (keys (F_GID | F_GNAME) p-fts_statp-st_gid != gid) {
if (keys F_GNAME
(name = group_from_gid(p-fts_statp-st_gid, 1)) != NULL)
- output(indent, offset, gname=%s, name);
+ output(fp, indent, offset, gname=%s, name);
if (keys F_GID || (keys F_GNAME name == NULL))
- output(indent, offset, gid=%u, p-fts_statp-st_gid);
+ output(fp, indent, offset, gid=%u,
+ p-fts_statp-st_gid);
}
if (keys F_MODE (p-fts_statp-st_mode MBITS) != mode)
- output(indent, offset, mode=%#o,
+ output(fp, indent, offset, mode=%#o,
p-fts_statp-st_mode MBITS);
if (keys F_DEV
(S_ISBLK(p-fts_statp-st_mode) || S_ISCHR(p-fts_statp-st_mode)))
- output(indent, offset, device=%#jx,
+ output(fp, indent, offset, device=%#jx,
(uintmax_t)p-fts_statp-st_rdev);
if (keys F_NLINK
CVS commit: [tls-earlyentropy] src/usr.sbin/ypbind
Module Name:src
Committed By: tls
Date: Sun Aug 10 07:00:38 UTC 2014
Modified Files:
src/usr.sbin/ypbind [tls-earlyentropy]: ypbind.8 ypbind.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.38.1 src/usr.sbin/ypbind/ypbind.8
cvs rdiff -u -r1.90 -r1.90.18.1 src/usr.sbin/ypbind/ypbind.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/ypbind/ypbind.8
diff -u src/usr.sbin/ypbind/ypbind.8:1.18 src/usr.sbin/ypbind/ypbind.8:1.18.38.1
--- src/usr.sbin/ypbind/ypbind.8:1.18 Wed Apr 30 13:11:03 2008
+++ src/usr.sbin/ypbind/ypbind.8 Sun Aug 10 07:00:38 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: ypbind.8,v 1.18 2008/04/30 13:11:03 martin Exp $
+.\ $NetBSD: ypbind.8,v 1.18.38.1 2014/08/10 07:00:38 tls Exp $
.\
.\ Copyright (c) 1996 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -27,7 +27,7 @@
.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\ POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd February 26, 2005
+.Dd June 14, 2014
.Dt YPBIND 8
.Os
.Sh NAME
@@ -94,9 +94,9 @@ it is bound.
If the binding is somehow lost, e.g by server reboot,
.Nm
marks the domain as unbound and attempts to re-establish the binding.
-When the binding is once again successful,
+If a binding cannot be re-established within 60 seconds,
.Nm
-marks the domain as bound and resumes its periodic check.
+backs off exponentially to trying only once per hour.
.Pp
The options are as follows:
.Bl -tag -width -broadcast
@@ -114,7 +114,7 @@ or
servers.
.It Fl ypset
.Xr ypset 8
-may be used to change the server to which a domain is bound.
+may be used from anywhere to change the server to which a domain is bound.
.It Fl ypsetme
.Xr ypset 8
may be used only from this machine to change the server
@@ -122,11 +122,22 @@ to which a domain is bound.
.El
.Pp
The
-.Fl broadcast
+.Fl broadcast ,
.Fl ypset ,
and
-.Fl ypsetme ,
+.Fl ypsetme
options are inherently insecure and should be avoided.
+.Sh SIGNALS
+.Nm
+responds to the following signals:
+.Bl -tag -width TERM -compact
+.It Dv HUP
+causes
+.Nm
+to immediately retry any unbound domains that are currently in
+exponential backoff.
+Use this to resume immediately after a long network outage is
+resolved.
.Sh FILES
.Pa /var/yp/binding/\*[Lt]domain\*[Gt].version
- binding file for \*[Lt]domain\*[Gt].
@@ -147,7 +158,10 @@ facility.
.Xr yppoll 8 ,
.Xr ypset 8
.Sh AUTHORS
+.An -nosplit
This version of
.Nm
-was originally implemented by Theo de Raadt.
-The ypservers support was implemented by Luke Mewburn.
+was originally implemented by
+.An Theo de Raadt .
+The ypservers support was implemented by
+.An Luke Mewburn .
Index: src/usr.sbin/ypbind/ypbind.c
diff -u src/usr.sbin/ypbind/ypbind.c:1.90 src/usr.sbin/ypbind/ypbind.c:1.90.18.1
--- src/usr.sbin/ypbind/ypbind.c:1.90 Tue Aug 30 17:06:22 2011
+++ src/usr.sbin/ypbind/ypbind.c Sun Aug 10 07:00:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ypbind.c,v 1.90 2011/08/30 17:06:22 plunky Exp $ */
+/* $NetBSD: ypbind.c,v 1.90.18.1 2014/08/10 07:00:38 tls Exp $ */
/*
* Copyright (c) 1992, 1993 Theo de Raadt dera...@fsa.ca
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#ifndef LINT
-__RCSID($NetBSD: ypbind.c,v 1.90 2011/08/30 17:06:22 plunky Exp $);
+__RCSID($NetBSD: ypbind.c,v 1.90.18.1 2014/08/10 07:00:38 tls Exp $);
#endif
#include sys/types.h
@@ -50,6 +50,7 @@ __RCSID($NetBSD: ypbind.c,v 1.90 2011/0
#include ifaddrs.h
#include limits.h
#include netdb.h
+#include signal.h
#include stdarg.h
#include stdio.h
#include stdlib.h
@@ -84,16 +85,26 @@ typedef enum {
YPBIND_DIRECT, YPBIND_BROADCAST,
} ypbind_mode_t;
+enum domainstates {
+ DOM_NEW, /* not yet bound */
+ DOM_ALIVE, /* bound and healthy */
+ DOM_PINGING, /* ping outstanding */
+ DOM_LOST, /* binding timed out, looking for a new one */
+ DOM_DEAD, /* long-term lost, in exponential backoff */
+};
+
struct domain {
struct domain *dom_next;
char dom_name[YPMAXDOMAIN + 1];
struct sockaddr_in dom_server_addr;
long dom_vers;
- time_t dom_checktime;
- time_t dom_asktime;
+ time_t dom_checktime; /* time of next check/contact */
+ time_t dom_asktime; /* time we were last DOMAIN'd */
+ time_t dom_losttime; /* time the binding was lost, or 0 */
+ unsigned dom_backofftime; /* current backoff period, when DEAD */
int dom_lockfd;
- int dom_alive;
+ enum domainstates dom_state;
uint32_t dom_xid;
FILE *dom_serversfile; /* /var/yp/binding/foo.ypservers */
int dom_been_ypset; /* ypset been done on this domain? */
@@ -102,26 +113,36 @@ struct domain {
#define BUFSIZE 1400
-static char *domainname;
-
+/* the list of all domains */
static struct domain *domains;
static int check;
+/* option settings */
static ypbind_mode_t default_ypbindmode;
-
static int allow_local_ypset = 0, allow_any_ypset = 0;
static int insecure;
+/* the sockets we use to interact with servers */
static int
CVS commit: [tls-earlyentropy] src/etc
Module Name:src
Committed By: tls
Date: Sun Aug 10 07:03:07 UTC 2014
Modified Files:
src/etc [tls-earlyentropy]: Makefile Makefile.params daily locate.conf
rc rc.conf rc.subr services
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.412 -r1.412.2.1 src/etc/Makefile
cvs rdiff -u -r1.11 -r1.11.2.1 src/etc/Makefile.params
cvs rdiff -u -r1.90 -r1.90.2.1 src/etc/daily
cvs rdiff -u -r1.1 -r1.1.76.1 src/etc/locate.conf
cvs rdiff -u -r1.166 -r1.166.20.1 src/etc/rc
cvs rdiff -u -r1.96 -r1.96.78.1 src/etc/rc.conf
cvs rdiff -u -r1.92 -r1.92.8.1 src/etc/rc.subr
cvs rdiff -u -r1.97 -r1.97.8.1 src/etc/services
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.412 src/etc/Makefile:1.412.2.1
--- src/etc/Makefile:1.412 Mon Jan 27 21:37:17 2014
+++ src/etc/Makefile Sun Aug 10 07:03:06 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.412 2014/01/27 21:37:17 apb Exp $
+# $NetBSD: Makefile,v 1.412.2.1 2014/08/10 07:03:06 tls Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -47,6 +47,8 @@ CKSUM?= ${TOOL_CKSUM}
MAKESUMS= MAKE=${MAKE:Q} CKSUM=${CKSUM:Q} ${HOST_SH} ${NETBSDSRCDIR}/distrib/sets/makesums
DISTRIBVER!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
+GZIP_FLAGS= -9 ${GZIP_N_FLAG}
+
# Flags for creating ISO CDROM image
# mkisofs is expected to be in $PATH, install via pkgsrc/sysutils/cdrtools
# Note: At least mkisofs 2.0 should be used.
@@ -193,9 +195,20 @@ etc-release: .EXEC .MAKE
echo ; \
cat ${NETBSDSRCDIR}/sys/conf/copyright; \
echo ; \
- echo Build settings:; \
+ echo Build information:; \
printf %20s %s\n Build date $$(date -u); \
printf %20s %s\n Built by $${USER-root}@$$(hostname); \
+ if [ -n ${BUILDID} ]; then \
+ printf %20s %s\n Build ID ${BUILDID} ; \
+ fi ; \
+ if [ -n ${BUILDINFO} ]; then \
+ echo ; \
+ info=$$(printf %b ${BUILDINFO:Q}) ; \
+ printf %s\n $${info} \
+ | ${TOOL_SED} -e 's/^//' ; \
+ fi ; \
+ echo ; \
+ echo Build settings:; \
echo ; \
${PRINT_PARAMS} ; \
) ${.OBJDIR}/${.TARGET}
@@ -402,7 +415,7 @@ release snapshot: .PHONY .MAKE check_DES
# Note: At least mkisofs 2.0 should be used.
#
CDROM_NAME_ADD?=
-CDROM_IMAGE?=${RELEASEDIR}/iso/NetBSD-${DISTRIBVER}-${MACHINE}.iso
+CDROM_IMAGE?=${RELEASEDIR}/images/NetBSD-${DISTRIBVER}-${MACHINE}.iso
CDROM.dir= ${.OBJDIR}/cdrom.dir
CDROM.pathlist= ${.OBJDIR}/cdrom.pathlist
@@ -410,7 +423,7 @@ iso-image:
.if ${MKISOFS} != true
do-iso-image: .PHONY check_DESTDIR check_RELEASEDIR iso-image-md-post
- ${MAKESUMS} -t ${RELEASEDIR}/iso/ '*.iso'
+ ${MAKESUMS} -t ${RELEASEDIR}/images/ '*.iso'
@echo iso-image created as: ${CDROM_IMAGE}
.else
do-iso-image:
@@ -426,12 +439,14 @@ iso-image-setup: .PHONY check_RELEASEDIR
.endfor
echo ${MACHINE}/=${RELEASEDIR}/${RELEASEMACHINEDIR}/ ${CDROM.pathlist}
mkdir -p ${CDROM.dir}
- mkdir -p ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom
+
+check_imagedir:
+ mkdir -p ${RELEASEDIR}/images
# iso-image-mi --
# Create the image after the MD operations have completed.
#
-iso-image-mi: .PHONY check_DESTDIR check_RELEASEDIR iso-image-md-pre
+iso-image-mi: .PHONY check_DESTDIR check_RELEASEDIR iso-image-md-pre check_imagedir
@if ! ${MKISOFS} --version; then \
echo install pkgsrc/sysutils/cdrtools and run 'make iso-image'. ; \
false; \
@@ -558,7 +573,7 @@ build_kernels: .PHONY
build_kernels: kern-${configfile}
kern-${configfile}: .PHONY .MAKE
cd ${KERNCONFDIR} ${TOOL_CONFIG} -s ${KERNSRCDIR} \
- -b ${KERNOBJDIR}/${configfile:C/.*\///} ${configfile}
+ -U DEBUG -b ${KERNOBJDIR}/${configfile:C/.*\///} ${configfile}
.if ${MKUPDATE} == no
cd ${KERNOBJDIR}/${configfile:C/.*\///} ${MAKE} distclean
.endif
@@ -580,7 +595,7 @@ kernset-${configfile}: .PHONY build_kern
kerndir=${KERNOBJDIR}/${configfile:C/.*\///}; \
kernsuffixes=${KERNEL_SUFFIXES:S/^/./}; \
kern_tgz=${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets/kern-${configfile}.tgz; \
- pax_cmd=COMPRESS_PROGRAM=${TOOL_GZIP:Q} GZIP=-9n ${TOOL_PAX} -O -zw -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}; \
+ pax_cmd=GZIP=${GZIP_FLAGS:Q} ${TOOL_PAX} --use-compress-program ${TOOL_GZIP:Q} -O -w -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}; \
cd $${kerndir} { \
kernels=; newest=; \
for kernel in $${kernlist}; do \
@@ -625,8 +640,8 @@ releasekern-${configfile}: .PHONY build_
knl_gz=${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/$${kernel}-${configfile:C/.*\///}$${s}.gz; \
[ $${knl_gz} -nt $${ks} ] continue; \
rm -f $${knl_gz}; \
-echo ${TOOL_GZIP} -nc -9 $${kerndir}/$${ks} $${knl_gz}; \
-${TOOL_GZIP} -nc -9 $${ks} $${knl_gz}; \
+echo ${TOOL_GZIP} ${GZIP_FLAGS} -c $${kerndir}/$${ks} $${knl_gz}; \
+${TOOL_GZIP} ${GZIP_FLAGS} -c $${ks} $${knl_gz}; \
done; \
done; \
}
CVS commit: [tls-earlyentropy] src/include
Module Name:src
Committed By: tls
Date: Sun Aug 10 07:03:53 UTC 2014
Modified Files:
src/include [tls-earlyentropy]: search.h stdio.h stdlib.h unistd.h
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.4.1 src/include/search.h
cvs rdiff -u -r1.88 -r1.88.4.1 src/include/stdio.h
cvs rdiff -u -r1.107 -r1.107.2.1 src/include/stdlib.h
cvs rdiff -u -r1.140 -r1.140.2.1 src/include/unistd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/search.h
diff -u src/include/search.h:1.20 src/include/search.h:1.20.4.1
--- src/include/search.h:1.20 Sat Apr 27 21:35:25 2013
+++ src/include/search.h Sun Aug 10 07:03:53 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: search.h,v 1.20 2013/04/27 21:35:25 joerg Exp $ */
+/* $NetBSD: search.h,v 1.20.4.1 2014/08/10 07:03:53 tls Exp $ */
/*
* Written by J.T. Conklin j...@netbsd.org
@@ -62,8 +62,10 @@ void hdestroy(void);
ENTRY *hsearch(ENTRY, ACTION);
#ifdef _NETBSD_SOURCE
+void hdestroy1(void (*)(void *), void (*)(void *));
int hcreate_r(size_t, struct hsearch_data *);
void hdestroy_r(struct hsearch_data *);
+void hdestroy1_r(struct hsearch_data *, void (*)(void *), void (*)(void *));
int hsearch_r(ENTRY, ACTION, ENTRY **, struct hsearch_data *);
#endif /* _NETBSD_SOURCE */
Index: src/include/stdio.h
diff -u src/include/stdio.h:1.88 src/include/stdio.h:1.88.4.1
--- src/include/stdio.h:1.88 Sat May 4 18:30:14 2013
+++ src/include/stdio.h Sun Aug 10 07:03:53 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: stdio.h,v 1.88 2013/05/04 18:30:14 christos Exp $ */
+/* $NetBSD: stdio.h,v 1.88.4.1 2014/08/10 07:03:53 tls Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -242,9 +242,6 @@ long ftell(FILE *);
size_t fwrite(const void * __restrict, size_t, size_t, FILE * __restrict);
int getc(FILE *);
int getchar(void);
-ssize_t getdelim(char ** __restrict, size_t * __restrict, int,
- FILE * __restrict);
-ssize_t getline(char ** __restrict, size_t * __restrict, FILE * __restrict);
void perror(const char *);
int printf(const char * __restrict, ...)
__printflike(1, 2);
@@ -461,9 +458,9 @@ __END_DECLS
#if defined(__GNUC__) defined(__STDC__)
static __inline int __sputc(int _c, FILE *_p) {
if (--_p-_w = 0 || (_p-_w = _p-_lbfsize (char)_c != '\n'))
- return (*_p-_p++ = _c);
+ return *_p-_p++ = (unsigned char)_c;
else
- return (__swbuf(_c, _p));
+ return __swbuf(_c, _p);
}
#else
/*
@@ -508,10 +505,12 @@ static __inline int __sputc(int _c, FILE
#endif /* !_ANSI_SOURCE !__cplusplus*/
#if (_POSIX_C_SOURCE - 0) = 200809L || defined(_NETBSD_SOURCE)
+__BEGIN_DECLS
int vdprintf(int, const char * __restrict, __va_list)
__printflike(2, 0);
int dprintf(int, const char * __restrict, ...)
__printflike(2, 3);
+__END_DECLS
#endif /* (_POSIX_C_SOURCE - 0) = 200809L || defined(_NETBSD_SOURCE) */
#if (_POSIX_C_SOURCE - 0) = 199506L || (_XOPEN_SOURCE - 0) = 500 || \
@@ -525,7 +524,12 @@ int dprintf(int, const char * __restric
#if (_POSIX_C_SOURCE - 0) = 200809L || (_XOPEN_SOURCE - 0) = 700 || \
defined(_NETBSD_SOURCE)
+__BEGIN_DECLS
FILE *fmemopen(void * __restrict, size_t, const char * __restrict);
+ssize_t getdelim(char ** __restrict, size_t * __restrict, int,
+ FILE * __restrict);
+ssize_t getline(char ** __restrict, size_t * __restrict, FILE * __restrict);
+__END_DECLS
#endif
#if (_POSIX_C_SOURCE - 0) = 200809L || defined(_NETBSD_SOURCE)
Index: src/include/stdlib.h
diff -u src/include/stdlib.h:1.107 src/include/stdlib.h:1.107.2.1
--- src/include/stdlib.h:1.107 Wed Jan 8 02:16:03 2014
+++ src/include/stdlib.h Sun Aug 10 07:03:53 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: stdlib.h,v 1.107 2014/01/08 02:16:03 christos Exp $ */
+/* $NetBSD: stdlib.h,v 1.107.2.1 2014/08/10 07:03:53 tls Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -174,12 +174,16 @@ int putenv(char *) __RENAME(__putenv50)
long a64l(const char *);
char *l64a(long);
-char *initstate(unsigned long, char *, size_t);
long random(void);
char *setstate(char *);
-void srandom(unsigned long);
+#ifndef __LIBC12_SOURCE__
+char *initstate(unsigned int, char *, size_t) __RENAME(__initstate60);
+void srandom(unsigned int) __RENAME(__srandom60);
+#endif
#ifdef _NETBSD_SOURCE
#define RANDOM_MAX 0x7fff /* (((long)1 31) - 1) */
+int mkostemp(char *, int);
+int mkostemps(char *, int, int);
#endif
char *mkdtemp(char *);
Index: src/include/unistd.h
diff -u src/include/unistd.h:1.140 src/include/unistd.h:1.140.2.1
--- src/include/unistd.h:1.140 Thu Jan 2 23:33:50 2014
+++ src/include/unistd.h Sun Aug 10 07:03:53 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: unistd.h,v 1.140 2014/01/02 23:33:50 christos Exp $ */
+/* $NetBSD: unistd.h,v 1.140.2.1 2014/08/10 07:03:53 tls Exp $ */
/*-
* Copyright (c) 1998, 1999, 2008 The NetBSD Foundation, Inc.
@@ -173,6 +173,7 @@ ssize_t readlink(const char * __restric
*/
#if (_POSIX_C_SOURCE - 0) =
