CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Wed Feb  1 07:55:08 UTC 2017

Modified Files:
src/sys/dev/usb [nick-nhusb]: if_otus.c if_zyd.c

Log Message:
Be more careful about malloc returning NULL


To generate a diff of this commit:
cvs rdiff -u -r1.25.6.9 -r1.25.6.10 src/sys/dev/usb/if_otus.c
cvs rdiff -u -r1.36.14.13 -r1.36.14.14 src/sys/dev/usb/if_zyd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/usb/if_otus.c
diff -u src/sys/dev/usb/if_otus.c:1.25.6.9 src/sys/dev/usb/if_otus.c:1.25.6.10
--- src/sys/dev/usb/if_otus.c:1.25.6.9	Mon Dec  5 10:55:18 2016
+++ src/sys/dev/usb/if_otus.c	Wed Feb  1 07:55:08 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_otus.c,v 1.25.6.9 2016/12/05 10:55:18 skrll Exp $	*/
+/*	$NetBSD: if_otus.c,v 1.25.6.10 2017/02/01 07:55:08 skrll Exp $	*/
 /*	$OpenBSD: if_otus.c,v 1.18 2010/08/27 17:08:00 jsg Exp $	*/
 
 /*-
@@ -23,7 +23,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_otus.c,v 1.25.6.9 2016/12/05 10:55:18 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_otus.c,v 1.25.6.10 2017/02/01 07:55:08 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -1493,7 +1493,7 @@ otus_node_alloc(struct ieee80211_node_ta
 	DPRINTFN(DBG_FN, DBG_NO_SC, "\n");
 
 	on = malloc(sizeof(*on), M_DEVBUF, M_NOWAIT | M_ZERO);
-	return >ni;
+	return on ? >ni : NULL;
 }
 
 Static int

Index: src/sys/dev/usb/if_zyd.c
diff -u src/sys/dev/usb/if_zyd.c:1.36.14.13 src/sys/dev/usb/if_zyd.c:1.36.14.14
--- src/sys/dev/usb/if_zyd.c:1.36.14.13	Sat Jan 28 12:12:19 2017
+++ src/sys/dev/usb/if_zyd.c	Wed Feb  1 07:55:08 2017
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $	*/
-/*	$NetBSD: if_zyd.c,v 1.36.14.13 2017/01/28 12:12:19 skrll Exp $	*/
+/*	$NetBSD: if_zyd.c,v 1.36.14.14 2017/02/01 07:55:08 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2006 by Damien Bergamini 
@@ -23,7 +23,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.36.14.13 2017/01/28 12:12:19 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.36.14.14 2017/02/01 07:55:08 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -672,8 +672,7 @@ zyd_node_alloc(struct ieee80211_node_tab
 	struct zyd_node *zn;
 
 	zn = malloc(sizeof(struct zyd_node), M_80211_NODE, M_NOWAIT | M_ZERO);
-
-	return >ni;
+	return zn ? >ni : NULL;
 }
 
 Static int

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Feb  1 07:50:03 UTC 2017

Modified Files:
src/sys/dev/pci: if_wm.c

Log Message:
 Linux and FreeBSD defines 0x10f5 as E1000_DEV_ID_ICH9_IGP_M_AMT. In reality,
This is not IGP but BM. Add new case to identify PHY type correctly on this
device. Fixes PR#51924 reported byJarle Greipsland.

 This change fix only for 0x10f5. Need more work to be the best.


To generate a diff of this commit:
cvs rdiff -u -r1.473 -r1.474 src/sys/dev/pci/if_wm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.473 src/sys/dev/pci/if_wm.c:1.474
--- src/sys/dev/pci/if_wm.c:1.473	Wed Feb  1 03:54:49 2017
+++ src/sys/dev/pci/if_wm.c	Wed Feb  1 07:50:03 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.473 2017/02/01 03:54:49 knakahara Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.474 2017/02/01 07:50:03 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -84,7 +84,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.473 2017/02/01 03:54:49 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.474 2017/02/01 07:50:03 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -8671,6 +8671,7 @@ wm_gmii_mediainit(struct wm_softc *sc, p
 		break;
 	case PCI_PRODUCT_INTEL_82801H_82567V_3:
 	case PCI_PRODUCT_INTEL_82801I_BM:
+	case PCI_PRODUCT_INTEL_82801I_IGP_M_AMT: /* Not IGP but BM */
 	case PCI_PRODUCT_INTEL_82801J_R_BM_LM:
 	case PCI_PRODUCT_INTEL_82801J_R_BM_LF:
 	case PCI_PRODUCT_INTEL_82801J_D_BM_LM:

CVS commit: src/sys/dev/mii

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Feb  1 05:46:42 UTC 2017

Modified Files:
src/sys/dev/mii: miidevs.h miidevs_data.h

Log Message:
regen.


To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.115 -r1.116 src/sys/dev/mii/miidevs_data.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/mii/miidevs.h
diff -u src/sys/dev/mii/miidevs.h:1.127 src/sys/dev/mii/miidevs.h:1.128
--- src/sys/dev/mii/miidevs.h:1.127	Fri Aug 14 01:26:38 2015
+++ src/sys/dev/mii/miidevs.h	Wed Feb  1 05:46:41 2017
@@ -1,10 +1,10 @@
-/*	$NetBSD: miidevs.h,v 1.127 2015/08/14 01:26:38 knakahara Exp $	*/
+/*	$NetBSD: miidevs.h,v 1.128 2017/02/01 05:46:41 msaitoh Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: miidevs,v 1.124 2015/08/14 01:23:17 knakahara Exp
+ *	NetBSD: miidevs,v 1.125 2017/02/01 05:46:21 msaitoh Exp
  */
 
 /*-
@@ -322,6 +322,8 @@
 #define	MII_STR_yyINTEL_I82562ET	"i82562ET 10/100 media interface"
 #define	MII_MODEL_yyINTEL_I82553	0x0035
 #define	MII_STR_yyINTEL_I82553	"i82553 10/100 media interface"
+#define	MII_MODEL_yyINTEL_IGP01E1000	0x0038
+#define	MII_STR_yyINTEL_IGP01E1000	"Intel IGP01E1000 Gigabit PHY"
 #define	MII_MODEL_yyINTEL_I82566	0x0039
 #define	MII_STR_yyINTEL_I82566	"i82566 10/100/1000 media interface"
 #define	MII_MODEL_INTEL_I82577	0x0005
@@ -330,13 +332,17 @@
 #define	MII_STR_INTEL_I82579	"i82579 10/100/1000 media interface"
 #define	MII_MODEL_INTEL_I217	0x000a
 #define	MII_STR_INTEL_I217	"i217 10/100/1000 media interface"
+#define	MII_MODEL_INTEL_I82580	0x003a
+#define	MII_STR_INTEL_I82580	"82580 10/100/1000 media interface"
+#define	MII_MODEL_INTEL_I350	0x003b
+#define	MII_STR_INTEL_I350	"I350 10/100/1000 media interface"
 #define	MII_MODEL_xxMARVELL_I210	0x
 #define	MII_STR_xxMARVELL_I210	"I210 10/100/1000 media interface"
 #define	MII_MODEL_xxMARVELL_I82563	0x000a
 #define	MII_STR_xxMARVELL_I82563	"i82563 10/100/1000 media interface"
+#define	MII_MODEL_ATHEROS_I82578	0x0004
+#define	MII_STR_ATHEROS_I82578	"Intel 82578 10/100/1000 media interface"
 
-#define	MII_MODEL_yyINTEL_IGP01E1000	0x0038
-#define	MII_STR_yyINTEL_IGP01E1000	"Intel IGP01E1000 Gigabit PHY"
 
 /* JMicron PHYs */
 #define	MII_MODEL_JMICRON_JMC250	0x0021
@@ -385,8 +391,12 @@
 #define	MII_STR_xxMARVELL_E1145	"Marvell 88E1145 Quad Gigabit PHY"
 #define	MII_MODEL_xxMARVELL_E6060	0x0010
 #define	MII_STR_xxMARVELL_E6060	"Marvell 88E6060 6-Port 10/100 Fast Ethernet Switch"
+#define	MII_MODEL_xxMARVELL_I347	0x001c
+#define	MII_STR_xxMARVELL_I347	"Intel I347-AT4 Gigabit PHY"
 #define	MII_MODEL_xxMARVELL_E1512	0x001d
 #define	MII_STR_xxMARVELL_E1512	"Marvell 88E1512 Gigabit PHY"
+#define	MII_MODEL_xxMARVELL_E1340M	0x001f
+#define	MII_STR_xxMARVELL_E1340M	"Marvell 88E1340 Gigabit PHY"
 #define	MII_MODEL_xxMARVELL_E1116	0x0021
 #define	MII_STR_xxMARVELL_E1116	"Marvell 88E1116 Gigabit PHY"
 #define	MII_MODEL_xxMARVELL_E1118	0x0022

Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.115 src/sys/dev/mii/miidevs_data.h:1.116
--- src/sys/dev/mii/miidevs_data.h:1.115	Fri Aug 14 01:26:38 2015
+++ src/sys/dev/mii/miidevs_data.h	Wed Feb  1 05:46:41 2017
@@ -1,10 +1,10 @@
-/*	$NetBSD: miidevs_data.h,v 1.115 2015/08/14 01:26:38 knakahara Exp $	*/
+/*	$NetBSD: miidevs_data.h,v 1.116 2017/02/01 05:46:41 msaitoh Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: miidevs,v 1.124 2015/08/14 01:23:17 knakahara Exp
+ *	NetBSD: miidevs,v 1.125 2017/02/01 05:46:21 msaitoh Exp
  */
 
 /*-
@@ -125,13 +125,16 @@ struct mii_knowndev mii_knowndevs[] = {
  { MII_OUI_yyINTEL, MII_MODEL_yyINTEL_I82562EM, MII_STR_yyINTEL_I82562EM },
  { MII_OUI_yyINTEL, MII_MODEL_yyINTEL_I82562ET, MII_STR_yyINTEL_I82562ET },
  { MII_OUI_yyINTEL, MII_MODEL_yyINTEL_I82553, MII_STR_yyINTEL_I82553 },
+ { MII_OUI_yyINTEL, MII_MODEL_yyINTEL_IGP01E1000, MII_STR_yyINTEL_IGP01E1000 },
  { MII_OUI_yyINTEL, MII_MODEL_yyINTEL_I82566, MII_STR_yyINTEL_I82566 },
  { MII_OUI_INTEL, MII_MODEL_INTEL_I82577, MII_STR_INTEL_I82577 },
  { MII_OUI_INTEL, MII_MODEL_INTEL_I82579, MII_STR_INTEL_I82579 },
  { MII_OUI_INTEL, MII_MODEL_INTEL_I217, MII_STR_INTEL_I217 },
+ { MII_OUI_INTEL, MII_MODEL_INTEL_I82580, MII_STR_INTEL_I82580 },
+ { MII_OUI_INTEL, MII_MODEL_INTEL_I350, MII_STR_INTEL_I350 },
  { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_I210, MII_STR_xxMARVELL_I210 },
  { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_I82563, MII_STR_xxMARVELL_I82563 },
- { MII_OUI_yyINTEL, MII_MODEL_yyINTEL_IGP01E1000, MII_STR_yyINTEL_IGP01E1000 },
+ { MII_OUI_ATHEROS, MII_MODEL_ATHEROS_I82578, MII_STR_ATHEROS_I82578 },
  { MII_OUI_JMICRON, MII_MODEL_JMICRON_JMC250, MII_STR_JMICRON_JMC250 },
  { MII_OUI_JMICRON, MII_MODEL_JMICRON_JMC260, MII_STR_JMICRON_JMC260 },
  { MII_OUI_xxLEVEL1, MII_MODEL_xxLEVEL1_LXT970, 

CVS commit: src/sys/dev/mii

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Feb  1 05:46:21 UTC 2017

Modified Files:
src/sys/dev/mii: miidevs

Log Message:
Add some Intel devices.


To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 src/sys/dev/mii/miidevs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/mii/miidevs
diff -u src/sys/dev/mii/miidevs:1.124 src/sys/dev/mii/miidevs:1.125
--- src/sys/dev/mii/miidevs:1.124	Fri Aug 14 01:23:17 2015
+++ src/sys/dev/mii/miidevs	Wed Feb  1 05:46:21 2017
@@ -1,4 +1,4 @@
-$NetBSD: miidevs,v 1.124 2015/08/14 01:23:17 knakahara Exp $
+$NetBSD: miidevs,v 1.125 2017/02/01 05:46:21 msaitoh Exp $
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -227,14 +227,17 @@ model yyINTEL I82562G		0x0031 i82562G 10
 model yyINTEL I82562EM		0x0032 i82562EM 10/100 media interface
 model yyINTEL I82562ET		0x0033 i82562ET 10/100 media interface
 model yyINTEL I82553		0x0035 i82553 10/100 media interface
+model yyINTEL IGP01E1000	0x0038 Intel IGP01E1000 Gigabit PHY
 model yyINTEL I82566		0x0039 i82566 10/100/1000 media interface
 model INTEL I82577		0x0005 i82577 10/100/1000 media interface
 model INTEL I82579		0x0009 i82579 10/100/1000 media interface
 model INTEL I217		0x000a i217 10/100/1000 media interface
+model INTEL I82580		0x003a 82580 10/100/1000 media interface
+model INTEL I350		0x003b I350 10/100/1000 media interface
 model xxMARVELL I210		0x I210 10/100/1000 media interface
 model xxMARVELL I82563		0x000a i82563 10/100/1000 media interface
+model ATHEROS I82578		0x0004 Intel 82578 10/100/1000 media interface
 
-model yyINTEL IGP01E1000	0x0038 Intel IGP01E1000 Gigabit PHY
 
 /* JMicron PHYs */
 model JMICRON JMC250		0x0021 JMC250 10/100/1000 media interface
