 @@ -1,14 +1,14 @@
-/*	$NetBSD: atrun.c,v 1.19 2008/04/05 20:17:37 christos Exp $	*/
+/*	$NetBSD: atrun.c,v 1.20 2011/08/01 12:28:54 mbalmer Exp $	*/
 /*
  *  atrun.c - run jobs queued by at; run with root privileges.
  *  Copyright (C) 1993, 1994 Thomas Koenig
+ *
  * 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. The name of the author(s) may not be used to endorse or promote
  *    products derived from this software without specific prior written
  *    permission.
 @@ -49,27 +49,27 @@
 /* Local headers */
 #define MAIN
 #include "privs.h"
 #include "pathnames.h"
 #include "atrun.h"
 /* File scope variables */
 #if 0
 static char rcsid[] = "$OpenBSD: atrun.c,v 1.7 1997/09/08 22:12:10 millert Exp $";
 #else
-__RCSID("$NetBSD: atrun.c,v 1.19 2008/04/05 20:17:37 christos Exp $");
+__RCSID("$NetBSD: atrun.c,v 1.20 2011/08/01 12:28:54 mbalmer Exp $");
 #endif
 static int debug = 0;
 /* Local functions */
 static void perr(const char *, ...) __dead;
 static void perrx(const char *, ...) __dead;
 static int write_string(int, const char *);
 static void run_file(const char *, uid_t, gid_t);
 static void become_user(struct passwd *, uid_t);
 static const char nobody[] = "nobody";
 @@ -356,27 +356,27 @@ run_file(const char *filename, uid_t uid
 		perr("Exec failed for mail command `%s'", _PATH_SENDMAIL);
 		PRIV_END;
+	}
 	exit(EXIT_SUCCESS);
+}
 /* Global functions */
 int
 main(int argc, char *argv[])
