Module Name: src
Committed By: andvar
Date: Sun Aug 1 15:29:30 UTC 2021
Modified Files:
src/lib/libutil: pidfile.c
src/sys/arch/emips/conf: RAMDISK
src/sys/arch/pmax/conf: RAMDISK RAMDISK64
src/sys/dev/qbus: if_de.c if_il.c
src/sys/dev/raidframe: rf_pqdegdags.c
src/usr.bin/ftp: fetch.c
Log Message:
fix typos in word "otherwise".
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/libutil/pidfile.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/emips/conf/RAMDISK
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/pmax/conf/RAMDISK
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/pmax/conf/RAMDISK64
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/qbus/if_de.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/qbus/if_il.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/raidframe/rf_pqdegdags.c
cvs rdiff -u -r1.233 -r1.234 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/lib/libutil/pidfile.c
diff -u src/lib/libutil/pidfile.c:1.15 src/lib/libutil/pidfile.c:1.16
--- src/lib/libutil/pidfile.c:1.15 Fri Dec 27 09:45:26 2019
+++ src/lib/libutil/pidfile.c Sun Aug 1 15:29:29 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pidfile.c,v 1.15 2019/12/27 09:45:26 msaitoh Exp $ */
+/* $NetBSD: pidfile.c,v 1.16 2021/08/01 15:29:29 andvar Exp $ */
/*-
* Copyright (c) 1999, 2016 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: pidfile.c,v 1.15 2019/12/27 09:45:26 msaitoh Exp $");
+__RCSID("$NetBSD: pidfile.c,v 1.16 2021/08/01 15:29:29 andvar Exp $");
#endif
#include <sys/param.h>
@@ -130,7 +130,7 @@ pidfile_varrun_path(char *path, size_t l
}
/* Returns the process ID inside path on success, otherwise -1.
- * If no path is given, use the last pidfile path, othewise the default one. */
+ * If no path is given, use the last pidfile path, otherwise the default one. */
pid_t
pidfile_read(const char *path)
{
Index: src/sys/arch/emips/conf/RAMDISK
diff -u src/sys/arch/emips/conf/RAMDISK:1.4 src/sys/arch/emips/conf/RAMDISK:1.5
--- src/sys/arch/emips/conf/RAMDISK:1.4 Sun Mar 31 16:10:27 2019
+++ src/sys/arch/emips/conf/RAMDISK Sun Aug 1 15:29:29 2021
@@ -1,8 +1,8 @@
-# $NetBSD: RAMDISK,v 1.4 2019/03/31 16:10:27 christos Exp $
+# $NetBSD: RAMDISK,v 1.5 2021/08/01 15:29:29 andvar Exp $
#
# Install kernel with ramdisk added.
# The ramdisk is be too big to netboot directly via ECOFF on some machines,
-# so keep it otherise identical to INSTALL.
+# so keep it otherwise identical to INSTALL.
#
# Pull in standard `install' config
Index: src/sys/arch/pmax/conf/RAMDISK
diff -u src/sys/arch/pmax/conf/RAMDISK:1.18 src/sys/arch/pmax/conf/RAMDISK:1.19
--- src/sys/arch/pmax/conf/RAMDISK:1.18 Wed Jun 26 07:33:19 2019
+++ src/sys/arch/pmax/conf/RAMDISK Sun Aug 1 15:29:29 2021
@@ -1,8 +1,8 @@
-# $NetBSD: RAMDISK,v 1.18 2019/06/26 07:33:19 martin Exp $
+# $NetBSD: RAMDISK,v 1.19 2021/08/01 15:29:29 andvar Exp $
#
# Install kernel with ramdisk added.
# The ramdisk is be too big to netboot directly via ECOFF on some machines,
-# so keep it otherise identical to INSTALL.
+# so keep it otherwise identical to INSTALL.
#
# Pull in standard `install' config
Index: src/sys/arch/pmax/conf/RAMDISK64
diff -u src/sys/arch/pmax/conf/RAMDISK64:1.7 src/sys/arch/pmax/conf/RAMDISK64:1.8
--- src/sys/arch/pmax/conf/RAMDISK64:1.7 Mon Sep 7 09:14:47 2020
+++ src/sys/arch/pmax/conf/RAMDISK64 Sun Aug 1 15:29:29 2021
@@ -1,8 +1,8 @@
-# $NetBSD: RAMDISK64,v 1.7 2020/09/07 09:14:47 mrg Exp $
+# $NetBSD: RAMDISK64,v 1.8 2021/08/01 15:29:29 andvar Exp $
#
# Install kernel with ramdisk added.
# The ramdisk is be too big to netboot directly via ECOFF on some machines,
-# so keep it otherise identical to INSTALL.
+# so keep it otherwise identical to INSTALL.
#
# Pull in standard `install' config
Index: src/sys/dev/qbus/if_de.c
diff -u src/sys/dev/qbus/if_de.c:1.35 src/sys/dev/qbus/if_de.c:1.36
--- src/sys/dev/qbus/if_de.c:1.35 Wed Jan 29 05:57:21 2020
+++ src/sys/dev/qbus/if_de.c Sun Aug 1 15:29:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_de.c,v 1.35 2020/01/29 05:57:21 thorpej Exp $ */
+/* $NetBSD: if_de.c,v 1.36 2021/08/01 15:29:30 andvar Exp $ */
/*
* Copyright (c) 1982, 1986, 1989 Regents of the University of California.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.35 2020/01/29 05:57:21 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.36 2021/08/01 15:29:30 andvar Exp $");
#include "opt_inet.h"
@@ -514,7 +514,7 @@ deintr(void *arg)
* If input error just drop packet.
* Otherwise purge input buffered data path and examine
* packet to determine type. If can't determine length
- * from type, then have to drop packet. Othewise decapsulate
+ * from type, then have to drop packet. Otherwise decapsulate
* packet based on type and pass to type specific higher-level
* input routine.
*/
Index: src/sys/dev/qbus/if_il.c
diff -u src/sys/dev/qbus/if_il.c:1.36 src/sys/dev/qbus/if_il.c:1.37
--- src/sys/dev/qbus/if_il.c:1.36 Mon Oct 21 08:22:06 2019
+++ src/sys/dev/qbus/if_il.c Sun Aug 1 15:29:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_il.c,v 1.36 2019/10/21 08:22:06 msaitoh Exp $ */
+/* $NetBSD: if_il.c,v 1.37 2021/08/01 15:29:30 andvar Exp $ */
/*
* Copyright (c) 1982, 1986 Regents of the University of California.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_il.c,v 1.36 2019/10/21 08:22:06 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_il.c,v 1.37 2021/08/01 15:29:30 andvar Exp $");
#include "opt_inet.h"
@@ -497,7 +497,7 @@ ilcint(void *arg)
* If input error just drop packet.
* Otherwise purge input buffered data path and examine
* packet to determine type. If can't determine length
- * from type, then have to drop packet. Othewise decapsulate
+ * from type, then have to drop packet. Otherwise decapsulate
* packet based on type and pass to type specific higher-level
* input routine.
*/
Index: src/sys/dev/raidframe/rf_pqdegdags.c
diff -u src/sys/dev/raidframe/rf_pqdegdags.c:1.13 src/sys/dev/raidframe/rf_pqdegdags.c:1.14
--- src/sys/dev/raidframe/rf_pqdegdags.c:1.13 Mon Aug 1 12:28:53 2011
+++ src/sys/dev/raidframe/rf_pqdegdags.c Sun Aug 1 15:29:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_pqdegdags.c,v 1.13 2011/08/01 12:28:53 mbalmer Exp $ */
+/* $NetBSD: rf_pqdegdags.c,v 1.14 2021/08/01 15:29:30 andvar Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_pqdegdags.c,v 1.13 2011/08/01 12:28:53 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_pqdegdags.c,v 1.14 2021/08/01 15:29:30 andvar Exp $");
#include "rf_archs.h"
@@ -287,7 +287,7 @@ rf_PQWriteDoubleRecoveryFunc(RF_DagNode_
* & Q to recover the second failed data unit in P. Zero fill Q, then
* apply the recovered data to p. Then apply the data being written to
* the failed drive. Then walk through the surviving drives, applying
- * new data when it exists, othewise the recovery data. Quite a mess.
+ * new data when it exists, otherwise the recovery data. Quite a mess.
*
*
* The params
Index: src/usr.bin/ftp/fetch.c
diff -u src/usr.bin/ftp/fetch.c:1.233 src/usr.bin/ftp/fetch.c:1.234
--- src/usr.bin/ftp/fetch.c:1.233 Tue Jul 6 09:26:47 2021
+++ src/usr.bin/ftp/fetch.c Sun Aug 1 15:29:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fetch.c,v 1.233 2021/07/06 09:26:47 christos Exp $ */
+/* $NetBSD: fetch.c,v 1.234 2021/08/01 15:29:30 andvar Exp $ */
/*-
* Copyright (c) 1997-2015 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: fetch.c,v 1.233 2021/07/06 09:26:47 christos Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.234 2021/08/01 15:29:30 andvar Exp $");
#endif /* not lint */
/*
@@ -2245,7 +2245,7 @@ go_fetch(const char *url)
/*
* Try FTP URL-style and host:file arguments next.
* If ftpproxy is set with an FTP URL, use fetch_url()
- * Othewise, use fetch_ftp().
+ * Otherwise, use fetch_ftp().
*/
proxyenv = getoptionvalue("ftp_proxy");
if (!EMPTYSTRING(proxyenv) && STRNEQUAL(url, FTP_URL))