@@ -262,7 +265,9 @@ model xxMARVELL E1149		0x000b Marvell 88
 model xxMARVELL E		0x000c Marvell 88E Gigabit PHY
 model xxMARVELL E1145		0x000d Marvell 88E1145 Quad Gigabit PHY
 model xxMARVELL E6060		0x0010 Marvell 88E6060 6-Port 10/100 Fast Ethernet Switch
+model xxMARVELL I347		0x001c Intel I347-AT4 Gigabit PHY
 model xxMARVELL E1512		0x001d Marvell 88E1512 Gigabit PHY
+model xxMARVELL E1340M		0x001f Marvell 88E1340 Gigabit PHY
 model xxMARVELL E1116		0x0021 Marvell 88E1116 Gigabit PHY
 model xxMARVELL E1118		0x0022 Marvell 88E1118 Gigabit PHY
 model xxMARVELL E1116R		0x0024 Marvell 88E1116R Gigabit PHY

CVS commit: src/sys/dev/pci

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Wed Feb  1 04:18:43 UTC 2017

Modified Files:
src/sys/dev/pci: if_wmreg.h

Log Message:
tabify


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/sys/dev/pci/if_wmreg.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/pci/if_wmreg.h
diff -u src/sys/dev/pci/if_wmreg.h:1.95 src/sys/dev/pci/if_wmreg.h:1.96
--- src/sys/dev/pci/if_wmreg.h:1.95	Mon Jan 16 00:09:06 2017
+++ src/sys/dev/pci/if_wmreg.h	Wed Feb  1 04:18:43 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wmreg.h,v 1.95 2017/01/16 00:09:06 knakahara Exp $	*/
+/*	$NetBSD: if_wmreg.h,v 1.96 2017/02/01 04:18:43 knakahara Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -127,21 +127,21 @@ typedef struct wiseman_rxdesc {
 
 /* extended RX descriptor for 82574 */
 typedef union ext_rxdesc {
-struct {
-uint64_t erxd_addr;	/* Packet Buffer Address */
-uint64_t erxd_dd;	/* 63:1 reserved, 0 DD */
-} erx_data;
-struct {
-uint32_t erxc_mrq;	/*
- * 31:13 reserved
- * 12:8 Rx queue associated with the packet
- * 7:4 reserved 3:0 RSS Type
- */
-uint32_t erxc_rsshash;	/* RSS Hash or {Fragment Checksum, IP identification } */
-uint32_t erxc_err_stat;	/* 31:20 Extended Error, 19:0 Extened Status */
-uint16_t erxc_pktlen;	/* PKT_LEN */
-uint16_t erxc_vlan;	/* VLAN Tag */
-} erx_ctx;
+	struct {
+		uint64_t erxd_addr;	/* Packet Buffer Address */
+		uint64_t erxd_dd;	/* 63:1 reserved, 0 DD */
+	} erx_data;
+	struct {
+		uint32_t erxc_mrq;	/*
+	 * 31:13 reserved
+	 * 12:8 Rx queue associated with the packet
+	 * 7:4 reserved 3:0 RSS Type
+	 */
+		uint32_t erxc_rsshash;	/* RSS Hash or {Fragment Checksum, IP identification } */
+		uint32_t erxc_err_stat;	/* 31:20 Extended Error, 19:0 Extened Status */
+		uint16_t erxc_pktlen;	/* PKT_LEN */
+		uint16_t erxc_vlan;	/* VLAN Tag */
+	} erx_ctx;
 } __packed ext_rxdesc_t;
 
 #define EXTRXD_DD_MASK		__BIT(0)