+{
 	/*
-	 * Browse through  _PATH_ATJOBS, checking all the jobfiles wether
+	 * Browse through  _PATH_ATJOBS, checking all the jobfiles whether
 	 * they should be executed and or deleted. The queue is coded into
 	 * the first byte of the job filename, the date (in minutes since
 	 * Eon) as a hex number in the following eight bytes, followed by
 	 * a dot and a serial number.  A file which has not been executed
 	 * yet is denoted by its execute - bit set.  For those files which
 	 * are to be executed, run_file() is called, which forks off a
 	 * child which takes care of I/O redirection, forks off another
 	 * child for execution and yet another one, optionally, for sending
 	 * mail.  Files which already have run are removed during the
 	 * next invocation.
 	 */
 	DIR *spool;
 	struct dirent *dirent;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ams.c,v 1.27 2011/06/18 08:08:28 matt Exp $	*/
+/*	$NetBSD: ams.c,v 1.28 2011/08/01 12:28:53 mbalmer Exp $	*/
 /*
  * Copyright (C) 1998	Colin Wood
  * 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.
 @@ -21,27 +21,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ams.c,v 1.27 2011/06/18 08:08:28 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ams.c,v 1.28 2011/08/01 12:28:53 mbalmer Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/fcntl.h>
 #include <sys/poll.h>
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/signalvar.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/sysctl.h>
 #include <machine/autoconf.h>
 @@ -666,27 +666,27 @@ init_trackpad(struct ams_softc *sc)
 	cmd = ADBLISTEN(sc->adbaddr, 2);
 	adb_op_sync((Ptr)b3, NULL, (Ptr)0, cmd);
 	cmd = ADBLISTEN(sc->adbaddr, 1);
 	b2[7] = 0x03;
 	adb_op_sync((Ptr)b2, NULL, (Ptr)0, cmd);
 	buffer[0] = 0;
 	cmd = ADBFLUSH(sc->adbaddr);
 	adb_op_sync((Ptr)buffer, NULL, (Ptr)0, cmd);
 	/*
-	 * setup a sysctl node to control wether tapping the pad should
+	 * setup a sysctl node to control whether tapping the pad should
 	 * trigger mouse button events
 	 */
 	sc->sc_tapping = 1;
 	ret = sysctl_createv(NULL, 0, NULL, (const struct sysctlnode **)&me,
 	    CTLFLAG_READWRITE,
 	    CTLTYPE_NODE, sc->sc_dev.dv_xname, NULL,
 	    NULL, 0, NULL, 0,
 	    CTL_MACHDEP, CTL_CREATE, CTL_EOL);
 	ret=sysctl_createv(NULL, 0, NULL, (const struct sysctlnode **)&node,
 	    CTLFLAG_READWRITE | CTLFLAG_OWNDESC | CTLFLAG_IMMEDIATE,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: adb_ms.c,v 1.10 2011/07/28 16:28:12 macallan Exp $	*/
+/*	$NetBSD: adb_ms.c,v 1.11 2011/08/01 12:28:53 mbalmer Exp $	*/
 /*
  * Copyright (C) 1998	Colin Wood
  * Copyright (C) 2006, 2007 Michael Lorenz
  * 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
 @@ -22,27 +22,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adb_ms.c,v 1.10 2011/07/28 16:28:12 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb_ms.c,v 1.11 2011/08/01 12:28:53 mbalmer Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/fcntl.h>
 #include <sys/poll.h>
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/signalvar.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <machine/autoconf.h>
 @@ -714,27 +714,27 @@ init_trackpad(struct adbms_softc *sc)
 	cmd = ADBLISTEN(addr, 2);
 	adbms_send_sync(sc, cmd, 8, b2);
 	delay(1000);
 	cmd = ADBLISTEN(addr, 1);
 	buffer[6] = 0x03;
 	adbms_send_sync(sc, cmd, 8, buffer);
 	cmd = ADBFLUSH(addr);
 	adbms_send_sync(sc, cmd, 0, NULL);
 	delay(1000);
 	/*
-	 * setup a sysctl node to control wether tapping the pad should
+	 * setup a sysctl node to control whether tapping the pad should
 	 * trigger mouse button events
 	 */
 	sc->sc_tapping = 1;
 	ret = sysctl_createv(NULL, 0, NULL, &me,
 	    CTLFLAG_READWRITE,
 	    CTLTYPE_NODE, device_xname(sc->sc_dev), NULL,
 	    NULL, 0, NULL, 0,
 	    CTL_MACHDEP, CTL_CREATE, CTL_EOL);
 	ret = sysctl_createv(NULL, 0, NULL, &node,
 	    CTLFLAG_READWRITE | CTLFLAG_OWNDESC,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: smc90cx6var.h,v 1.9 2008/04/28 20:23:51 martin Exp $	*/
+/*	$NetBSD: smc90cx6var.h,v 1.10 2011/08/01 12:28:53 mbalmer Exp $	*/
 /*-
  * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Ignatios Souvatzis.
+ *
  * 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.
 @@ -28,27 +28,27 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * BAH (SMC 8bit ARCnet chipset) k/dpi
+ *
  * The SMC 8bit ARCnet chip family uses a register and a memory window, which
  * we get passed via bus_space_tags and bus_space_handles.
+ *
  * As the reset functionality differs between the Amiga boards (using the
  * 90c26 chip) and middle-aged ISA boards (using the 90c56 chip), we have
  * a sc_reset callback function in the softc, which does a stop function
- * (reset and leave dead) or a reset function depending on wether the 2nd
+ * (reset and leave dead) or a reset function depending on whether the 2nd
  * parameter is 0 or 1.
  */
 #ifndef _SMC90CX6VAR_H_
 #define _SMC90CX6VAR_H_
 #include <sys/callout.h>
 struct bah_softc {
 	struct	device		sc_dev;
 	struct	arccom		sc_arccom;	/* Common arcnet structures */
 	bus_space_tag_t		sc_bst_r, sc_bst_m;
 	bus_space_handle_t 	sc_regs, sc_mem;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tropic.c,v 1.42 2010/04/05 07:19:37 joerg Exp $	*/
+/*	$NetBSD: tropic.c,v 1.43 2011/08/01 12:28:53 mbalmer Exp $	*/
 /*
  * Ported to NetBSD by Onno van der Linden
  * Many thanks to Larry Lile for sending me the IBM TROPIC documentation.
+ *
  * Mach Operating System
  * Copyright (c) 1991 Carnegie Mellon University
  * Copyright (c) 1991 IBM Corporation
  * All Rights Reserved.
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
 @@ -24,27 +24,27 @@
+ *
  * Carnegie Mellon requests users of this software to return to
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tropic.c,v 1.42 2010/04/05 07:19:37 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tropic.c,v 1.43 2011/08/01 12:28:53 mbalmer Exp $");
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/mbuf.h>
 #include <sys/buf.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
 #include <sys/ioctl.h>
 @@ -201,27 +201,27 @@ tr_config(struct tr_softc *sc)
+		}
 		sc->sc_txca = SRB_INW(sc, sc->sc_srb, SRB_CFPRESP_FPXMIT);
 		sc->sc_srb = SRB_INW(sc, sc->sc_srb, SRB_CFPRESP_SRBADDR);
+	}
 	else {
 		if (sc->sc_init_status & RSP_16)
 			sc->sc_maxmtu = sc->sc_dhb16maxsz;
 		else
 			sc->sc_maxmtu = sc->sc_dhb4maxsz;
 /*
  * XXX Not completely true because Fast Path Transmit has 514 byte buffers
  * XXX and TR_MAX_LINK_HDR is only correct when source-routing is used.
- * XXX depending on wether source routing is used change the calculation
+ * XXX depending on whether source routing is used change the calculation
  * XXX use IFM_TOK_SRCRT (IFF_LINK0)
  * XXX recompute sc_minbuf !!
  */
 		sc->sc_maxmtu -= TR_MAX_LINK_HDR;
+	}
 	return 0;
+}
 int
 tr_attach(struct tr_softc *sc)
+{
 	int	nmedia, *mediaptr, *defmediaptr;
 	int	i, temp;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machfb.c,v 1.68 2011/06/29 03:15:18 macallan Exp $	*/
+/*	$NetBSD: machfb.c,v 1.69 2011/08/01 12:28:53 mbalmer Exp $	*/
 /*
  * Copyright (c) 2002 Bang Jun-Young
  * Copyright (c) 2005, 2006, 2007 Michael Lorenz
  * 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
 @@ -24,27 +24,27 @@
  * 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.
  */
 /*
  * Some code is derived from ATI Rage Pro and Derivatives Programmer's Guide.
  */
 #include <sys/cdefs.h>
 __KERNEL_RCSID(0,
-	"$NetBSD: machfb.c,v 1.68 2011/06/29 03:15:18 macallan Exp $");
+	"$NetBSD: machfb.c,v 1.69 2011/08/01 12:28:53 mbalmer Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/callout.h>
 #include <sys/lwp.h>
 #include <sys/kauth.h>
 #include <dev/videomode/videomode.h>
 #include <dev/videomode/edidvar.h>
 @@ -845,27 +845,27 @@ mach64_init_screen(void *cookie, struct
 	ri->ri_ops.erasecols = mach64_erasecols;
 	ri->ri_ops.cursor = mach64_cursor;
 	ri->ri_ops.putchar = mach64_putchar;
+}
 static void
 mach64_init(struct mach64_softc *sc)
+{
 	uint32_t *p32, saved_value;
 	uint8_t *p;
 	int need_swap;
 	/*
-	 * Test wether the aperture is byte swapped or not
+	 * Test whether the aperture is byte swapped or not
 	 */
 	p32 = (uint32_t*)sc->sc_aperture;
 	saved_value = *p32;
 	p = (uint8_t*)(u_long)sc->sc_aperture;
 	*p32 = 0x12345678;
 	if (p[0] == 0x12 && p[1] == 0x34 && p[2] == 0x56 && p[3] == 0x78)
 		need_swap = 0;
 	else
 		need_swap = 1;
 	if (need_swap) {
 		sc->sc_aperture = (char *)sc->sc_aperture + 0x800000;
 #if 0
 		/* what the fsck is this for? */

 @@ -22,27 +22,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT
  * OWNER 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.
  */
-static char const n8_id[] = "$Id: n8_sks.c,v 1.1 2008/10/30 12:02:15 darran Exp $";
+static char const n8_id[] = "$Id: n8_sks.c,v 1.2 2011/08/01 12:28:54 mbalmer Exp $";
 /*****************************************************************************/
 /** @file SKS_Management_Interface
  *  @brief Implementation for the SKS Management Interface.
+ *
  * Allows for the initialization and subsequent key management of associated
  * SKS PROMs.
+ *
  *****************************************************************************/
 /*****************************************************************************
  * Revision history:
+ *
 @@ -1006,27 +1006,27 @@ N8_Status_t N8_SKSFree(N8_SKSKeyHandle_t
 } /* N8_SKSFree */
 /*****************************************************************************
  * N8_SKSGetKeyHandle
  *****************************************************************************/
 /** @ingroup n8_sks
  * @brief Reads a key handle data from a named key entry for an SKS PROM.
+ *
  * @param systemKeyNode     RW: A char pointer, the named key entry.
  * @param keyHandle_p       WO: A N8_SKSKeyHandle_t pointer.
+ *
  * @par Externals:
- *    SKS_initialized_g     RW: A boolean value that indicates wether the SKS
+ *    SKS_initialized_g     RW: A boolean value that indicates whether the SKS
  *                              admin interface API has been initialized.
  * @return
  *    N8_STATUS_OK indicates the key read successfully completed.
  *    N8_UNEXPECTED_ERROR indicates an error reading the SKS key entry or that
  *      the API was not or could not be initialized.
+ *
  *****************************************************************************/
 N8_Status_t N8_SKSGetKeyHandle(const N8_Buffer_t* keyEntryName,
                                N8_SKSKeyHandle_t* keyHandle_p)
+{
    N8_Status_t ret = N8_STATUS_OK;
    char fullFileName[1024];

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rf_dagdegrd.c,v 1.27 2006/11/16 01:33:23 christos Exp $	*/
+/*	$NetBSD: rf_dagdegrd.c,v 1.28 2011/08/01 12:28:53 mbalmer Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
+ *
  * Author: Mark Holland, Daniel Stodolsky, William V. Courtright II
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
 @@ -23,27 +23,27 @@
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 /*
  * rf_dagdegrd.c
+ *
  * code for creating degraded read DAGs
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagdegrd.c,v 1.27 2006/11/16 01:33:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagdegrd.c,v 1.28 2011/08/01 12:28:53 mbalmer Exp $");
 #include <dev/raidframe/raidframevar.h>
 #include "rf_archs.h"
 #include "rf_raid.h"
 #include "rf_dag.h"
 #include "rf_dagutils.h"
 #include "rf_dagfuncs.h"
 #include "rf_debugMem.h"
 #include "rf_general.h"
 #include "rf_dagdegrd.h"
 #include "rf_map.h"
 @@ -711,27 +711,27 @@ rf_DD_GenerateFailedAccessASMs(RF_Raid_t
 	RF_SectorCount_t secPerSU = layoutPtr->sectorsPerStripeUnit;
 	int     numDataCol = layoutPtr->numDataCol;
 	int     state;
 	RF_SectorNum_t suoff, suend;
 	unsigned firstDataCol, napdas, count;
 	RF_SectorNum_t fone_start, fone_end, ftwo_start = 0, ftwo_end = 0;
 	RF_PhysDiskAddr_t *fone = asmap->failedPDAs[0], *ftwo = asmap->failedPDAs[1];
 	RF_PhysDiskAddr_t *pda_p;
 	RF_PhysDiskAddr_t *phys_p;
 	RF_RaidAddr_t sosAddr;
 	/* determine how many pda's we will have to generate per unaccess
 	 * stripe. If there is only one failed data unit, it is one; if two,
-	 * possibly two, depending wether they overlap. */
+	 * possibly two, depending whether they overlap. */
 	fone_start = rf_StripeUnitOffset(layoutPtr, fone->startSector);
 	fone_end = fone_start + fone->numSector;
 #define CONS_PDA(if,start,num) \
   pda_p->col = asmap->if->col; \
   pda_p->startSector = ((asmap->if->startSector / secPerSU) * secPerSU) + start; \
   pda_p->numSector = num; \
   pda_p->next = NULL; \
   RF_MallocAndAdd(pda_p->bufPtr,rf_RaidAddressToByte(raidPtr,num),(char *), allocList)
 	if (asmap->numDataFailed == 1) {
 		PDAPerDisk = 1;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rf_dagdegwr.c,v 1.30 2006/11/16 01:33:23 christos Exp $	*/
+/*	$NetBSD: rf_dagdegwr.c,v 1.31 2011/08/01 12:28:53 mbalmer Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
+ *
  * Author: Mark Holland, Daniel Stodolsky, William V. Courtright II
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
 @@ -24,27 +24,27 @@
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 /*
  * rf_dagdegwr.c
+ *
  * code for creating degraded write DAGs
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagdegwr.c,v 1.30 2006/11/16 01:33:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagdegwr.c,v 1.31 2011/08/01 12:28:53 mbalmer Exp $");
 #include <dev/raidframe/raidframevar.h>
 #include "rf_raid.h"
 #include "rf_dag.h"
 #include "rf_dagutils.h"
 #include "rf_dagfuncs.h"
 #include "rf_debugMem.h"
 #include "rf_general.h"
 #include "rf_dagdegwr.h"
 #include "rf_map.h"
 @@ -580,27 +580,27 @@ rf_WriteGenerateFailedAccessASMs(
 	RF_RaidLayout_t *layoutPtr = &(raidPtr->Layout);
 	int     PDAPerDisk, i;
 	RF_SectorCount_t secPerSU = layoutPtr->sectorsPerStripeUnit;
 	int     numDataCol = layoutPtr->numDataCol;
 	int     state;
 	unsigned napdas;
 	RF_SectorNum_t fone_start, fone_end, ftwo_start = 0, ftwo_end;
 	RF_PhysDiskAddr_t *fone = asmap->failedPDAs[0], *ftwo = asmap->failedPDAs[1];
 	RF_PhysDiskAddr_t *pda_p;
 	RF_RaidAddr_t sosAddr;
 	/* determine how many pda's we will have to generate per unaccess
 	 * stripe. If there is only one failed data unit, it is one; if two,
-	 * possibly two, depending wether they overlap. */
+	 * possibly two, depending whether they overlap. */
 	fone_start = rf_StripeUnitOffset(layoutPtr, fone->startSector);
 	fone_end = fone_start + fone->numSector;
 	if (asmap->numDataFailed == 1) {
 		PDAPerDisk = 1;
 		state = 1;
 		RF_MallocAndAdd(*pqpdap, 2 * sizeof(RF_PhysDiskAddr_t), (RF_PhysDiskAddr_t *), allocList);
 		pda_p = *pqpdap;
 		/* build p */
 		CONS_PDA(parityInfo, fone_start, fone->numSector);
 		pda_p->type = RF_PDA_TYPE_PARITY;
 		pda_p++;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rf_pqdegdags.c,v 1.12 2009/03/14 15:36:20 dsl Exp $	*/
+/*	$NetBSD: rf_pqdegdags.c,v 1.13 2011/08/01 12:28:53 mbalmer Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
+ *
  * Author: Daniel Stodolsky
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
 @@ -23,27 +23,27 @@
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 /*
  * rf_pqdegdags.c
  * Degraded mode dags for double fault cases.
 */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_pqdegdags.c,v 1.12 2009/03/14 15:36:20 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_pqdegdags.c,v 1.13 2011/08/01 12:28:53 mbalmer Exp $");
 #include "rf_archs.h"
 #if (RF_INCLUDE_DECL_PQ > 0) || (RF_INCLUDE_RAID6 > 0)
 #include <dev/raidframe/raidframevar.h>
 #include "rf_raid.h"
 #include "rf_dag.h"
 #include "rf_dagdegrd.h"
 #include "rf_dagdegwr.h"
 #include "rf_dagfuncs.h"
 #include "rf_dagutils.h"
 @@ -165,27 +165,27 @@ applyPDA(RF_Raid_t *raidPtr, RF_PhysDisk
 /*
    Recover data in the case of a double failure. There can be two
    result buffers, one for each chunk of data trying to be recovered.
    The params are pda's that have not been range restricted or otherwise
    politely massaged - this should be done here. The last params are the
    pdas of P and Q, followed by the raidPtr. The list can look like
    pda, pda, ... , p pda, q pda, raidptr, asm
    or
    pda, pda, ... , p_1 pda, p_2 pda, q_1 pda, q_2 pda, raidptr, asm
-   depending on wether two chunks of recovery data were required.
+   depending on whether two chunks of recovery data were required.
    The second condition only arises if there are two failed buffers
    whose lengths do not add up a stripe unit.
 */
 int
 rf_PQDoubleRecoveryFunc(RF_DagNode_t *node)
+{
 	int     np = node->numParams;
 	RF_AccessStripeMap_t *asmap = (RF_AccessStripeMap_t *) node->params[np - 1].p;
 	RF_Raid_t *raidPtr = (RF_Raid_t *) node->params[np - 2].p;
 	RF_RaidLayout_t *layoutPtr = (RF_RaidLayout_t *) & (raidPtr->Layout);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sysmon_envsys.c,v 1.116 2011/06/19 11:40:26 martin Exp $	*/
+/*	$NetBSD: sysmon_envsys.c,v 1.117 2011/08/01 12:28:53 mbalmer Exp $	*/
 /*-
  * Copyright (c) 2007, 2008 Juan Romero Pardines.
  * 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.
 @@ -54,27 +54,27 @@
  * 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.
  */
 /*
  * Environmental sensor framework for sysmon, exported to userland
  * with proplib(3).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.116 2011/06/19 11:40:26 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.117 2011/08/01 12:28:53 mbalmer Exp $");
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/conf.h>
 #include <sys/errno.h>
 #include <sys/fcntl.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/mutex.h>
 #include <sys/kmem.h>
 /* #define ENVSYS_DEBUG */
 @@ -1364,27 +1364,27 @@ sme_add_sensor_dictionary(struct sysmon_
 		sme_evdrv_t->sed_powertype = sdt->crittype;
+	}
 out:
 	return sme_evdrv_t;
 bad:
 	prop_object_release(dict);
 	return NULL;
+}
 /*
  * Find the maximum of all currently reported values.
- * The provided callback decides wether a sensor is part of the
+ * The provided callback decides whether a sensor is part of the
  * maximum calculation (by returning true) or ignored (callback
  * returns false). Example usage: callback selects temperature
  * sensors in a given thermal zone, the function calculates the
  * maximum currently reported temperature in this zone.
  * If the parameter "refresh" is true, new values will be aquired
  * from the hardware, if not, the last reported value will be used.
  */
 uint32_t
 sysmon_envsys_get_max_value(bool (*predicate)(const envsys_data_t*),
 	bool refresh)
+{
 	struct sysmon_envsys *sme;
 	uint32_t maxv, v;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tls.c,v 1.6 2011/05/24 13:26:41 joerg Exp $	*/
+/*	$NetBSD: tls.c,v 1.7 2011/08/01 12:28:53 mbalmer Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Martin Sch�tte.
+ *
  * 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.
 @@ -35,27 +35,27 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * tls.c TLS related code for syslogd
+ *
  * implements the TLS init and handshake callbacks with all required
  * checks from http://tools.ietf.org/html/draft-ietf-syslog-transport-tls-13
+ *
  * Martin Sch�tte
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: tls.c,v 1.6 2011/05/24 13:26:41 joerg Exp $");
+__RCSID("$NetBSD: tls.c,v 1.7 2011/08/01 12:28:53 mbalmer Exp $");
 #ifndef DISABLE_TLS
 #include "syslogd.h"
 #include "tls.h"
 #include <netinet/in.h>
 #include <ifaddrs.h>
 #include "extern.h"
 static unsigned getVerifySetting(const char *x509verifystring);
 /* to output SSL error codes */
 static const char *SSL_ERRCODE[] = {
 	"SSL_ERROR_NONE",
 @@ -655,27 +655,27 @@ deny_cert(struct tls_conn_settings *conn
 		    "already approved certificate became invalid. "
 		    "Subject is \"%s\", fingerprint is \"%s\"",
 		    conn_info->incoming ? "client" : "server",
 		    cur_subjectline, cur_fingerprint);
 	FREEPTR(cur_fingerprint);
 	FREEPTR(cur_subjectline);
 	return 0;
+}
 /*
  * Callback after OpenSSL has verified a peer certificate,
  * gets called for every certificate in a chain (starting with root CA).
  * preverify_ok indicates a valid trust path (necessary),
- * then we check wether the hostname or configured subject matches the cert.
+ * then we check whether the hostname or configured subject matches the cert.
  */
 int
 check_peer_cert(int preverify_ok, X509_STORE_CTX *ctx)
+{
 	char *cur_subjectline = NULL;
 	char *cur_fingerprint = NULL;
 	char cur_issuerline[256];
 	SSL *ssl;
 	X509 *cur_cert;
 	int cur_err, cur_depth;
 	struct tls_conn_settings *conn_info;
 	struct peer_cred *cred, *tmp_cred;

 @@ -1,23 +1,23 @@
 ######## TERMINAL TYPE DESCRIPTIONS SOURCE FILE
+#
 # This version of terminfo.src is distributed with ncurses and is maintained
 # by Thomas E. Dickey (TD).
+#
 # Report bugs and new terminal descriptions to
 #	bug-ncurses@gnu.org
+#
-#	$Revision: 1.3 $
+#	$Revision: 1.4 $
-#	$Date: 2011/06/19 16:27:23 $
+#	$Date: 2011/08/01 12:28:54 $
+#
 # The original header is preserved below for reference.  It is noted that there
 # is a "newer" version which differs in some cosmetic details (but actually
 # stopped updates several years ago); we have decided to not change the header
 # unless there is also a change in content.
+#
 # To further muddy the waters, it is noted that changes to this file as part of
 # maintenance of ncurses (since 1996) are generally conceded to be copyright
 # under the ncurses MIT-style license.  That was the effect of the agreement
 # which the principal authors of ncurses made in 1998.  However, since much of
 # the file itself is of unknown authorship (and the disclaimer below makes it
 # obvious that Raymond cannot or will not convey rights over those parts),
 # there is no explicit copyright notice on the file itself.
 @@ -9071,27 +9071,27 @@ wy85-w|wyse85-w|wyse 85 in 132-column mo
 	rs2=\E[35h\E[?3h$<70>, use=wy85,
+#
 #	Wyse 85 in 132-column mode with visual bell.
 wy85-wvb|wyse85-wvb|wyse 85 with visible bell 132-columns,
 	bel@, use=wy85-w,
 # From: Kevin Turner <kevint@aracnet.com>, 12 Jul 1998
 # This copes with an apparent firmware bug in the wy85.  He writes:
 # "What I did was change leave the terminal cursor keys set to Normal
 # (instead of application), and change \E[ to \233 for all the keys in
 # terminfo. At one point, I found some reference indicating that this
 # terminal bug (not sending \E[) was acknowledged by Wyse (so it's not just
 # me), but I can't find that and the server under my bookmark to "Wyse
-# Technical" isn't responding.  So there's the question of wether the wy85
+# Technical" isn't responding.  So there's the question of whether the wy85
 # terminfo should reflect the manufactuer's intended behaviour of the terminal
 # or the actual."
 wy85-8bit|wyse85-8bit|wyse 85 in 8-bit mode,
 	am, hs, mc5i, mir, msgr, xenl, xon,
 	cols#80, it#8, lines#24, wsl#80,
 	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
 	bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
 	clear=\E[H\E[J$<110>, cnorm=\E[?25h, cr=^M,
 	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
 	cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
 	cup=\E[%i%p1%d;%p2%dH$<1>, cuu=\E[%p1%dA, cuu1=\E[A,
 	dch=\E[%p1%dP$<3*>, dch1=\E[P$<3>, dim=\E[2m,
 	dl=\E[%p1%dM$<3*>, dl1=\E[M$<3>, dsl=\E[40l,