@@ -210,21 +210,21 @@ typedef union ext_rxdesc {
 
 /* advanced RX descriptor for 82575 and newer */
 typedef union nq_rxdesc {
-struct {
-uint64_t nrxd_paddr;	/* 63:1 Packet Buffer Address, 0 A0/NSE */
-uint64_t nrxd_haddr;	/* 63:1 HEader Buffer Address, 0 DD */
-} nqrx_data;
-struct {
-uint32_t nrxc_misc;	/*
- * 31: SPH, 30:21 HDR_LEN[9:0],
- * 20:19 HDR_LEN[11:10], 18:17 RSV,
- * 16:4 Packet Type 3:0 RSS Type
- */
-uint32_t nrxc_rsshash;	/* RSS Hash or {Fragment Checksum, IP identification } */
-uint32_t nrxc_err_stat;	/* 31:20 Extended Error, 19:0 Extened Status */
-uint16_t nrxc_pktlen;	/* PKT_LEN */
-uint16_t nrxc_vlan;	/* VLAN Tag */
-} nqrx_ctx;
+	struct {
+		uint64_t nrxd_paddr;	/* 63:1 Packet Buffer Address, 0 A0/NSE */
+		uint64_t nrxd_haddr;	/* 63:1 HEader Buffer Address, 0 DD */
+	} nqrx_data;
+	struct {
+		uint32_t nrxc_misc;	/*
+	 * 31: SPH, 30:21 HDR_LEN[9:0],
+	 * 20:19 HDR_LEN[11:10], 18:17 RSV,
+	 * 16:4 Packet Type 3:0 RSS Type
+	 */
+		uint32_t nrxc_rsshash;	/* RSS Hash or {Fragment Checksum, IP identification } */
+		uint32_t nrxc_err_stat;	/* 31:20 Extended Error, 19:0 Extened Status */
+		uint16_t nrxc_pktlen;	/* PKT_LEN */
+		uint16_t nrxc_vlan;	/* VLAN Tag */
+	} nqrx_ctx;
 } __packed nq_rxdesc_t;
 
 /* for nrxd_paddr macros */

CVS commit: src/sys/dev/pci

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Wed Feb  1 03:54:49 UTC 2017

Modified Files:
src/sys/dev/pci: if_wm.c

Log Message:
fix: wm(4) Rx descriptor is corrupted under high rate.

don't write descriptor which is not set DD bit.


To generate a diff of this commit:
cvs rdiff -u -r1.472 -r1.473 src/sys/dev/pci/if_wm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.472 src/sys/dev/pci/if_wm.c:1.473
--- src/sys/dev/pci/if_wm.c:1.472	Tue Jan 31 03:06:06 2017
+++ src/sys/dev/pci/if_wm.c	Wed Feb  1 03:54:49 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.472 2017/01/31 03:06:06 knakahara Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.473 2017/02/01 03:54:49 knakahara Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -84,7 +84,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.472 2017/01/31 03:06:06 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.473 2017/02/01 03:54:49 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -7626,18 +7626,6 @@ wm_rxdesc_dd(struct wm_rxqueue *rxq, int
 	if (!wm_rxdesc_is_set_status(sc, status, WRX_ST_DD, EXTRXC_STATUS_DD,
 		NQRXC_STATUS_DD)) {
 		/* We have processed all of the receive descriptors. */
-		struct wm_rxsoft *rxs = >rxq_soft[idx];
-
-		if (sc->sc_type == WM_T_82574) {
-			rxq->rxq_ext_descs[idx].erx_data.erxd_addr =
-htole64(rxs->rxs_dmamap->dm_segs[0].ds_addr
-+ sc->sc_align_tweak);
-		} else if ((sc->sc_flags & WM_F_NEWQUEUE) != 0) {
-			rxq->rxq_nq_descs[idx].nqrx_data.nrxd_paddr =
-htole64(rxs->rxs_dmamap->dm_segs[0].ds_addr
-+ sc->sc_align_tweak);
-		}
-
 		wm_cdrxsync(rxq, idx, BUS_DMASYNC_PREREAD);
 		return false;
 	}

CVS commit: src/sys/dev/pci

[NONAKA Kimihiro]

Module Name:src
Committed By:   nonaka
Date:   Wed Feb  1 03:00:41 UTC 2017

Modified Files:
src/sys/dev/pci: if_ipw.c

Log Message:
sync only mapped size.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/pci/if_ipw.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/pci/if_ipw.c
diff -u src/sys/dev/pci/if_ipw.c:1.61 src/sys/dev/pci/if_ipw.c:1.62
--- src/sys/dev/pci/if_ipw.c:1.61	Thu Dec  8 01:12:01 2016
+++ src/sys/dev/pci/if_ipw.c	Wed Feb  1 03:00:41 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ipw.c,v 1.61 2016/12/08 01:12:01 ozaki-r Exp $	*/
+/*	$NetBSD: if_ipw.c,v 1.62 2017/02/01 03:00:41 nonaka Exp $	*/
 /*	FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.15 2005/11/13 17:17:40 damien Exp 	*/
 
 /*-
@@ -29,7 +29,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.61 2016/12/08 01:12:01 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.62 2017/02/01 03:00:41 nonaka Exp $");
 
 /*-
  * Intel(R) PRO/Wireless 2100 MiniPCI driver
@@ -1176,7 +1176,7 @@ ipw_release_sbd(struct ipw_softc *sc, st
 		sbuf = sbd->priv;
 
 		bus_dmamap_sync(sc->sc_dmat, sbuf->map,
-		0, MCLBYTES, BUS_DMASYNC_POSTWRITE);
+		0, sbuf->map->dm_mapsize, BUS_DMASYNC_POSTWRITE);
 		bus_dmamap_unload(sc->sc_dmat, sbuf->map);
 		m_freem(sbuf->m);
 		if (sbuf->ni != NULL)
@@ -1452,7 +1452,7 @@ ipw_tx_start(struct ifnet *ifp, struct m
 	bus_dmamap_sync(sc->sc_dmat, sc->hdr_map, shdr->offset,
 	sizeof (struct ipw_hdr), BUS_DMASYNC_PREWRITE);
 
-	bus_dmamap_sync(sc->sc_dmat, sbuf->map, 0, MCLBYTES,
+	bus_dmamap_sync(sc->sc_dmat, sbuf->map, 0, sbuf->map->dm_mapsize,
 	BUS_DMASYNC_PREWRITE);
 
 	/* Inform firmware about this new packet */

CVS commit: src/sys/dev/ic

[NONAKA Kimihiro]

Module Name:src
Committed By:   nonaka
Date:   Wed Feb  1 02:37:43 UTC 2017

Modified Files:
src/sys/dev/ic: wi.c

Log Message:
Added missing splx(s).


To generate a diff of this commit:
cvs rdiff -u -r1.240 -r1.241 src/sys/dev/ic/wi.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/ic/wi.c
diff -u src/sys/dev/ic/wi.c:1.240 src/sys/dev/ic/wi.c:1.241
--- src/sys/dev/ic/wi.c:1.240	Fri Jun 10 13:27:14 2016
+++ src/sys/dev/ic/wi.c	Wed Feb  1 02:37:43 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: wi.c,v 1.240 2016/06/10 13:27:14 ozaki-r Exp $	*/
+/*	$NetBSD: wi.c,v 1.241 2017/02/01 02:37:43 nonaka Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -99,7 +99,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.240 2016/06/10 13:27:14 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.241 2017/02/01 02:37:43 nonaka Exp $");
 
 #define WI_HERMES_AUTOINC_WAR	/* Work around data write autoinc bug. */
 #define WI_HERMES_STATS_WAR	/* Work around stats counter bug. */
@@ -1366,8 +1366,10 @@ wi_ioctl(struct ifnet *ifp, u_long cmd, 
 
 	s = splnet();
 
-	if ((error = wi_ioctl_enter(sc)) != 0)
+	if ((error = wi_ioctl_enter(sc)) != 0) {
+		splx(s);
 		return error;
+	}
 
 	switch (cmd) {
 	case SIOCSIFFLAGS:

CVS commit: src/sys/kern

[Maya Rashish]

Module Name:src
Committed By:   maya
Date:   Wed Feb  1 01:51:07 UTC 2017

Modified Files:
src/sys/kern: kern_module.c

Log Message:
restore r1.118


To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/sys/kern/kern_module.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/kern/kern_module.c
diff -u src/sys/kern/kern_module.c:1.119 src/sys/kern/kern_module.c:1.120
--- src/sys/kern/kern_module.c:1.119	Tue Dec 27 09:34:44 2016
+++ src/sys/kern/kern_module.c	Wed Feb  1 01:51:07 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_module.c,v 1.119 2016/12/27 09:34:44 maya Exp $	*/
+/*	$NetBSD: kern_module.c,v 1.120 2017/02/01 01:51:07 maya Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.119 2016/12/27 09:34:44 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.120 2017/02/01 01:51:07 maya Exp $");
 
 #define _MODULE_INTERNAL
 
@@ -570,20 +570,31 @@ int
 module_load(const char *filename, int flags, prop_dictionary_t props,
 	modclass_t modclass)
 {
+	module_t *mod;
 	int error;
 
+	/* Test if we already have the module loaded before
+	 * authorizing so we have the opportunity to return EEXIST. */
+	kernconfig_lock();
+	mod = module_lookup(filename);
+	if (mod != NULL) {
+		module_print("%s module `%s' already loaded",
+		"requested", filename);
+		error = EEXIST;
+		goto out;
+	}
+
 	/* Authorize. */
 	error = kauth_authorize_system(kauth_cred_get(), KAUTH_SYSTEM_MODULE,
 	0, (void *)(uintptr_t)MODCTL_LOAD, NULL, NULL);
-	if (error != 0) {
-		return error;
-	}
+	if (error != 0)
+		goto out;
 
-	kernconfig_lock();
 	error = module_do_load(filename, false, flags, props, NULL, modclass,
 	false);
-	kernconfig_unlock();
 
+out:
+	kernconfig_unlock();
 	return error;
 }
 

CVS commit: src/distrib/sets/lists/comp

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Feb  1 01:23:18 UTC 2017

Modified Files:
src/distrib/sets/lists/comp: mi

Log Message:
one more include file


To generate a diff of this commit:
cvs rdiff -u -r1.2105 -r1.2106 src/distrib/sets/lists/comp/mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2105 src/distrib/sets/lists/comp/mi:1.2106
--- src/distrib/sets/lists/comp/mi:1.2105	Tue Jan 31 18:55:03 2017
+++ src/distrib/sets/lists/comp/mi	Tue Jan 31 20:23:17 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2105 2017/01/31 23:55:03 christos Exp $
+#	$NetBSD: mi,v 1.2106 2017/02/01 01:23:17 christos Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.compcomp-sys-root
@@ -805,6 +805,7 @@
 ./usr/include/event2/tag_compat.h		comp-c-include
 ./usr/include/event2/thread.h			comp-c-include
 ./usr/include/event2/util.h			comp-c-include
+./usr/include/event2/visibility.h		comp-c-include
 ./usr/include/evhttp.hcomp-c-include
 ./usr/include/evrpc.hcomp-c-include
 ./usr/include/evutil.hcomp-c-include

CVS commit: src/external/bsd/libevent/include

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Feb  1 01:22:39 UTC 2017

Modified Files:
src/external/bsd/libevent/include: Makefile

Log Message:
need visibility.h


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libevent/include/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/libevent/include/Makefile
diff -u src/external/bsd/libevent/include/Makefile:1.2 src/external/bsd/libevent/include/Makefile:1.3
--- src/external/bsd/libevent/include/Makefile:1.2	Thu Apr 11 12:55:51 2013
+++ src/external/bsd/libevent/include/Makefile	Tue Jan 31 20:22:39 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2013/04/11 16:55:51 christos Exp $
+#	$NetBSD: Makefile,v 1.3 2017/02/01 01:22:39 christos Exp $
 
 .include 
 
@@ -33,6 +33,7 @@ event2/rpc_struct.h \
 event2/tag.h \
 event2/tag_compat.h \
 event2/thread.h \
-event2/util.h
+event2/util.h \
+event2/visibility.h
 
 .include 

CVS commit: src/external/bsd/libevent/include/event2

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Feb  1 01:15:34 UTC 2017

Modified Files:
src/external/bsd/libevent/include/event2: event-config.h

Log Message:
fix non _LP64


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/libevent/include/event2/event-config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/libevent/include/event2/event-config.h
diff -u src/external/bsd/libevent/include/event2/event-config.h:1.3 src/external/bsd/libevent/include/event2/event-config.h:1.4
--- src/external/bsd/libevent/include/event2/event-config.h:1.3	Tue Jan 31 18:17:40 2017
+++ src/external/bsd/libevent/include/event2/event-config.h	Tue Jan 31 20:15:34 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: event-config.h,v 1.3 2017/01/31 23:17:40 christos Exp $	*/
+/*	$NetBSD: event-config.h,v 1.4 2017/02/01 01:15:34 christos Exp $	*/
 /* event2/event-config.h
  *
  * This file was generated by autoconf when libevent was built, and post-
@@ -447,7 +447,11 @@
 #define EVENT__SIZEOF_INT 4
 
 /* The size of `long', as computed by sizeof. */
+#ifdef _LP64
 #define EVENT__SIZEOF_LONG 8
+#else
+#define EVENT__SIZEOF_LONG 4
+#endif
 
 /* The size of `long long', as computed by sizeof. */
 #define EVENT__SIZEOF_LONG_LONG 8
@@ -456,16 +460,28 @@
 #define EVENT__SIZEOF_OFF_T 8
 
 /* The size of `pthread_t', as computed by sizeof. */
+#ifdef _LP64
 #define EVENT__SIZEOF_PTHREAD_T 8
+#else
+#define EVENT__SIZEOF_PTHREAD_T 4
+#endif
 
 /* The size of `short', as computed by sizeof. */
 #define EVENT__SIZEOF_SHORT 2
 
 /* The size of `size_t', as computed by sizeof. */
+#ifdef _LP64
 #define EVENT__SIZEOF_SIZE_T 8
+#else
+#define EVENT__SIZEOF_SIZE_T 4
+#endif
 
 /* The size of `void *', as computed by sizeof. */
+#ifdef _LP64
 #define EVENT__SIZEOF_VOID_P 8
+#else
+#define EVENT__SIZEOF_VOID_P 4
+#endif
 
 /* Define to 1 if you have the ANSI C header files. */
 #define EVENT__STDC_HEADERS 1

CVS commit: src/tests/lib/libevent

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Feb  1 00:47:56 UTC 2017

Modified Files:
src/tests/lib/libevent: Makefile

Log Message:
add extra file.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libevent/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/lib/libevent/Makefile
diff -u src/tests/lib/libevent/Makefile:1.2 src/tests/lib/libevent/Makefile:1.3
--- src/tests/lib/libevent/Makefile:1.2	Thu Apr 11 13:00:12 2013
+++ src/tests/lib/libevent/Makefile	Tue Jan 31 19:47:56 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/04/11 17:00:12 christos Exp $
+# $NetBSD: Makefile,v 1.3 2017/02/01 00:47:56 christos Exp $
 
 TESTSDIR=	${TESTSBASE}/lib/libevent
 
@@ -17,7 +17,7 @@ SRCS=		regress.c regress.gen.c regress_d
 		regress_rpc.c regress_main.c tinytest.c regress_testutils.c \
 		regress_minheap.c regress_util.c regress_thread.c \
 		regress_buffer.c regress_bufferevent.c regress_listener.c \
-		regress_zlib.c regress_et.c
+		regress_zlib.c regress_et.c regress_finalize.c
 
 .if ${MKCRYPTO} == "yes"
 SRCS+=		regress_ssl.c

CVS commit: src/distrib/sets/lists/comp

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan 31 23:55:03 UTC 2017

Modified Files:
src/distrib/sets/lists/comp: mi

Log Message:
add more man pages


To generate a diff of this commit:
cvs rdiff -u -r1.2104 -r1.2105 src/distrib/sets/lists/comp/mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2104 src/distrib/sets/lists/comp/mi:1.2105
--- src/distrib/sets/lists/comp/mi:1.2104	Tue Jan 24 18:27:52 2017
+++ src/distrib/sets/lists/comp/mi	Tue Jan 31 18:55:03 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2104 2017/01/24 23:27:52 christos Exp $
+#	$NetBSD: mi,v 1.2105 2017/01/31 23:55:03 christos Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.compcomp-sys-root
@@ -5477,6 +5477,7 @@
 ./usr/share/man/cat3/btree.0			comp-c-catman		.cat
 ./usr/share/man/cat3/buffer.0			comp-obsolete		obsolete
 ./usr/share/man/cat3/bufferevent.0		comp-c-catman		.cat
+./usr/share/man/cat3/bufferevent.h.0		comp-c-catman		.cat
 ./usr/share/man/cat3/bufferevent_base_set.0	comp-obsolete		obsolete
 ./usr/share/man/cat3/bufferevent_disable.0	comp-obsolete		obsolete
 ./usr/share/man/cat3/bufferevent_enable.0	comp-obsolete		obsolete
@@ -6258,6 +6259,7 @@
 ./usr/share/man/cat3/evdns_set_log_fn.0		comp-obsolete		obsolete
 ./usr/share/man/cat3/evdns_shutdown.0		comp-obsolete		obsolete
 ./usr/share/man/cat3/event.0			comp-c-catman		.cat
+./usr/share/man/cat3/event.h.0			comp-c-catman		.cat
 ./usr/share/man/cat3/event_add.0		comp-obsolete		obsolete
 ./usr/share/man/cat3/event_base.0		comp-c-catman		.cat
 ./usr/share/man/cat3/event_base_dispatch.0	comp-obsolete		obsolete
@@ -6298,6 +6300,7 @@
 ./usr/share/man/cat3/evtimer_set.0		comp-obsolete		obsolete
 ./usr/share/man/cat3/evutil.0			comp-c-catman		.cat
 ./usr/share/man/cat3/evutil_addrinfo.0		comp-c-catman		.cat
+./usr/share/man/cat3/evutil_monotonic_timer.0	comp-c-catman		.cat
 ./usr/share/man/cat3/exec.0			comp-c-catman		.cat
 ./usr/share/man/cat3/execl.0			comp-c-catman		.cat
 ./usr/share/man/cat3/execle.0			comp-c-catman		.cat
@@ -12932,6 +12935,7 @@
 ./usr/share/man/html3/btowc.html		comp-c-htmlman		html
 ./usr/share/man/html3/btree.html		comp-c-htmlman		html
 ./usr/share/man/html3/bufferevent.html		comp-c-htmlman		html
+./usr/share/man/html3/bufferevent.h.html	comp-c-htmlman		html
 ./usr/share/man/html3/bufferevent_base_set.html comp-obsolete		obsolete
 ./usr/share/man/html3/bufferevent_disable.html	comp-obsolete		obsolete
 ./usr/share/man/html3/bufferevent_enable.html	comp-obsolete		obsolete
@@ -13668,6 +13672,7 @@
 ./usr/share/man/html3/evdns_set_log_fn.html	comp-obsolete		obsolete
 ./usr/share/man/html3/evdns_shutdown.html	comp-obsolete		obsolete
 ./usr/share/man/html3/event.html			comp-c-htmlman		html
+./usr/share/man/html3/event.h.html			comp-c-htmlman		html
 ./usr/share/man/html3/event_add.html		comp-obsolete		obsolete
 ./usr/share/man/html3/event_base.html		comp-c-htmlman		html
 ./usr/share/man/html3/event_base_dispatch.html	comp-obsolete		obsolete
@@ -13708,6 +13713,7 @@
 ./usr/share/man/html3/evtimer_set.html		comp-obsolete		obsolete
 ./usr/share/man/html3/evutil.html		comp-c-htmlman		html
 ./usr/share/man/html3/evutil_addrinfo.html	comp-c-htmlman		html
+./usr/share/man/html3/evutil_monotonic_timer.html	comp-c-htmlman		html
 ./usr/share/man/html3/exec.html			comp-c-htmlman		html
 ./usr/share/man/html3/execl.html		comp-c-htmlman		html
 ./usr/share/man/html3/execle.html		comp-c-htmlman		html
@@ -20208,6 +20214,7 @@
 ./usr/share/man/man3/btree.3			comp-c-man		.man
 ./usr/share/man/man3/buffer.3			comp-obsolete		obsolete
 ./usr/share/man/man3/bufferevent.3		comp-c-man		.man
+./usr/share/man/man3/bufferevent.h.3		comp-c-man		.man
 ./usr/share/man/man3/bufferevent_base_set.3	comp-obsolete		obsolete
 ./usr/share/man/man3/bufferevent_disable.3	comp-obsolete		obsolete
 ./usr/share/man/man3/bufferevent_enable.3	comp-obsolete		obsolete
@@ -20989,6 +20996,7 @@
 ./usr/share/man/man3/evdns_set_log_fn.3		comp-obsolete		obsolete
 ./usr/share/man/man3/evdns_shutdown.3		comp-obsolete		obsolete
 ./usr/share/man/man3/event.3			comp-c-man		.man
+./usr/share/man/man3/event.h.3			comp-c-man		.man
 ./usr/share/man/man3/event_add.3		comp-obsolete		obsolete
 ./usr/share/man/man3/event_base.3		comp-c-man		.man
 ./usr/share/man/man3/event_base_dispatch.3	comp-obsolete		obsolete
@@ -21029,6 +21037,7 @@
 ./usr/share/man/man3/evtimer_set.3		comp-obsolete		obsolete
 ./usr/share/man/man3/evutil.3			comp-c-man		.man
 ./usr/share/man/man3/evutil_addrinfo.3		comp-c-man		.man
+./usr/share/man/man3/evutil_monotonic_timer.3		comp-c-man		.man
 ./usr/share/man/man3/exec.3			comp-c-man		.man
 ./usr/share/man/man3/execl.3			comp-c-man		.man
 ./usr/share/man/man3/execle.3			comp-c-man		.man

CVS commit: src/doc

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan 31 23:56:41 UTC 2017

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new libevent


To generate a diff of this commit:
cvs rdiff -u -r1.1405 -r1.1406 src/doc/3RDPARTY
cvs rdiff -u -r1.2241 -r1.2242 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1405 src/doc/3RDPARTY:1.1406
--- src/doc/3RDPARTY:1.1405	Mon Jan 30 15:39:36 2017
+++ src/doc/3RDPARTY	Tue Jan 31 18:56:41 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1405 2017/01/30 20:39:36 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1406 2017/01/31 23:56:41 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -736,8 +736,8 @@ The lvm2tools and the libdevmapper are n
 repository. See the lvm2tools Notes for more information.
 
 Package:	libevent
-Version:	2.0.22-stable
-Current Vers:	2.0.22-stable
+Version:	2.1.18-stable
+Current Vers:	2.1.18-stable
 Maintainer:	Niels Provos 
 Archive Site:	http://www.monkey.org/~provos/libevent/
 Home Page:	http://www.monkey.org/~provos/libevent/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2241 src/doc/CHANGES:1.2242
--- src/doc/CHANGES:1.2241	Sat Jan 28 16:47:24 2017
+++ src/doc/CHANGES	Tue Jan 31 18:56:41 2017
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2241 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2242 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -457,3 +457,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 	acpi(4): Updated ACPICA to 20170119. [christos 20170125]
 	bta2dpd(8): Add new bluetooth A2DP daemon. [nat 20170129]
 	kerberos(8): Update to latest Heimdal-HEAD [christos 20170128]
+	libevent: Import libevent 2.1.18 [christos 20160131]

CVS commit: src/distrib/sets/lists

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan 31 23:19:21 UTC 2017

Modified Files:
src/distrib/sets/lists/base: shl.mi
src/distrib/sets/lists/debug: shl.mi

Log Message:
update for libevent


To generate a diff of this commit:
cvs rdiff -u -r1.798 -r1.799 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.157 -r1.158 src/distrib/sets/lists/debug/shl.mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.798 src/distrib/sets/lists/base/shl.mi:1.799
--- src/distrib/sets/lists/base/shl.mi:1.798	Sat Jan 28 16:42:41 2017
+++ src/distrib/sets/lists/base/shl.mi	Tue Jan 31 18:19:20 2017
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.798 2017/01/28 21:42:41 christos Exp $
+# $NetBSD: shl.mi,v 1.799 2017/01/31 23:19:20 christos Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -36,7 +36,7 @@
 ./lib/libedit.so.3.1base-sys-shlib		dynamicroot
 ./lib/libevent.sobase-sys-shlib		dynamicroot
 ./lib/libevent.so.4base-sys-shlib		dynamicroot
-./lib/libevent.so.4.0base-sys-shlib		dynamicroot
+./lib/libevent.so.4.1base-sys-shlib		dynamicroot
 ./lib/libgcc_s.sobase-sys-shlib		dynamicroot,gcc
 ./lib/libgcc_s.so.1base-sys-shlib		dynamicroot,gcc
 ./lib/libgcc_s.so.1.0base-sys-shlib		dynamicroot,gcc
@@ -267,13 +267,13 @@
 ./usr/lib/libelf.so.2.0base-sys-shlib		compatfile
 ./usr/lib/libevent.sobase-sys-shlib		compatfile
 ./usr/lib/libevent.so.4base-sys-shlib		compatfile
-./usr/lib/libevent.so.4.0			base-sys-shlib		compatfile
+./usr/lib/libevent.so.4.1			base-sys-shlib		compatfile
 ./usr/lib/libevent_openssl.so			base-sys-shlib		compatfile,crypto
 ./usr/lib/libevent_openssl.so.4			base-sys-shlib		compatfile,crypto
-./usr/lib/libevent_openssl.so.4.0		base-sys-shlib		compatfile,crypto
+./usr/lib/libevent_openssl.so.4.1		base-sys-shlib		compatfile,crypto
 ./usr/lib/libevent_pthreads.so			base-sys-shlib		compatfile
 ./usr/lib/libevent_pthreads.so.4		base-sys-shlib		compatfile
-./usr/lib/libevent_pthreads.so.4.0		base-sys-shlib		compatfile
+./usr/lib/libevent_pthreads.so.4.1		base-sys-shlib		compatfile
 ./usr/lib/libexecinfo.so			base-sys-shlib		compatfile
 ./usr/lib/libexecinfo.so.0			base-sys-shlib		compatfile
 ./usr/lib/libexecinfo.so.0.0			base-sys-shlib		compatfile

Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.157 src/distrib/sets/lists/debug/shl.mi:1.158
--- src/distrib/sets/lists/debug/shl.mi:1.157	Sat Jan 28 16:42:41 2017
+++ src/distrib/sets/lists/debug/shl.mi	Tue Jan 31 18:19:20 2017
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.157 2017/01/28 21:42:41 christos Exp $
+# $NetBSD: shl.mi,v 1.158 2017/01/31 23:19:20 christos Exp $
 ./usr/libdata/debug/lib		base-sys-usr	debug,dynamicroot,compatdir
 ./usr/libdata/debug/lib/libblacklist.so.0.0.debug		comp-sys-debug	debug,dynamicroot
 ./usr/libdata/debug/lib/libc.so.12.205.debug			comp-sys-debug	debug,dynamicroot
@@ -7,7 +7,7 @@
 ./usr/libdata/debug/lib/libdevmapper.so.1.0.debug		comp-sys-debug	debug,dynamicroot
 ./usr/libdata/debug/lib/libdm.so.0.0.debug 			comp-sys-debug	debug,dynamicroot
 ./usr/libdata/debug/lib/libedit.so.3.1.debug			comp-sys-debug	debug,dynamicroot
-./usr/libdata/debug/lib/libevent.so.4.0.debug			comp-sys-debug	debug,dynamicroot
+./usr/libdata/debug/lib/libevent.so.4.1.debug			comp-sys-debug	debug,dynamicroot
 ./usr/libdata/debug/lib/libgcc_s.so.1.0.debug			comp-sys-debug	debug,dynamicroot,gcc
 ./usr/libdata/debug/lib/libipsec.so.3.0.debug			comp-sys-debug	debug,dynamicroot
 ./usr/libdata/debug/lib/libkvm.so.6.0.debug			comp-sys-debug	debug,dynamicroot
@@ -88,9 +88,9 @@
 ./usr/libdata/debug/usr/lib/libdwarf.so.2.0.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libedit.so.3.1.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libelf.so.2.0.debug			comp-sys-debug	debug,compatfile
-./usr/libdata/debug/usr/lib/libevent.so.4.0.debug		comp-sys-debug	debug,compatfile
-./usr/libdata/debug/usr/lib/libevent_openssl.so.4.0.debug	comp-sys-debug	debug,compatfile,crypto
-./usr/libdata/debug/usr/lib/libevent_pthreads.so.4.0.debug	comp-sys-debug	debug,compatfile
+./usr/libdata/debug/usr/lib/libevent.so.4.1.debug		comp-sys-debug	debug,compatfile
+./usr/libdata/debug/usr/lib/libevent_openssl.so.4.1.debug	comp-sys-debug	debug,compatfile,crypto
+./usr/libdata/debug/usr/lib/libevent_pthreads.so.4.1.debug	comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libexecinfo.so.0.0.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libexpat.so.2.3.debug		comp-sys-debug	debug,compatfile
 ./usr/libdata/debug/usr/lib/libfetch.so.3.0.debug		comp-sys-debug	debug,compatfile

CVS commit: src/external/bsd/libevent

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan 31 23:17:40 UTC 2017

Modified Files:
src/external/bsd/libevent: Makefile.inc
src/external/bsd/libevent/dist: Doxyfile buffer.c
bufferevent-internal.h bufferevent.c bufferevent_ratelim.c
evbuffer-internal.h evdns.c event-internal.h event.c
event_tagging.c evmap.c evrpc.c evthread-internal.h evutil.c
evutil_rand.c ht-internal.h http.c log-internal.h log.c ltmain.sh
minheap-internal.h ratelim-internal.h select.c util-internal.h
src/external/bsd/libevent/dist/include/event2: rpc.h util.h
src/external/bsd/libevent/dist/test: regress.c regress.h
regress_buffer.c regress_bufferevent.c regress_dns.c regress_et.c
regress_http.c regress_listener.c regress_main.c regress_rpc.c
regress_ssl.c regress_thread.c regress_util.c regress_zlib.c
tinytest_macros.h
src/external/bsd/libevent/include/event2: event-config.h
src/external/bsd/libevent/lib/libevent: Makefile
Added Files:
src/external/bsd/libevent/include: config.h evconfig-private.h
Removed Files:
src/external/bsd/libevent/dist: README configure.in evdns.h event.h
evhttp.h evrpc.h evutil.h
src/external/bsd/libevent/dist/WIN32-Code/event2: event-config.h
src/external/bsd/libevent/dist/include: Makefile.am Makefile.in
src/external/bsd/libevent/dist/sample: Makefile.am Makefile.in
event-test.c
src/external/bsd/libevent/dist/test: Makefile.am Makefile.in
src/external/bsd/libevent/include: event-config.h

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libevent/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libevent/dist/Doxyfile \
src/external/bsd/libevent/dist/bufferevent-internal.h \
src/external/bsd/libevent/dist/bufferevent_ratelim.c \
src/external/bsd/libevent/dist/event-internal.h \
src/external/bsd/libevent/dist/evmap.c \
src/external/bsd/libevent/dist/evthread-internal.h \
src/external/bsd/libevent/dist/ht-internal.h \
src/external/bsd/libevent/dist/ltmain.sh \
src/external/bsd/libevent/dist/minheap-internal.h \
src/external/bsd/libevent/dist/ratelim-internal.h \
src/external/bsd/libevent/dist/select.c
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/libevent/dist/README \
src/external/bsd/libevent/dist/evdns.h \
src/external/bsd/libevent/dist/event.h \
src/external/bsd/libevent/dist/evhttp.h \
src/external/bsd/libevent/dist/evrpc.h \
src/external/bsd/libevent/dist/evutil.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libevent/dist/buffer.c \
src/external/bsd/libevent/dist/bufferevent.c \
src/external/bsd/libevent/dist/evbuffer-internal.h \
src/external/bsd/libevent/dist/evdns.c \
src/external/bsd/libevent/dist/event.c \
src/external/bsd/libevent/dist/event_tagging.c \
src/external/bsd/libevent/dist/evrpc.c \
src/external/bsd/libevent/dist/http.c \
src/external/bsd/libevent/dist/util-internal.h
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/libevent/dist/configure.in
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libevent/dist/evutil.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libevent/dist/evutil_rand.c \
src/external/bsd/libevent/dist/log-internal.h \
src/external/bsd/libevent/dist/log.c
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/libevent/dist/WIN32-Code/event2/event-config.h
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/libevent/dist/include/Makefile.am
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/libevent/dist/include/Makefile.in
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libevent/dist/include/event2/rpc.h \
src/external/bsd/libevent/dist/include/event2/util.h
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/libevent/dist/sample/Makefile.am \
src/external/bsd/libevent/dist/sample/event-test.c
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/libevent/dist/sample/Makefile.in
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/libevent/dist/test/Makefile.am \
src/external/bsd/libevent/dist/test/Makefile.in
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/libevent/dist/test/regress.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/libevent/dist/test/regress.h \
src/external/bsd/libevent/dist/test/regress_buffer.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/libevent/dist/test/regress_bufferevent.c \
src/external/bsd/libevent/dist/test/regress_et.c \
src/external/bsd/libevent/dist/test/regress_listener.c \
src/external/bsd/libevent/dist/test/regress_main.c \
src/external/bsd/libevent/dist/test/regress_ssl.c \
src/external/bsd/libevent/dist/test/regress_util.c \
src/external/bsd/libevent/dist/test/regress_zlib.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libevent/dist/test/regress_dns.c \
src/external/bsd/libevent/dist/test/regress_http.c \
src/external/bsd/libevent/dist/test/regress_thread.c

CVS commit: src/external/bsd/openresolv/dist

[Abhinav Upadhyay]

Module Name:src
Committed By:   abhinav
Date:   Tue Jan 31 21:25:59 UTC 2017

Modified Files:
src/external/bsd/openresolv/dist: resolvconf.conf.5.in

Log Message:
Fix spelling of exclusive.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 \
src/external/bsd/openresolv/dist/resolvconf.conf.5.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/openresolv/dist/resolvconf.conf.5.in
diff -u src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.17 src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.18
--- src/external/bsd/openresolv/dist/resolvconf.conf.5.in:1.17	Fri Dec 30 19:43:36 2016
+++ src/external/bsd/openresolv/dist/resolvconf.conf.5.in	Tue Jan 31 21:25:58 2017
@@ -70,7 +70,7 @@ These interfaces will be processed next,
 If unset, defaults to the following:-
 .D1 tap[0-9]* tun[0-9]* vpn vpn[0-9]* ppp[0-9]* ippp[0-9]*
 .It Sy inclusive_interfaces
-Ignore any exlcusive marking for these interfaces.
+Ignore any exclusive marking for these interfaces.
 This is handy when 3rd party integrations force the
 .Nm resolvconf -x
 option and you want to disable it easily.

CVS import: src/external/bsd/libevent/dist

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan 31 21:14:54 UTC 2017

Update of /cvsroot/src/external/bsd/libevent/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv16237

Log Message:
Changes in version 2.1.8-stable (22 January 2017)

 Libevent 2.1.8-stable, it contains openssl fixes for resetting fd and using
 bufferevent_openssl_filter_new(). vagrant fixes, some build fixes, increased
 timeout for some tests (to reduce number of failures due to timing issues),
 date in RFC1123 format and running tests in parallel.

 There are highlighted changes above.

 Build fixes:
  o Fix _FILE_OFFSET_BITS redinition (solaris/autotools) (336f3b11 Azat Khuzhin)
  o util-internal: fix __func__ redefinition (netbsd) (253e7fa9 Azat Khuzhin)
  o Fix signedness differ for iov_base (solaris) (2c62062e Azat Khuzhin)
  o evutil_time: include  when there is only sleep()/usleep() 
(3e75194c Azat Khuzhin)
  o http: fix formatter for pritnf for req->ntoread (osx) (1cbf26f6 Azat 
Khuzhin)
 Testing environment:
  o Merge branch 'automake-tests-parallel-v4' (*includes ci bits also*) 
(59e217df Azat Khuzhin)
 Vagrant env fixes:
  o vagrant/netbsd: missing libtool (9c9be399 Azat Khuzhin)
  o vagrant/netbsd: more reliable way of installing packages (36da6877 Azat 
Khuzhin)
  o vagrant/osx: use make instead of gmake (there is no gmake) (f7c70aef Azat 
Khuzhin)
  o vagrant: add centos box (ca591c5b Azat Khuzhin)
 Tests:
  o test/dns: replace servname since solaris does not have "http" (d6bafbbe 
Azat Khuzhin)
  o test/thread: netbsd is too slow, increase timeout for conditions_simple 
(3c7422fc Azat Khuzhin)
  o test/dns: run async resolving after sync one (to avoid timeouts) (07862531 
Azat Khuzhin)
  o test/http: turn off some tests that based on backlog filling (falky) 
(26f416c1 Azat Khuzhin)
 Bugfixes:
  o Merge branch 'openssl-filter-fixes-v4' (83e0f43b Azat Khuzhin)
  o Merge branch 'date-rfc1123' (68def435,4798de6c,4545807d Azat Khuzhin)
  o Merge branch 'be-openssl-fd-reset-fix-v2' (86fa0070,32adf434 Azat Khuzhin)
  o Merge branch 'openssl-1.1-init-fixes-v2' (18a161f0 Azat Khuzhin)
  o Fix incorrect MIME type (23f9a20e johnsonlee)
 Trivial fixes:
 Documentation updates:
  o Update README.md (3821cca1 Breaker)


Changes in version 2.1.7-rc (2 Novemer 2016)

 Libevent 2.1.7-rc contains openssl 1.1 support, build fixes, CI improvements
 and plus Vagrantfile for testing under multiple OS'es.


 Continious Integration:
  o Use coveralls.io via travis (9ac000c Azat Khuzhin)
  o travis-ci: use container-based infrastructure (7e12e96 Azat Khuzhin)
  o travis-ci/osx: fix compiling/linking openssl libraries (9d2f8d4 Azat 
Khuzhin)
  o travis-ci: use gcc-5 (fixes osx|gcc failures) (d7ceae5 Azat Khuzhin)
  o Testing with vagrant for 6 OS and cmake+autoconf (9585338 Azat Khuzhin)
  o travis-ci/osx: install lcov (e4e099b Azat Khuzhin)

 Build Improvements/Fixes:
  o Fix cmake -DEVENT__COVERAGE=ON (40fbffc Azat Khuzhin)
  o autogen.sh: learn about gmake (9376ac4 Azat Khuzhin)
  o autogen.sh: remove all autoconf/automake caches, if any (69cce25 Azat 
Khuzhin)
  o cmake: fix finding python2, and check that it is really 2 (3453c08 Azat 
Khuzhin)
  o cmake: fix CheckFunctionExistsEx/CheckPrototypeDefinition (CMP0054) 
(43b69b2 Azat Khuzhin)
  o cmake: cleanup (dc624ad Zonr Chang)
  o cmake/win32: fix running regress, but fixing finding python2 interpreter 
(bcb990a Azat Khuzhin)
  o cmake: use PYTHON_EXECUTABLE to find python2 (a4d044c Azat Khuzhin)
  o Merge branch 'force-disable-clockgettime' (83c7cdf Azat Khuzhin)

 Code Improvements (core)
  o use ev_uint16_t instead of unsigned short for port (e983712 Thomas Bernard)
  o Merge branch 'contrib-guide-v2' (b9c5077 Azat Khuzhin)
  o poll: Prevent libevent from spinning if POLLNVAL occurs (675974c Tim 
Hentenaar)

 Testing:
  o test/regress: cover a polling of invalid fd (cb0df5c Tim Hentenaar)

 Code Improvements (bufferevent_openssl)
  o Make it build using OpenSSL 1.1.0 (3e9e0a0 Kurt Roeckx)
  o Don't call BIO_number_{read|written} on NULL BIOs. (6702da1 Adam Langley)
  o Switch from a 512 to 2048-bit RSA key. (f9803a6 Adam Langley)

 Trivial fixes:
  o Ignore temporary configure files (8fb08ae Azat Khuzhin)
  o README.md: fix typo: ar -> are (2361616 Simone Basso)
  o be: just a simple mistake, reinclude the  (7521664 Seven)

Changes in version 2.1.6-beta (4 July 2016)

 Libevent 2.1.6-beta contains mostly bug fixes (evbuffers, evthread, evdns,
 bufferevents, core, http, samples), improvements but mostly to fix some
 possible issues (EVHTTP_CON_LINGERING_CLOSE), a lot of new unit tests and new
 appveyor integration.

 Security Fixes (utils)
   o evutil_parse_sockaddr_port(): fix buffer overflow (329acc1 Azat Khuzhin)

 Security Fixes (evdns)
   o evdns: name_parse(): fix remote stack overread (96f64a0 Azat Khuzhin)
   o evdns: fix searching empty hostnames (ec65c42 Azat Khuzhin)

 New APIs (evdns)
   o New function to get address for nameserver. (537177d Nick Mathewson)

 

CVS commit: src/usr.bin/ftp

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Jan 31 21:05:35 UTC 2017

Modified Files:
src/usr.bin/ftp: fetch.c

Log Message:
Use the first name we requested the http/https URL for, not any name we ended
up with after random redirects.


To generate a diff of this commit:
cvs rdiff -u -r1.226 -r1.227 src/usr.bin/ftp/fetch.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/ftp/fetch.c
diff -u src/usr.bin/ftp/fetch.c:1.226 src/usr.bin/ftp/fetch.c:1.227
--- src/usr.bin/ftp/fetch.c:1.226	Wed Dec 14 23:49:15 2016
+++ src/usr.bin/ftp/fetch.c	Tue Jan 31 16:05:35 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: fetch.c,v 1.226 2016/12/15 04:49:15 nonaka Exp $	*/
+/*	$NetBSD: fetch.c,v 1.227 2017/01/31 21:05:35 christos Exp $	*/
 
 /*-
  * Copyright (c) 1997-2015 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: fetch.c,v 1.226 2016/12/15 04:49:15 nonaka Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.227 2017/01/31 21:05:35 christos Exp $");
 #endif /* not lint */
 
 /*
@@ -1369,6 +1369,12 @@ fetch_url(const char *url, const char *p
 			savefile = ftp_strdup(cp + 1);
 		else
 			savefile = ftp_strdup(decodedpath);
+		/*
+		 * Use the first URL we requested not the name after a
+		 * possible redirect, but careful to save it because our
+		 * "safety" check is the match to outfile.
+		 */
+		outfile = ftp_strdup(savefile);
 	}
 	DPRINTF("%s: savefile `%s'\n", __func__, savefile);
 	if (EMPTYSTRING(savefile)) {

CVS commit: src/usr.bin/make/unit-tests

[Simon J. Gerraty]

Module Name:src
Committed By:   sjg
Date:   Tue Jan 31 18:56:35 UTC 2017

Modified Files:
src/usr.bin/make/unit-tests: varmisc.exp varmisc.mk

Log Message:
Add check to cmpv test to ensure that target specific vars with
modifiers work as expected.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/varmisc.exp
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/varmisc.mk

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/unit-tests/varmisc.exp
diff -u src/usr.bin/make/unit-tests/varmisc.exp:1.6 src/usr.bin/make/unit-tests/varmisc.exp:1.7
--- src/usr.bin/make/unit-tests/varmisc.exp:1.6	Mon Jan 30 02:46:20 2017
+++ src/usr.bin/make/unit-tests/varmisc.exp	Tue Jan 31 18:56:35 2017
@@ -19,6 +19,7 @@ do not evaluate or expand :? if discardi
 is set
 year=2016 month=04 day=01
 date=20160401
-Version=1.2.3 == 10203
-Literal=3.4.5 == 30405
+Version=123.456.789 == 123456789
+Literal=3.4.5 == 3004005
+We have target specific vars
 exit status 0

Index: src/usr.bin/make/unit-tests/varmisc.mk
diff -u src/usr.bin/make/unit-tests/varmisc.mk:1.7 src/usr.bin/make/unit-tests/varmisc.mk:1.8
--- src/usr.bin/make/unit-tests/varmisc.mk:1.7	Mon Jan 30 02:46:20 2017
+++ src/usr.bin/make/unit-tests/varmisc.mk	Tue Jan 31 18:56:35 2017
@@ -1,4 +1,4 @@
-# $Id: varmisc.mk,v 1.7 2017/01/30 02:46:20 sjg Exp $
+# $Id: varmisc.mk,v 1.8 2017/01/31 18:56:35 sjg Exp $
 #
 # Miscellaneous variable tests.
 
@@ -50,12 +50,13 @@ strftime:
 	@echo date=${%Y%m%d:L:${gmtime=${April1}:L}}
 
 # big jumps to handle 3 digits per step
-M_cmpv.units = 1 100 1 100
-# this will produce the same result as the .for loop below
+M_cmpv.units = 1 1000 100
 M_cmpv = S,., ,g:_:range:@i@+ $${_:[-$$i]} \* $${M_cmpv.units:[$$i]}@:S,^,expr 0 ,1:sh
 
-Version = 1.2.3
+Version = 123.456.789
+cmpv.only = target specific vars
 
 cmpv:
 	@echo Version=${Version} == ${Version:${M_cmpv}}
 	@echo Literal=3.4.5 == ${3.4.5:L:${M_cmpv}}
+	@echo We have ${${.TARGET:T}.only}

CVS commit: src/sys/arch/x86/x86

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Tue Jan 31 17:38:54 UTC 2017

Modified Files:
src/sys/arch/x86/x86: tprof_amdpmi.c

Log Message:
Update the URLs, and add the DC_refills_ flags (from the spec, not present
on my cpu).


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x86/x86/tprof_amdpmi.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x86/x86/tprof_amdpmi.c
diff -u src/sys/arch/x86/x86/tprof_amdpmi.c:1.4 src/sys/arch/x86/x86/tprof_amdpmi.c:1.5
--- src/sys/arch/x86/x86/tprof_amdpmi.c:1.4	Fri Nov 15 08:47:55 2013
+++ src/sys/arch/x86/x86/tprof_amdpmi.c	Tue Jan 31 17:38:54 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: tprof_amdpmi.c,v 1.4 2013/11/15 08:47:55 msaitoh Exp $	*/
+/*	$NetBSD: tprof_amdpmi.c,v 1.5 2017/01/31 17:38:54 maxv Exp $	*/
 
 /*-
  * Copyright (c)2008,2009 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tprof_amdpmi.c,v 1.4 2013/11/15 08:47:55 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tprof_amdpmi.c,v 1.5 2017/01/31 17:38:54 maxv Exp $");
 
 #include 
 #include 
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: tprof_amdpmi
 #include 
 
 #include 
-#include 	/* CPUVENDER_* */
+#include 	/* CPUVENDOR_* */
 #include 	/* cpu_vendor */
 #include 
 #include 
@@ -73,16 +73,22 @@ __KERNEL_RCSID(0, "$NetBSD: tprof_amdpmi
 /* bit 42-63 reserved */
 
 /*
- * parameters
- *
- * XXX should not hardcode
- *
- * http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/32559.pdf
- * http://developer.amd.com/Assets/Basic_Performance_Measurements.pdf
+ * Documents:
+ * http://support.amd.com/TechDocs/32559.pdf
+ * http://developer.amd.com/wordpress/media/2012/10/Basic_Performance_Measurements.pdf
  */
 
-static uint32_t event = 0x76;	/* CPU Clocks not Halted */
-static uint32_t unit = 0;
+/* Event flags - abbreviations as found in the documents */
+#define CPU_clocks__EVENT	0x76
+#define CPU_clocks__UNIT	0x00
+#define DC_refills_L2__EVENT	0x42
+#define DC_refills_L2__UNIT	0x1E
+#define DC_refills_sys__EVENT	0x43
+#define DC_refills_sys__UNIT	0x1E
+
+/* Hardcode your counter here */
+static uint32_t event = CPU_clocks__EVENT;
+static uint32_t unit = CPU_clocks__UNIT;
 static int ctrno = 0;
 
 static uint64_t counter_val = 500;

CVS commit: src/sys/net

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Tue Jan 31 17:13:36 UTC 2017

Modified Files:
src/sys/net: if_ecosubr.c if_tokensubr.c

Log Message:
Correctly handle the return value of arpresolve, otherwise we either leak
memory or use some we already freed.

Sent on tech-net, ok christos


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/net/if_ecosubr.c
cvs rdiff -u -r1.80 -r1.81 src/sys/net/if_tokensubr.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/net/if_ecosubr.c
diff -u src/sys/net/if_ecosubr.c:1.50 src/sys/net/if_ecosubr.c:1.51
--- src/sys/net/if_ecosubr.c:1.50	Tue Jan 24 18:37:20 2017
+++ src/sys/net/if_ecosubr.c	Tue Jan 31 17:13:36 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ecosubr.c,v 1.50 2017/01/24 18:37:20 maxv Exp $	*/
+/*	$NetBSD: if_ecosubr.c,v 1.51 2017/01/31 17:13:36 maxv Exp $	*/
 
 /*-
  * Copyright (c) 2001 Ben Harris
@@ -58,7 +58,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_ecosubr.c,v 1.50 2017/01/24 18:37:20 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ecosubr.c,v 1.51 2017/01/31 17:13:36 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -194,12 +194,11 @@ eco_output(struct ifnet *ifp, struct mbu
 #ifdef INET
 	case AF_INET:
 		if (m->m_flags & M_BCAST)
-	memcpy(ehdr.eco_dhost, eco_broadcastaddr,
-			ECO_ADDR_LEN);
+			memcpy(ehdr.eco_dhost, eco_broadcastaddr, ECO_ADDR_LEN);
+		else if ((error = arpresolve(ifp, rt, m, dst, ehdr.eco_dhost,
+		sizeof(ehdr.eco_dhost))) != 0)
+			return error == EWOULDBLOCK ? 0 : error;
 
-		else if (!arpresolve(ifp, rt, m, dst, ehdr.eco_dhost,
-		sizeof(ehdr.eco_dhost)))
-			return (0);	/* if not yet resolved */
 		/* If broadcasting on a simplex interface, loopback a copy */
 		if ((m->m_flags & M_BCAST) && (ifp->if_flags & IFF_SIMPLEX))
 			mcopy = m_copy(m, 0, (int)M_COPYALL);

Index: src/sys/net/if_tokensubr.c
diff -u src/sys/net/if_tokensubr.c:1.80 src/sys/net/if_tokensubr.c:1.81
--- src/sys/net/if_tokensubr.c:1.80	Tue Jan 24 18:37:20 2017
+++ src/sys/net/if_tokensubr.c	Tue Jan 31 17:13:36 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_tokensubr.c,v 1.80 2017/01/24 18:37:20 maxv Exp $	*/
+/*	$NetBSD: if_tokensubr.c,v 1.81 2017/01/31 17:13:36 maxv Exp $	*/
 
 /*
  * Copyright (c) 1982, 1989, 1993
@@ -92,7 +92,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_tokensubr.c,v 1.80 2017/01/24 18:37:20 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tokensubr.c,v 1.81 2017/01/31 17:13:36 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -222,8 +222,11 @@ token_output(struct ifnet *ifp0, struct 
  */
 		else {
 			struct llentry *la;
-			if (!arpresolve(ifp, rt, m, dst, edst, sizeof(edst)))
-return (0);	/* if not yet resolved */
+
+			error = arpresolve(ifp, rt, m, dst, edst, sizeof(edst));
+			if (error != 0)
+return error == EWOULDBLOCK ? 0 : error;
+
 			la = rt->rt_llinfo;
 			KASSERT(la != NULL);
 			TOKEN_RIF_LLE_ASSERT(la);

CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Jan 31 17:09:08 UTC 2017

Modified Files:
src/sys/dev/usb [nick-nhusb]: if_smsc.c

Log Message:
Minor code re-org.  No functional change intended.


To generate a diff of this commit:
cvs rdiff -u -r1.22.2.22 -r1.22.2.23 src/sys/dev/usb/if_smsc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/usb/if_smsc.c
diff -u src/sys/dev/usb/if_smsc.c:1.22.2.22 src/sys/dev/usb/if_smsc.c:1.22.2.23
--- src/sys/dev/usb/if_smsc.c:1.22.2.22	Tue Jan 31 16:52:39 2017
+++ src/sys/dev/usb/if_smsc.c	Tue Jan 31 17:09:08 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_smsc.c,v 1.22.2.22 2017/01/31 16:52:39 skrll Exp $	*/
+/*	$NetBSD: if_smsc.c,v 1.22.2.23 2017/01/31 17:09:08 skrll Exp $	*/
 
 /*	$OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $	*/
 /* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
@@ -1032,14 +1032,8 @@ smsc_attach(device_t parent, device_t se
 		", err=%s\n", usbd_errstr(err));
 		return;
 	}
-	/* Setup the endpoints for the SMSC LAN95xx device(s) */
-	usb_init_task(>sc_tick_task, smsc_tick_task, sc, 0);
-
-	mutex_init(>sc_lock, MUTEX_DEFAULT, IPL_NONE);
-	mutex_init(>sc_txlock, MUTEX_DEFAULT, IPL_SOFTUSB);
-	mutex_init(>sc_rxlock, MUTEX_DEFAULT, IPL_SOFTUSB);
-	mutex_init(>sc_mii_lock, MUTEX_DEFAULT, IPL_NONE);
 
+	/* Setup the endpoints for the SMSC LAN95xx device(s) */
 	err = usbd_device2interface_handle(dev, SMSC_IFACE_IDX, >sc_iface);
 	if (err) {
 		aprint_error_dev(self, "getting interface handle failed\n");
@@ -1072,6 +1066,13 @@ smsc_attach(device_t parent, device_t se
 		}
 	}
 
+	usb_init_task(>sc_tick_task, smsc_tick_task, sc, 0);
+
+	mutex_init(>sc_lock, MUTEX_DEFAULT, IPL_NONE);
+	mutex_init(>sc_txlock, MUTEX_DEFAULT, IPL_SOFTUSB);
+	mutex_init(>sc_rxlock, MUTEX_DEFAULT, IPL_SOFTUSB);
+	mutex_init(>sc_mii_lock, MUTEX_DEFAULT, IPL_NONE);
+
 	ifp = >sc_ec.ec_if;
 	ifp->if_softc = sc;
 	strlcpy(ifp->if_xname, device_xname(sc->sc_dev), IFNAMSIZ);

CVS commit: src/external/bsd/blacklist/lib

[Abhinav Upadhyay]

Module Name:src
Committed By:   abhinav
Date:   Tue Jan 31 16:55:04 UTC 2017

Modified Files:
src/external/bsd/blacklist/lib: libblacklist.3

Log Message:
Correct the function names in the RETURN VALUES section
and use markup for errno.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/blacklist/lib/libblacklist.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/blacklist/lib/libblacklist.3
diff -u src/external/bsd/blacklist/lib/libblacklist.3:1.5 src/external/bsd/blacklist/lib/libblacklist.3:1.6
--- src/external/bsd/blacklist/lib/libblacklist.3:1.5	Tue Jan 31 16:31:21 2017
+++ src/external/bsd/blacklist/lib/libblacklist.3	Tue Jan 31 16:55:04 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: libblacklist.3,v 1.5 2017/01/31 16:31:21 abhinav Exp $
+.\" $NetBSD: libblacklist.3,v 1.6 2017/01/31 16:55:04 abhinav Exp $
 .\"
 .\" Copyright (c) 2015 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -106,18 +106,25 @@ All functions log errors to
 .Xr syslogd 8 .
 .Sh RETURN VALUES
 The function
-.Fn bl_open
+.Fn blacklist_open
 returns a cookie on success and
 .Dv NULL
-on failure setting errno to an appropriate value.
-.Pp
-The
-.Fn bl_send
-function returns
+on failure setting
+.Dv errno
+to an appropriate value.
+.Pp
+The functions
+.Fn blacklist ,
+.Fn blacklist_sa ,
+and
+.Fn blacklist_sa_r
+return
 .Dv 0
 on success and
 .Dv -1
-on failure setting errno to an appropriate value.
+on failure setting
+.Dv errno
+to an appropriate value.
 .Sh SEE ALSO
 .Xr blacklistd.conf 5 ,
 .Xr blacklistd 8

CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Jan 31 16:52:40 UTC 2017

Modified Files:
src/sys/dev/usb [nick-nhusb]: if_smsc.c

Log Message:
Remove useless lines.


To generate a diff of this commit:
cvs rdiff -u -r1.22.2.21 -r1.22.2.22 src/sys/dev/usb/if_smsc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/usb/if_smsc.c
diff -u src/sys/dev/usb/if_smsc.c:1.22.2.21 src/sys/dev/usb/if_smsc.c:1.22.2.22
--- src/sys/dev/usb/if_smsc.c:1.22.2.21	Tue Jan 31 11:41:14 2017
+++ src/sys/dev/usb/if_smsc.c	Tue Jan 31 16:52:39 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_smsc.c,v 1.22.2.21 2017/01/31 11:41:14 skrll Exp $	*/
+/*	$NetBSD: if_smsc.c,v 1.22.2.22 2017/01/31 16:52:39 skrll Exp $	*/
 
 /*	$OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $	*/
 /* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
@@ -367,7 +367,6 @@ smsc_miibus_statchg(struct ifnet *ifp)
 			afc_cfg |= 0xf;
 		else
 			afc_cfg &= ~0xf;
-
 	} else {
 		smsc_dbg_printf(sc, "half duplex operation\n");
 		sc->sc_mac_csr &= ~SMSC_MAC_CSR_FDPX;
@@ -710,8 +709,6 @@ smsc_stop_locked(struct ifnet *ifp, int 
 	struct smsc_softc * const sc = ifp->if_softc;
 	usbd_status err;
 
-//	smsc_reset(sc);
-
 	KASSERT(mutex_owned(>sc_lock));
 	mutex_enter(>sc_rxlock);
 	mutex_enter(>sc_txlock);
@@ -973,7 +970,6 @@ int
 smsc_ioctl(struct ifnet *ifp, u_long cmd, void *data)
 {
 	struct smsc_softc	*sc = ifp->if_softc;
-// 	struct ifreq /*const*/	*ifr = data;
 	int			s, error = 0;
 
 	if (sc->sc_dying)

CVS commit: src/external/bsd/blacklist/lib

[Abhinav Upadhyay]

Module Name:src
Committed By:   abhinav
Date:   Tue Jan 31 16:31:21 UTC 2017

Modified Files:
src/external/bsd/blacklist/lib: libblacklist.3

Log Message:
Fix a sentence.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/blacklist/lib/libblacklist.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/blacklist/lib/libblacklist.3
diff -u src/external/bsd/blacklist/lib/libblacklist.3:1.4 src/external/bsd/blacklist/lib/libblacklist.3:1.5
--- src/external/bsd/blacklist/lib/libblacklist.3:1.4	Tue Jan 31 16:23:18 2017
+++ src/external/bsd/blacklist/lib/libblacklist.3	Tue Jan 31 16:31:21 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: libblacklist.3,v 1.4 2017/01/31 16:23:18 abhinav Exp $
+.\" $NetBSD: libblacklist.3,v 1.5 2017/01/31 16:31:21 abhinav Exp $
 .\"
 .\" Copyright (c) 2015 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -62,7 +62,7 @@ block or release port access to prevent 
 .Pp
 The function
 .Fn blacklist_open
-creates a the necessary state to communicate with
+creates the necessary state to communicate with
 .Xr blacklistd 8
 and returns a pointer to it, or
 .Dv NULL

CVS commit: src/external/bsd/blacklist/lib

[Abhinav Upadhyay]

Module Name:src
Committed By:   abhinav
Date:   Tue Jan 31 16:23:19 UTC 2017

Modified Files:
src/external/bsd/blacklist/lib: libblacklist.3

Log Message:
Remove comma after the last Nm entry.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/blacklist/lib/libblacklist.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/blacklist/lib/libblacklist.3
diff -u src/external/bsd/blacklist/lib/libblacklist.3:1.3 src/external/bsd/blacklist/lib/libblacklist.3:1.4
--- src/external/bsd/blacklist/lib/libblacklist.3:1.3	Sun Jan 25 23:09:28 2015
+++ src/external/bsd/blacklist/lib/libblacklist.3	Tue Jan 31 16:23:18 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: libblacklist.3,v 1.3 2015/01/25 23:09:28 wiz Exp $
+.\" $NetBSD: libblacklist.3,v 1.4 2017/01/31 16:23:18 abhinav Exp $
 .\"
 .\" Copyright (c) 2015 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -36,7 +36,7 @@
 .Nm blacklist_r ,
 .Nm blacklist ,
 .Nm blacklist_sa
-.Nm blacklist_sa_r ,
+.Nm blacklist_sa_r
 .Nd Blacklistd notification library
 .Sh LIBRARY
 .Lb libblacklist

CVS commit: src/sys/arch/sparc64/include

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Tue Jan 31 16:13:56 UTC 2017

Modified Files:
src/sys/arch/sparc64/include: elf_machdep.h

Log Message:
PR port-sparc64/51925: remove EM_SPARC32PLUS from the 64 bit ELF machine
ids we accept for our executables - that combination makes no sense
at all (probably copy).


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc64/include/elf_machdep.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/sparc64/include/elf_machdep.h
diff -u src/sys/arch/sparc64/include/elf_machdep.h:1.11 src/sys/arch/sparc64/include/elf_machdep.h:1.12
--- src/sys/arch/sparc64/include/elf_machdep.h:1.11	Thu Nov 14 12:11:13 2013
+++ src/sys/arch/sparc64/include/elf_machdep.h	Tue Jan 31 16:13:56 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: elf_machdep.h,v 1.11 2013/11/14 12:11:13 martin Exp $	*/
+/*	$NetBSD: elf_machdep.h,v 1.12 2017/01/31 16:13:56 martin Exp $	*/
 
 #define ELF32_MACHDEP_ENDIANNESS	ELFDATA2MSB
 #define	ELF32_MACHDEP_ID_CASES		\
@@ -8,7 +8,6 @@
 
 #define	ELF64_MACHDEP_ENDIANNESS	ELFDATA2MSB
 #define	ELF64_MACHDEP_ID_CASES		\
-		case EM_SPARC32PLUS:	\
 		case EM_SPARCV9:	\
 			break;
 

CVS commit: src/share/dict

[Abhinav Upadhyay]

Module Name:src
Committed By:   abhinav
Date:   Tue Jan 31 14:58:17 UTC 2017

Modified Files:
src/share/dict: web2

Log Message:
Also, fix spelling of lookup.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/share/dict/web2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/dict/web2
diff -u src/share/dict/web2:1.23 src/share/dict/web2:1.24
--- src/share/dict/web2:1.23	Tue Jan 31 14:42:47 2017
+++ src/share/dict/web2	Tue Jan 31 14:58:17 2017
@@ -107820,7 +107820,7 @@ look
 looker
 looking
 lookout
-lookum
+lookup
 loom
 loomer
 loomery

CVS commit: src/share/dict

[Abhinav Upadhyay]

Module Name:src
Committed By:   abhinav
Date:   Tue Jan 31 14:42:48 UTC 2017

Modified Files:
src/share/dict: web2

Log Message:
Fix spelling of relocatable.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/share/dict/web2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/dict/web2
diff -u src/share/dict/web2:1.22 src/share/dict/web2:1.23
--- src/share/dict/web2:1.22	Sun Jan 22 21:31:20 2017
+++ src/share/dict/web2	Tue Jan 31 14:42:47 2017
@@ -165880,7 +165880,7 @@ Rellyanism
 Rellyanite
 reload
 reloan
-relocable
+relocatable
 relocate
 relocation
 relocator

CVS commit: src/libexec/httpd

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jan 31 14:36:09 UTC 2017

Modified Files:
src/libexec/httpd: bozohttpd.8 bozohttpd.c bozohttpd.h cgi-bozo.c

Log Message:
call this bozohttpd 20170201.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/libexec/httpd/bozohttpd.8
cvs rdiff -u -r1.84 -r1.85 src/libexec/httpd/bozohttpd.c
cvs rdiff -u -r1.46 -r1.47 src/libexec/httpd/bozohttpd.h
cvs rdiff -u -r1.36 -r1.37 src/libexec/httpd/cgi-bozo.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/libexec/httpd/bozohttpd.8
diff -u src/libexec/httpd/bozohttpd.8:1.64 src/libexec/httpd/bozohttpd.8:1.65
--- src/libexec/httpd/bozohttpd.8:1.64	Fri Jan 20 16:14:44 2017
+++ src/libexec/httpd/bozohttpd.8	Tue Jan 31 14:36:09 2017
@@ -1,8 +1,8 @@
-.\"	$NetBSD: bozohttpd.8,v 1.64 2017/01/20 16:14:44 abhinav Exp $
+.\"	$NetBSD: bozohttpd.8,v 1.65 2017/01/31 14:36:09 mrg Exp $
 .\"
 .\"	$eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $
 .\"
-.\" Copyright (c) 1997-2016 Matthew R. Green
+.\" Copyright (c) 1997-2017 Matthew R. Green
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd December 11, 2016
+.Dd February 1, 2017
 .Dt BOZOHTTPD 8
 .Os
 .Sh NAME
@@ -531,7 +531,7 @@ The focus has always been simplicity and
 and regular code audits.
 This manual documents
 .Nm
-version 20160720.
+version 20170201.
 .Sh AUTHORS
 .An -nosplit
 .Nm
@@ -631,6 +631,10 @@ provided some clean up for memory leaks
 .Aq Mt j...@netbsd.org
 provided man page fixes
 .It
+.An Dennis Lindroos
+.Aq Mt dena...@gmail.com
+provided a cgi-bin fix
+.It
 .An Julio Merino
 .Aq Mt j...@netbsd.org
 Added the

Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.84 src/libexec/httpd/bozohttpd.c:1.85
--- src/libexec/httpd/bozohttpd.c:1.84	Sun Dec 11 20:40:41 2016
+++ src/libexec/httpd/bozohttpd.c	Tue Jan 31 14:36:09 2017
@@ -1,9 +1,9 @@
-/*	$NetBSD: bozohttpd.c,v 1.84 2016/12/11 20:40:41 mrg Exp $	*/
+/*	$NetBSD: bozohttpd.c,v 1.85 2017/01/31 14:36:09 mrg Exp $	*/
 
 /*	$eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $	*/
 
 /*
- * Copyright (c) 1997-2016 Matthew R. Green
+ * Copyright (c) 1997-2017 Matthew R. Green
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -109,7 +109,7 @@
 #define INDEX_HTML		"index.html"
 #endif
 #ifndef SERVER_SOFTWARE
-#define SERVER_SOFTWARE		"bozohttpd/20160720"
+#define SERVER_SOFTWARE		"bozohttpd/20170102"
 #endif
 #ifndef DIRECT_ACCESS_FILE
 #define DIRECT_ACCESS_FILE	".bzdirect"

Index: src/libexec/httpd/bozohttpd.h
diff -u src/libexec/httpd/bozohttpd.h:1.46 src/libexec/httpd/bozohttpd.h:1.47
--- src/libexec/httpd/bozohttpd.h:1.46	Tue May 24 21:18:29 2016
+++ src/libexec/httpd/bozohttpd.h	Tue Jan 31 14:36:09 2017
@@ -1,9 +1,9 @@
-/*	$NetBSD: bozohttpd.h,v 1.46 2016/05/24 21:18:29 agc Exp $	*/
+/*	$NetBSD: bozohttpd.h,v 1.47 2017/01/31 14:36:09 mrg Exp $	*/
 
 /*	$eterna: bozohttpd.h,v 1.39 2011/11/18 09:21:15 mrg Exp $	*/
 
 /*
- * Copyright (c) 1997-2015 Matthew R. Green
+ * Copyright (c) 1997-2017 Matthew R. Green
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Index: src/libexec/httpd/cgi-bozo.c
diff -u src/libexec/httpd/cgi-bozo.c:1.36 src/libexec/httpd/cgi-bozo.c:1.37
--- src/libexec/httpd/cgi-bozo.c:1.36	Tue Jan 31 14:33:54 2017
+++ src/libexec/httpd/cgi-bozo.c	Tue Jan 31 14:36:09 2017
@@ -1,9 +1,9 @@
-/*	$NetBSD: cgi-bozo.c,v 1.36 2017/01/31 14:33:54 mrg Exp $	*/
+/*	$NetBSD: cgi-bozo.c,v 1.37 2017/01/31 14:36:09 mrg Exp $	*/
 
 /*	$eterna: cgi-bozo.c,v 1.40 2011/11/18 09:21:15 mrg Exp $	*/
 
 /*
- * Copyright (c) 1997-2015 Matthew R. Green
+ * Copyright (c) 1997-2017 Matthew R. Green
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

CVS commit: src/libexec/httpd

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jan 31 14:33:54 UTC 2017

Modified Files:
src/libexec/httpd: CHANGES cgi-bozo.c
src/libexec/httpd/testsuite: Makefile test-bigfile test-simple
Added Files:
src/libexec/httpd/testsuite: t11.in t11.out
src/libexec/httpd/testsuite/cgi-bin: empty

Log Message:
- fix a bug in cgi processing.  from Dennis Lindroos.
- add a testcase for this, and expand test-simple to handle additional
  args to bozohttpd for eg, cgi-bin setting.
- fix objdir bugs in the testsuite.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/libexec/httpd/CHANGES
cvs rdiff -u -r1.35 -r1.36 src/libexec/httpd/cgi-bozo.c
cvs rdiff -u -r1.6 -r1.7 src/libexec/httpd/testsuite/Makefile
cvs rdiff -u -r0 -r1.1 src/libexec/httpd/testsuite/t11.in \
src/libexec/httpd/testsuite/t11.out
cvs rdiff -u -r1.3 -r1.4 src/libexec/httpd/testsuite/test-bigfile \
src/libexec/httpd/testsuite/test-simple
cvs rdiff -u -r0 -r1.1 src/libexec/httpd/testsuite/cgi-bin/empty

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/libexec/httpd/CHANGES
diff -u src/libexec/httpd/CHANGES:1.24 src/libexec/httpd/CHANGES:1.25
--- src/libexec/httpd/CHANGES:1.24	Sat Aug 20 00:36:41 2016
+++ src/libexec/httpd/CHANGES	Tue Jan 31 14:33:54 2017
@@ -1,7 +1,12 @@
-$NetBSD: CHANGES,v 1.24 2016/08/20 00:36:41 mrg Exp $
+$NetBSD: CHANGES,v 1.25 2017/01/31 14:33:54 mrg Exp $
+
+changes in bozohttpd 20170201:
+	o  fix an infinite loop in cgi processing
+	o  fixes and clean up for the testsuite
+	o  no longer sends encoding header for compressed formats
 
 changes in bozohttpd 20160517:
-	o add a bozo_get_version() function which returns the version number
+	o  add a bozo_get_version() function which returns the version number
 
 changes in bozohttpd 20160415:
 	o  add search-word support for CGI

Index: src/libexec/httpd/cgi-bozo.c
diff -u src/libexec/httpd/cgi-bozo.c:1.35 src/libexec/httpd/cgi-bozo.c:1.36
--- src/libexec/httpd/cgi-bozo.c:1.35	Sun Apr 24 18:24:47 2016
+++ src/libexec/httpd/cgi-bozo.c	Tue Jan 31 14:33:54 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: cgi-bozo.c,v 1.35 2016/04/24 18:24:47 christos Exp $	*/
+/*	$NetBSD: cgi-bozo.c,v 1.36 2017/01/31 14:33:54 mrg Exp $	*/
 
 /*	$eterna: cgi-bozo.c,v 1.40 2011/11/18 09:21:15 mrg Exp $	*/
 
@@ -235,7 +235,8 @@ parse_search_string(bozo_httpreq_t *requ
 	 */
 	*args_len = 1;
 	/* count '+' in str */
-	for (s = str; (s = strchr(s, '+')); (*args_len)++);
+	for (s = str; (s = strchr(s, '+')); (*args_len)++)
+		s++;
 	
 	args = bozomalloc(httpd, sizeof(*args) * (*args_len + 1));
  

Index: src/libexec/httpd/testsuite/Makefile
diff -u src/libexec/httpd/testsuite/Makefile:1.6 src/libexec/httpd/testsuite/Makefile:1.7
--- src/libexec/httpd/testsuite/Makefile:1.6	Fri Sep 23 16:55:56 2016
+++ src/libexec/httpd/testsuite/Makefile	Tue Jan 31 14:33:54 2017
@@ -1,6 +1,7 @@
 #	$eterna: Makefile,v 1.14 2009/05/22 21:51:39 mrg Exp $
 
 SIMPLETESTS=	t1 t2 t3 t4 t5 t6 t7 t8 t9 t10
+CGITESTS=	t11
 BIGFILETESTS=	partial4000 partial8000
 
 BOZOHTTPD?=	../bozohttpd
@@ -22,11 +23,16 @@ clean:
 		rm -f tmp.$$a.out tmp.$$a.err; \
 	done
 
-check: check-simple check-bigfile
+check: check-simple check-cgi check-bigfile
 
 check-simple:
 .for a in $(SIMPLETESTS)
-	${SILENT}$(.CURDIR)/test-simple "$a" "${BOZOHTTPD}" "${DATA}" "${VERBOSE}"
+	${SILENT}$(.CURDIR)/test-simple "$a" "${BOZOHTTPD}" "${DATA}" "${.CURDIR}" "${VERBOSE}"
+.endfor
+
+check-cgi:
+.for a in $(CGITESTS)
+	${SILENT}$(.CURDIR)/test-simple "$a" "${BOZOHTTPD}" "${DATA}" "${.CURDIR}" "${VERBOSE}" -c "${.CURDIR}/cgi-bin"
 .endfor
 
 check-bigfile:

Index: src/libexec/httpd/testsuite/test-bigfile
diff -u src/libexec/httpd/testsuite/test-bigfile:1.3 src/libexec/httpd/testsuite/test-bigfile:1.4
--- src/libexec/httpd/testsuite/test-bigfile:1.3	Fri Sep 23 16:55:56 2016
+++ src/libexec/httpd/testsuite/test-bigfile	Tue Jan 31 14:33:54 2017
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $NetBSD: test-bigfile,v 1.3 2016/09/23 16:55:56 schmonz Exp $
+# $NetBSD: test-bigfile,v 1.4 2017/01/31 14:33:54 mrg Exp $
 
 test="$1"	# partial4000 or partial8000
 bozohttpd="$2"
@@ -7,30 +7,35 @@ wget="$3"
 datadir="$4"
 verbose="$5"
 
+tmperr="tmp.$test.err"
+
 if [ "yes" = "$verbose" ]; then
 	echo "Running test $test"
 else
-	exec 2>tmp.$test.err
+	exec 2>"$tmperr"
 fi
 
 bozotestport=1
 
 # copy beginning file
-cp ${datadir}/bigfile.${test} ./bigfile
+cp "${datadir}/bigfile.${test}" ./bigfile
 
 # fire up bozohttpd
-${bozohttpd} -b -b -I ${bozotestport} -n -s -f ${datadir} &
+${bozohttpd} -b -b -I ${bozotestport} -n -s -f "${datadir}" &
 bozopid=$!
 
-${wget} -c http://localhost:${bozotestport}/bigfile
+"${wget}" -c http://localhost:${bozotestport}/bigfile
 
 kill -9 $bozopid
 
-if cmp ./bigfile ${datadir}/bigfile; then
+if cmp ./bigfile "${datadir}/bigfile"; then
 	rm -f ./bigfile
 	exit 0
 else
 	rm -f ./bigfile
-	[ "yes" = "$verbose" ] || 

CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Jan 31 11:41:14 UTC 2017

Modified Files:
src/sys/dev/usb [nick-nhusb]: if_smsc.c if_smscvar.h

Log Message:
G/C sc_stop_task


To generate a diff of this commit:
cvs rdiff -u -r1.22.2.20 -r1.22.2.21 src/sys/dev/usb/if_smsc.c
cvs rdiff -u -r1.3.4.5 -r1.3.4.6 src/sys/dev/usb/if_smscvar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/usb/if_smsc.c
diff -u src/sys/dev/usb/if_smsc.c:1.22.2.20 src/sys/dev/usb/if_smsc.c:1.22.2.21
--- src/sys/dev/usb/if_smsc.c:1.22.2.20	Tue Jan 31 11:39:46 2017
+++ src/sys/dev/usb/if_smsc.c	Tue Jan 31 11:41:14 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_smsc.c,v 1.22.2.20 2017/01/31 11:39:46 skrll Exp $	*/
+/*	$NetBSD: if_smsc.c,v 1.22.2.21 2017/01/31 11:41:14 skrll Exp $	*/
 
 /*	$OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $	*/
 /* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
@@ -1038,7 +1038,6 @@ smsc_attach(device_t parent, device_t se
 	}
 	/* Setup the endpoints for the SMSC LAN95xx device(s) */
 	usb_init_task(>sc_tick_task, smsc_tick_task, sc, 0);
-	usb_init_task(>sc_stop_task, (void (*)(void *))smsc_stop, sc, 0);
 
 	mutex_init(>sc_lock, MUTEX_DEFAULT, IPL_NONE);
 	mutex_init(>sc_txlock, MUTEX_DEFAULT, IPL_SOFTUSB);
@@ -1185,7 +1184,6 @@ smsc_detach(device_t self, int flags)
 	 * in the same thread as detach.
 	 */
 	usb_rem_task(sc->sc_udev, >sc_tick_task);
-	usb_rem_task(sc->sc_udev, >sc_stop_task);
 
 	s = splusb();
 

Index: src/sys/dev/usb/if_smscvar.h
diff -u src/sys/dev/usb/if_smscvar.h:1.3.4.5 src/sys/dev/usb/if_smscvar.h:1.3.4.6
--- src/sys/dev/usb/if_smscvar.h:1.3.4.5	Wed Dec 28 08:53:56 2016
+++ src/sys/dev/usb/if_smscvar.h	Tue Jan 31 11:41:14 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_smscvar.h,v 1.3.4.5 2016/12/28 08:53:56 skrll Exp $	*/
+/*	$NetBSD: if_smscvar.h,v 1.3.4.6 2017/01/31 11:41:14 skrll Exp $	*/
 
 /*	$OpenBSD: if_smscreg.h,v 1.2 2012/09/27 12:38:11 jsg Exp $	*/
 /*-
@@ -78,7 +78,6 @@ struct smsc_softc {
 	int			sc_refcnt;
 
 	struct usb_task		sc_tick_task;
-	struct usb_task		sc_stop_task;
 
 	int			sc_ed[SMSC_ENDPT_MAX];
 	struct usbd_pipe *	sc_ep[SMSC_ENDPT_MAX];

CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Jan 31 11:39:46 UTC 2017

Modified Files:
src/sys/dev/usb [nick-nhusb]: if_smsc.c

Log Message:
Style / indentation


To generate a diff of this commit:
cvs rdiff -u -r1.22.2.19 -r1.22.2.20 src/sys/dev/usb/if_smsc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/usb/if_smsc.c
diff -u src/sys/dev/usb/if_smsc.c:1.22.2.19 src/sys/dev/usb/if_smsc.c:1.22.2.20
--- src/sys/dev/usb/if_smsc.c:1.22.2.19	Tue Jan 31 08:30:38 2017
+++ src/sys/dev/usb/if_smsc.c	Tue Jan 31 11:39:46 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_smsc.c,v 1.22.2.19 2017/01/31 08:30:38 skrll Exp $	*/
+/*	$NetBSD: if_smsc.c,v 1.22.2.20 2017/01/31 11:39:46 skrll Exp $	*/
 
 /*	$OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $	*/
 /* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
@@ -1116,16 +1116,17 @@ smsc_attach(device_t parent, device_t se
 		KASSERT(prop_data_size(eaprop) == ETHER_ADDR_LEN);
 		memcpy(sc->sc_enaddr, prop_data_data_nocopy(eaprop),
 		ETHER_ADDR_LEN);
-	} else
-	/* Check if there is already a MAC address in the register */
-	if ((smsc_read_reg(sc, SMSC_MAC_ADDRL, _l) == 0) &&
-	(smsc_read_reg(sc, SMSC_MAC_ADDRH, _h) == 0)) {
-		sc->sc_enaddr[5] = (uint8_t)((mac_h >> 8) & 0xff);
-		sc->sc_enaddr[4] = (uint8_t)((mac_h) & 0xff);
-		sc->sc_enaddr[3] = (uint8_t)((mac_l >> 24) & 0xff);
-		sc->sc_enaddr[2] = (uint8_t)((mac_l >> 16) & 0xff);
-		sc->sc_enaddr[1] = (uint8_t)((mac_l >> 8) & 0xff);
-		sc->sc_enaddr[0] = (uint8_t)((mac_l) & 0xff);
+	} else {
+		/* Check if there is already a MAC address in the register */
+		if ((smsc_read_reg(sc, SMSC_MAC_ADDRL, _l) == 0) &&
+		(smsc_read_reg(sc, SMSC_MAC_ADDRH, _h) == 0)) {
+			sc->sc_enaddr[5] = (uint8_t)((mac_h >> 8) & 0xff);
+			sc->sc_enaddr[4] = (uint8_t)((mac_h) & 0xff);
+			sc->sc_enaddr[3] = (uint8_t)((mac_l >> 24) & 0xff);
+			sc->sc_enaddr[2] = (uint8_t)((mac_l >> 16) & 0xff);
+			sc->sc_enaddr[1] = (uint8_t)((mac_l >> 8) & 0xff);
+			sc->sc_enaddr[0] = (uint8_t)((mac_l) & 0xff);
+		}
 	}
 
 	aprint_normal_dev(self, "Ethernet address %s\n", ether_sprintf(sc->sc_enaddr));

CVS commit: src/lib/libcurses

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Tue Jan 31 09:17:53 UTC 2017

Modified Files:
src/lib/libcurses: curses.c curses_private.h get_wch.c getch.c
ins_wch.c ins_wstr.c screen.c setterm.c

Log Message:
Move ESCDELAY to curses.c so all globals are close to each other.
Remove _reentrant and use ESCDELAY and TABSIZE as we're not really
reentrant.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/lib/libcurses/curses.c
cvs rdiff -u -r1.61 -r1.62 src/lib/libcurses/curses_private.h
cvs rdiff -u -r1.13 -r1.14 src/lib/libcurses/get_wch.c
cvs rdiff -u -r1.64 -r1.65 src/lib/libcurses/getch.c
cvs rdiff -u -r1.10 -r1.11 src/lib/libcurses/ins_wch.c \
src/lib/libcurses/ins_wstr.c
cvs rdiff -u -r1.30 -r1.31 src/lib/libcurses/screen.c
cvs rdiff -u -r1.63 -r1.64 src/lib/libcurses/setterm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libcurses/curses.c
diff -u src/lib/libcurses/curses.c:1.27 src/lib/libcurses/curses.c:1.28
--- src/lib/libcurses/curses.c:1.27	Mon Jan 30 14:55:58 2017
+++ src/lib/libcurses/curses.c	Tue Jan 31 09:17:53 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: curses.c,v 1.27 2017/01/30 14:55:58 roy Exp $	*/
+/*	$NetBSD: curses.c,v 1.28 2017/01/31 09:17:53 roy Exp $	*/
 
 /*
  * Copyright (c) 1981, 1993, 1994
@@ -35,7 +35,7 @@
 #if 0
 static char sccsid[] = "@(#)curses.c	8.3 (Berkeley) 5/4/94";
 #else
-__RCSID("$NetBSD: curses.c,v 1.27 2017/01/30 14:55:58 roy Exp $");
+__RCSID("$NetBSD: curses.c,v 1.28 2017/01/31 09:17:53 roy Exp $");
 #endif
 #endif/* not lint */
 
@@ -67,6 +67,7 @@ SCREEN  *_cursesi_screen;   
 volatile bool	 _reentrant;		/* If true, some global vars are ro. */
 int	 COLS;/* Columns on the screen. */
 int	 LINES;/* Lines on the screen. */
+int	 ESCDELAY;			/* ms delay between keys for esc seq */
 int	 TABSIZE;			/* Size of a tab. */
 int	 COLORS;			/* Maximum colors on the screen */
 int	 COLOR_PAIRS = 0;		/* Maximum color pairs on the screen */

Index: src/lib/libcurses/curses_private.h
diff -u src/lib/libcurses/curses_private.h:1.61 src/lib/libcurses/curses_private.h:1.62
--- src/lib/libcurses/curses_private.h:1.61	Mon Jan 30 14:55:58 2017
+++ src/lib/libcurses/curses_private.h	Tue Jan 31 09:17:53 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: curses_private.h,v 1.61 2017/01/30 14:55:58 roy Exp $	*/
+/*	$NetBSD: curses_private.h,v 1.62 2017/01/31 09:17:53 roy Exp $	*/
 
 /*-
  * Copyright (c) 1998-2000 Brett Lymn
@@ -314,7 +314,6 @@ extern char	 __UPPERCASE;		/* Terminal i
 extern int	 My_term;		/* Use Def_term regardless. */
 extern const char	*Def_term;	/* Default terminal type. */
 extern SCREEN   *_cursesi_screen;   /* The current screen in use */
-extern volatile bool	 _reentrant;	/* If true, some global vars are ro. */
 
 /* Debugging options/functions. */
 #ifdef DEBUG

Index: src/lib/libcurses/get_wch.c
diff -u src/lib/libcurses/get_wch.c:1.13 src/lib/libcurses/get_wch.c:1.14
--- src/lib/libcurses/get_wch.c:1.13	Mon Jan 30 14:55:58 2017
+++ src/lib/libcurses/get_wch.c	Tue Jan 31 09:17:53 2017
@@ -1,4 +1,4 @@
-/*   $NetBSD: get_wch.c,v 1.13 2017/01/30 14:55:58 roy Exp $ */
+/*   $NetBSD: get_wch.c,v 1.14 2017/01/31 09:17:53 roy Exp $ */
 
 /*
  * Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: get_wch.c,v 1.13 2017/01/30 14:55:58 roy Exp $");
+__RCSID("$NetBSD: get_wch.c,v 1.14 2017/01/31 09:17:53 roy Exp $");
 #endif		  /* not lint */
 
 #include 
@@ -91,8 +91,6 @@ inkey(wchar_t *wc, int to, int delay)
 *working = &_cursesi_screen->cbuf_cur,
 *end = &_cursesi_screen->cbuf_tail;
 	char		*inbuf = &_cursesi_screen->cbuf[ 0 ];
-	int		escdelay = _reentrant ?
-			_cursesi_screen->ESCDELAY : ESCDELAY;
 
 #ifdef DEBUG
 	__CTRACE(__CTRACE_INPUT, "inkey (%p, %d, %d)\n", wc, to, delay);
@@ -141,11 +139,11 @@ inkey(wchar_t *wc, int to, int delay)
 		} else if (wstate == INKEY_ASSEMBLING) {
 			/* assembling a key sequence */
 			if (delay) {
-if (__timeout(to ? (escdelay / 100) : delay)
+if (__timeout(to ? (ESCDELAY / 100) : delay)
 		== ERR)
 	return ERR;
 			} else {
-if (to && (__timeout(escdelay / 100) == ERR))
+if (to && (__timeout(ESCDELAY / 100) == ERR))
 	return ERR;
 			}
 
@@ -191,11 +189,11 @@ inkey(wchar_t *wc, int to, int delay)
 		} else if (wstate == INKEY_WCASSEMBLING) {
 			/* assembling a wide-char sequence */
 			if (delay) {
-if (__timeout(to ? (escdelay / 100) : delay)
+if (__timeout(to ? (ESCDELAY / 100) : delay)
 		== ERR)
 	return ERR;
 			} else {
-if (to && (__timeout(escdelay / 100) == ERR))
+if (to && (__timeout(ESCDELAY / 100) == ERR))
 	return ERR;
 			}
 

Index: src/lib/libcurses/getch.c
diff -u src/lib/libcurses/getch.c:1.64 src/lib/libcurses/getch.c:1.65
--- src/lib/libcurses/getch.c:1.64	Mon Jan 30 16:50:44 2017
+++ src/lib/libcurses/getch.c	Tue Jan 31 09:17:53 

CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Jan 31 08:30:38 UTC 2017

Modified Files:
src/sys/dev/usb [nick-nhusb]: if_smsc.c

Log Message:
KNF


To generate a diff of this commit:
cvs rdiff -u -r1.22.2.18 -r1.22.2.19 src/sys/dev/usb/if_smsc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/usb/if_smsc.c
diff -u src/sys/dev/usb/if_smsc.c:1.22.2.18 src/sys/dev/usb/if_smsc.c:1.22.2.19
--- src/sys/dev/usb/if_smsc.c:1.22.2.18	Wed Dec 28 09:45:16 2016
+++ src/sys/dev/usb/if_smsc.c	Tue Jan 31 08:30:38 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_smsc.c,v 1.22.2.18 2016/12/28 09:45:16 skrll Exp $	*/
+/*	$NetBSD: if_smsc.c,v 1.22.2.19 2017/01/31 08:30:38 skrll Exp $	*/
 
 /*	$OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $	*/
 /* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
@@ -67,17 +67,15 @@
 
 #include 
 #include 
-#include 
-#include 
+#include 
+#include 
 #include 
 #include 
-#include 
 #include 
-#include 
-
-#include 
-
 #include 
+#include 
+#include 
+#include 
 
 #include 
 #include