diff --git a/bin/pax/file_subs.c b/bin/pax/file_subs.c index 368f1a22608c..8ebb185d0e65 100644 --- a/bin/pax/file_subs.c +++ b/bin/pax/file_subs.c @@ -1,4 +1,4 @@ -/* $NetBSD: file_subs.c,v 1.27 2002/12/19 14:23:53 grant Exp $ */ +/* $NetBSD: file_subs.c,v 1.28 2003/01/06 20:30:28 wiz Exp $ */ /*- * Copyright (c) 1992 Keith Muller. @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)file_subs.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: file_subs.c,v 1.27 2002/12/19 14:23:53 grant Exp $"); +__RCSID("$NetBSD: file_subs.c,v 1.28 2003/01/06 20:30:28 wiz Exp $"); #endif #endif /* not lint */ @@ -589,7 +589,7 @@ unlnk_exist(char *name, int type) * chk_path() * We were trying to create some kind of node in the file system and it * failed. chk_path() makes sure the path up to the node exists and is - * writeable. When we have to create a directory that is missing along the + * writable. When we have to create a directory that is missing along the * path somewhere, the directory we create will be set to the same * uid/gid as the file has (when uid and gid are being preserved). * NOTE: this routine is a real performance loss. It is only used as a diff --git a/bin/pax/tables.c b/bin/pax/tables.c index 8a2f70498d15..8efc96cfedfb 100644 --- a/bin/pax/tables.c +++ b/bin/pax/tables.c @@ -1,4 +1,4 @@ -/* $NetBSD: tables.c,v 1.18 2002/10/12 15:39:30 christos Exp $ */ +/* $NetBSD: tables.c,v 1.19 2003/01/06 20:30:29 wiz Exp $ */ /*- * Copyright (c) 1992 Keith Muller. @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = "@(#)tables.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: tables.c,v 1.18 2002/10/12 15:39:30 christos Exp $"); +__RCSID("$NetBSD: tables.c,v 1.19 2003/01/06 20:30:29 wiz Exp $"); #endif #endif /* not lint */ @@ -1133,7 +1133,7 @@ dir_start(void) * frc_mode is a flag that says whether to force the setting of the mode * (ignoring the user set values for preserving file mode). Frc_mode is * for the case where we created a file and found that the resulting - * directory was not writeable and the user asked for file modes to NOT + * directory was not writable and the user asked for file modes to NOT * be preserved. (we have to preserve what was created by default, so we * have to force the setting at the end. this is stated explicitly in the * pax spec) diff --git a/dist/pdisk/cvt_pt.c b/dist/pdisk/cvt_pt.c index 8f03cd0885a3..fe75d966ff91 100644 --- a/dist/pdisk/cvt_pt.c +++ b/dist/pdisk/cvt_pt.c @@ -1,7 +1,7 @@ /* * cvt_pt.c * - * Covert partition type. $Revision: 1.2 $ + * Covert partition type. $Revision: 1.3 $ * * Copyright (c) 1999, Eryk Vershen * @@ -180,8 +180,8 @@ process(char *filename) // 3) verify the type for the partition; - if (map->writeable == 0) { - fatal(-1, "The map is not writeable"); + if (map->writable == 0) { + fatal(-1, "The map is not writable"); return; } diff --git a/dist/pdisk/dump.c b/dist/pdisk/dump.c index fc1f93709806..6d1a9f5e4363 100644 --- a/dist/pdisk/dump.c +++ b/dist/pdisk/dump.c @@ -448,7 +448,7 @@ show_data_structures(partition_map_header *map) printf("map %d blocks out of %d, media %lu blocks (%d byte blocks)\n", map->blocks_in_map, map->maximum_in_map, map->media_size, map->logical_block); - printf("Map is%s writeable", (map->writeable)?kStringEmpty:kStringNot); + printf("Map is%s writable", (map->writable)?kStringEmpty:kStringNot); printf(", but%s changed", (map->changed)?kStringEmpty:kStringNot); printf(" and has%s been written\n", (map->written)?kStringEmpty:kStringNot); printf("\n"); diff --git a/dist/pdisk/partition_map.c b/dist/pdisk/partition_map.c index 1cea3ea4b957..0e3a49c4bbca 100644 --- a/dist/pdisk/partition_map.c +++ b/dist/pdisk/partition_map.c @@ -119,7 +119,7 @@ open_partition_map(char *name, int *valid_file, int ask_logical_size) { MEDIA m; partition_map_header * map; - int writeable; + int writable; int size; m = open_pathname_as_media(name, (rflag)?O_RDONLY:O_RDWR); @@ -130,10 +130,10 @@ open_partition_map(char *name, int *valid_file, int ask_logical_size) *valid_file = 0; return NULL; } else { - writeable = 0; + writable = 0; } } else { - writeable = 1; + writable = 1; } *valid_file = 1; @@ -144,7 +144,7 @@ open_partition_map(char *name, int *valid_file, int ask_logical_size) return NULL; } map->name = name; - map->writeable = (rflag)?0:writeable; + map->writable = (rflag)?0:writable; map->changed = 0; map->written = 0; map->disk_order = NULL; @@ -448,7 +448,7 @@ create_partition_map(char *name, partition_map_header *oldmap) return NULL; } map->name = name; - map->writeable = (rflag)?0:1; + map->writable = (rflag)?0:1; map->changed = 1; map->disk_order = NULL; map->base_order = NULL; diff --git a/dist/pdisk/partition_map.h b/dist/pdisk/partition_map.h index 096818abbde9..c626281b82eb 100644 --- a/dist/pdisk/partition_map.h +++ b/dist/pdisk/partition_map.h @@ -48,7 +48,7 @@ struct partition_map_header { struct partition_map * disk_order; struct partition_map * base_order; Block0 *misc; - int writeable; + int writable; int changed; int written; int physical_block; // must be == sbBlockSize diff --git a/dist/pdisk/pdisk.c b/dist/pdisk/pdisk.c index 88a155953a16..affce23c00ad 100644 --- a/dist/pdisk/pdisk.c +++ b/dist/pdisk/pdisk.c @@ -648,8 +648,8 @@ do_create_partition(partition_map_header *map, int get_type) bad_input("No partition map exists"); return; } - if (!rflag && map->writeable == 0) { - printf("The map is not writeable.\n"); + if (!rflag && map->writable == 0) { + printf("The map is not writable.\n"); } // XXX add help feature (i.e. '?' in any argument routine prints help string) if (get_base_argument(&base, map) == 0) { @@ -765,8 +765,8 @@ do_rename_partition(partition_map_header *map) bad_input("No partition map exists"); return; } - if (!rflag && map->writeable == 0) { - printf("The map is not writeable.\n"); + if (!rflag && map->writable == 0) { + printf("The map is not writable.\n"); } if (get_number_argument("Partition number: ", &index, kDefault) == 0) { bad_input("Bad partition number"); @@ -801,8 +801,8 @@ do_delete_partition(partition_map_header *map) bad_input("No partition map exists"); return; } - if (!rflag && map->writeable == 0) { - printf("The map is not writeable.\n"); + if (!rflag && map->writable == 0) { + printf("The map is not writable.\n"); } if (get_number_argument("Partition number: ", &index, kDefault) == 0) { bad_input("Bad partition number"); @@ -829,8 +829,8 @@ do_reorder(partition_map_header *map) bad_input("No partition map exists"); return; } - if (!rflag && map->writeable == 0) { - printf("The map is not writeable.\n"); + if (!rflag && map->writable == 0) { + printf("The map is not writable.\n"); } if (get_number_argument("Partition number: ", &old_index, kDefault) == 0) { bad_input("Bad partition number"); @@ -856,8 +856,8 @@ do_write_partition_map(partition_map_header *map) bad_input("The map has not been changed."); return; } - if (map->writeable == 0) { - bad_input("The map is not writeable."); + if (map->writable == 0) { + bad_input("The map is not writable."); return; } #if 0 /* this check is not found in linux fdisk-0.1 */ @@ -973,8 +973,8 @@ do_change_map_size(partition_map_header *map) bad_input("No partition map exists"); return; } - if (!rflag && map->writeable == 0) { - printf("The map is not writeable.\n"); + if (!rflag && map->writable == 0) { + printf("The map is not writable.\n"); } if (get_number_argument("New size: ", &size, kDefault) == 0) { bad_input("Bad size"); diff --git a/distrib/alpha/rz25dist/rc.hack b/distrib/alpha/rz25dist/rc.hack index 7b393e3548c8..e57458b59e15 100644 --- a/distrib/alpha/rz25dist/rc.hack +++ b/distrib/alpha/rz25dist/rc.hack @@ -1,4 +1,4 @@ -# $NetBSD: rc.hack,v 1.4 1997/04/18 18:05:26 cgd Exp $ +# $NetBSD: rc.hack,v 1.5 2003/01/06 20:30:42 wiz Exp $ # Hackish /etc/rc to do basic setup for a distribution rz25 image to # make it slightly easier to use. @@ -41,7 +41,7 @@ cd|sd|wd) ;; esac -# If /tmp is already writeable, we've already been run... punt! +# If /tmp is already writable, we've already been run... punt! if [ -w /tmp ]; then echo "" case $root_dev_base in diff --git a/distrib/sets/maketars b/distrib/sets/maketars index e92360d1f690..8f553f51d1c6 100755 --- a/distrib/sets/maketars +++ b/distrib/sets/maketars @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: maketars,v 1.36 2003/01/03 15:26:32 lukem Exp $ +# $NetBSD: maketars,v 1.37 2003/01/06 20:30:42 wiz Exp $ # # Make release tar files for some or all lists. Usage: # maketars [-b] [-x] [-i installdir] [-a arch] [-m machine] [-s setsdir] @@ -113,7 +113,7 @@ if [ ! -d /tmp ]; then fi if [ ! -w /tmp ]; then - echo /tmp is not writeable + echo /tmp is not writable exit 1 fi diff --git a/etc/postinstall b/etc/postinstall index e765937c8b59..db0597694a06 100755 --- a/etc/postinstall +++ b/etc/postinstall @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: postinstall,v 1.44 2002/12/30 13:16:43 tron Exp $ +# $NetBSD: postinstall,v 1.45 2003/01/06 20:30:29 wiz Exp $ # # Copyright (c) 2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -776,7 +776,7 @@ mkdtemp () { # Make sure we don't loop forever if mkdir will always fail. [ -d /tmp ] || err 1 /tmp is not a directory - [ -w /tmp ] || err 1 /tmp is not writeable + [ -w /tmp ] || err 1 /tmp is not writable _base=/tmp/_postinstall.$$ _serial=0 diff --git a/etc/security b/etc/security index 761c30c34d8a..ae6f259b36ee 100644 --- a/etc/security +++ b/etc/security @@ -1,6 +1,6 @@ #!/bin/sh - # -# $NetBSD: security,v 1.79 2002/08/20 07:53:51 elric Exp $ +# $NetBSD: security,v 1.80 2003/01/06 20:30:30 wiz Exp $ # from: @(#)security 8.1 (Berkeley) 6/9/93 # @@ -303,10 +303,10 @@ if checkyesno check_rootdotfiles; then egrep '^[ \t]*umask[ \t]+[0-7]+' $i | awk '{ if ($2 ~ /^.$/ || $2 ~! /[^2367].$/) { - print "\tRoot umask is group writeable" + print "\tRoot umask is group writable" } if ($2 ~ /[^2367]$/) { - print "\tRoot umask is other writeable" + print "\tRoot umask is other writable" } }' | sort -u SAVE_PATH=$PATH @@ -323,9 +323,9 @@ end-of-csh } } $1 ~ /^d....w/ \ - { print "\tRoot path directory " $10 " is group writeable." } \ + { print "\tRoot path directory " $10 " is group writable." } \ $1 ~ /^d.......w/ \ - { print "\tRoot path directory " $10 " is other writeable." }' \ + { print "\tRoot path directory " $10 " is other writable." }' \ < $TMP1 fi done > $OUTPUT @@ -348,9 +348,9 @@ end-of-csh fi egrep umask $i | awk '$2 ~ /^.$/ || $2 ~ /[^2367].$/ \ - { print "\tRoot umask is group writeable" } \ + { print "\tRoot umask is group writable" } \ $2 ~ /[^2367]$/ \ - { print "\tRoot umask is other writeable" }' + { print "\tRoot umask is other writable" }' SAVE_PATH=$PATH unset PATH /bin/sh << end-of-sh > /dev/null 2>&1 @@ -367,9 +367,9 @@ end-of-sh } } $1 ~ /^d....w/ \ - { print "\tRoot path directory " $10 " is group writeable." } \ + { print "\tRoot path directory " $10 " is group writable." } \ $1 ~ /^d.......w/ \ - { print "\tRoot path directory " $10 " is other writeable." }' \ + { print "\tRoot path directory " $10 " is other writable." }' \ < $TMP1 fi @@ -450,7 +450,7 @@ if checkyesno check_rhosts; then fi # Check home directories. Directories should not be owned by someone else -# or writeable. +# or writable. # if checkyesno check_homes; then while read uid homedir; do @@ -462,9 +462,9 @@ if checkyesno check_homes; then awk '$1 != $4 && $4 != "root" \ { print "user " $1 " home directory is owned by " $4 } $2 ~ /^-....w/ \ - { print "user " $1 " home directory is group writeable" } + { print "user " $1 " home directory is group writable" } $2 ~ /^-.......w/ \ - { print "user " $1 " home directory is other writeable" }' \ + { print "user " $1 " home directory is other writable" }' \ > $OUTPUT if [ -s $OUTPUT ] ; then printf "\nChecking home directories.\n" @@ -488,12 +488,12 @@ if checkyesno check_homes; then $3 ~ /^-......r/ \ { print "user " $1 " " $2 " file is other readable" } $3 ~ /^-....w/ \ - { print "user " $1 " " $2 " file is group writeable" } + { print "user " $1 " " $2 " file is group writable" } $3 ~ /^-.......w/ \ - { print "user " $1 " " $2 " file is other writeable" }' \ + { print "user " $1 " " $2 " file is other writable" }' \ > $OUTPUT - # Files that should not be owned by someone else or writeable. + # Files that should not be owned by someone else or writable. list=".bash_history .bash_login .bash_logout .bash_profile .bashrc \ .cshrc .emacs .exrc .forward .history .k5login .klogin .login \ .logout .profile .qmail .rc_history .rhosts .shosts ssh .tcshrc \ @@ -512,9 +512,9 @@ if checkyesno check_homes; then awk '$1 != $5 && $5 != "root" \ { print "user " $1 " " $2 " file is owned by " $5 } $3 ~ /^-....w/ \ - { print "user " $1 " " $2 " file is group writeable" } + { print "user " $1 " " $2 " file is group writable" } $3 ~ /^-.......w/ \ - { print "user " $1 " " $2 " file is other writeable" }' \ + { print "user " $1 " " $2 " file is other writable" }' \ >> $OUTPUT if [ -s $OUTPUT ] ; then printf "\nChecking dot files.\n" @@ -635,7 +635,7 @@ if checkyesno check_devices; then fi # Check for block and character disk devices that are readable or - # writeable or not owned by root.operator. + # writable or not owned by root.operator. >$TMP1 DISKLIST="ccd ch hk hp ld md ra raid rb rd rl rx \ sd se ss uk up vnd wd xd xy" diff --git a/gnu/libexec/uucp/common_sources/system.h b/gnu/libexec/uucp/common_sources/system.h index 5fcc525f9841..0527e7ead9a2 100644 --- a/gnu/libexec/uucp/common_sources/system.h +++ b/gnu/libexec/uucp/common_sources/system.h @@ -448,9 +448,9 @@ extern openfile_t esysdep_open_receive P((const struct uuconf_system *qsys, location. The zto argument is the file to create. The zorig argument is the name of the file to move. If fmkdirs is TRUE, then any necessary directories are created; fpublic indicates whether - they should be publically writeable or not. If fcheck is TRUE, - this should make sure the directory is writeable by the user zuser - (if zuser is NULL, then it must be writeable by any user); this is + they should be publically writable or not. If fcheck is TRUE, + this should make sure the directory is writable by the user zuser + (if zuser is NULL, then it must be writable by any user); this is to avoid a window of vulnerability between fsysdep_in_directory and fsysdep_move_file. This function should return FALSE on error, in which case the zorig file should still exist. */ diff --git a/gnu/libexec/uucp/doc/uucp.texi b/gnu/libexec/uucp/doc/uucp.texi index ea093f08b023..c702ec92c167 100644 --- a/gnu/libexec/uucp/doc/uucp.texi +++ b/gnu/libexec/uucp/doc/uucp.texi @@ -4843,7 +4843,7 @@ requested by a local user. The default is @samp{~}. Specifies that files may be received into the named directories when requested by the remote system. The default is @samp{~}. On Unix, the remote system may only request that files be received into directories -that are writeable by the world, regardless of how this is set. +that are writable by the world, regardless of how this is set. @item forward-to @var{strings} @findex forward-to @@ -5649,8 +5649,8 @@ Keywords: UUCP, protocol, FAQ Approved: news-answers-request@@MIT.Edu Archive-name: uucp-internals -Version: $Revision: 1.4 $ -Last-modified: $Date: 2003/01/06 12:38:47 $ +Version: $Revision: 1.5 $ +Last-modified: $Date: 2003/01/06 20:30:43 $ @end format @end ifset diff --git a/gnu/libexec/uucp/tstuu.c b/gnu/libexec/uucp/tstuu.c index c791d5584079..ff3ac468db96 100644 --- a/gnu/libexec/uucp/tstuu.c +++ b/gnu/libexec/uucp/tstuu.c @@ -26,7 +26,7 @@ #include "uucp.h" #if USE_RCS_ID -const char tstuu_rcsid[] = "$Id: tstuu.c,v 1.4 1995/08/24 05:18:42 jtc Exp $"; +const char tstuu_rcsid[] = "$Id: tstuu.c,v 1.5 2003/01/06 20:30:43 wiz Exp $"; #endif #include "sysdep.h" @@ -851,7 +851,7 @@ uprepare_test (fmake, itest, fcall_uucico, zsys) const char *zfrom; const char *zto; -/* We must make /usr/tmp/tstuu world writeable or we won't be able to +/* We must make /usr/tmp/tstuu world writable or we won't be able to receive files into it. */ (void) umask (0); diff --git a/lib/libc/net/rcmd.c b/lib/libc/net/rcmd.c index e64fd4618371..205c0ce2d108 100644 --- a/lib/libc/net/rcmd.c +++ b/lib/libc/net/rcmd.c @@ -1,4 +1,4 @@ -/* $NetBSD: rcmd.c,v 1.51 2002/11/17 20:49:33 itojun Exp $ */ +/* $NetBSD: rcmd.c,v 1.52 2003/01/06 20:30:30 wiz Exp $ */ /* * Copyright (c) 1997 Matthew R. Green. @@ -39,7 +39,7 @@ #if 0 static char sccsid[] = "@(#)rcmd.c 8.3 (Berkeley) 3/26/94"; #else -__RCSID("$NetBSD: rcmd.c,v 1.51 2002/11/17 20:49:33 itojun Exp $"); +__RCSID("$NetBSD: rcmd.c,v 1.52 2003/01/06 20:30:30 wiz Exp $"); #endif #endif /* LIBC_SCCS and not lint */ @@ -711,7 +711,7 @@ again: return (-1); /* * If not a regular file, or is owned by someone other than - * user or root or if writeable by anyone but the owner, quit. + * user or root or if writable by anyone but the owner, quit. */ cp = NULL; if (lstat(pbuf, &sbuf) < 0) @@ -723,7 +723,7 @@ again: else if (sbuf.st_uid && sbuf.st_uid != pwd->pw_uid) cp = "bad .rhosts owner"; else if (sbuf.st_mode & (S_IWGRP|S_IWOTH)) - cp = ".rhosts writeable by other than owner"; + cp = ".rhosts writable by other than owner"; /* If there were any problems, quit. */ if (cp) { __rcmd_errstr = cp; diff --git a/lib/libutil/secure_path.c b/lib/libutil/secure_path.c index 2847326592be..52ae92b16524 100644 --- a/lib/libutil/secure_path.c +++ b/lib/libutil/secure_path.c @@ -1,4 +1,4 @@ -/* $NetBSD: secure_path.c,v 1.1 2001/08/20 14:47:50 wiz Exp $ */ +/* $NetBSD: secure_path.c,v 1.2 2003/01/06 20:30:30 wiz Exp $ */ /*- * Copyright (c) 1995,1997 Berkeley Software Design, Inc. All rights reserved. @@ -36,7 +36,7 @@ #include #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: secure_path.c,v 1.1 2001/08/20 14:47:50 wiz Exp $"); +__RCSID("$NetBSD: secure_path.c,v 1.2 2003/01/06 20:30:30 wiz Exp $"); #endif /* LIBC_SCCS and not lint */ #include @@ -54,7 +54,7 @@ secure_path(const char *path) _DIAGASSERT(path != NULL); /* - * If not a regular file, or is owned/writeable by someone + * If not a regular file, or is owned/writable by someone * other than root, quit. */ if (lstat(path, &sb) < 0) @@ -64,7 +64,7 @@ secure_path(const char *path) else if (sb.st_uid != 0) syslog(LOG_ERR, "%s: not owned by root", path); else if ((sb.st_mode & (S_IWGRP | S_IWOTH)) != 0) - syslog(LOG_ERR, "%s: writeable by non-root", path); + syslog(LOG_ERR, "%s: writable by non-root", path); else return (0); diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index 4d44c9845b53..a211cc0f3e09 100644 --- a/sbin/disklabel/disklabel.c +++ b/sbin/disklabel/disklabel.c @@ -1,4 +1,4 @@ -/* $NetBSD: disklabel.c,v 1.111 2002/12/12 11:34:46 scw Exp $ */ +/* $NetBSD: disklabel.c,v 1.112 2003/01/06 20:30:30 wiz Exp $ */ /* * Copyright (c) 1987, 1993 @@ -47,7 +47,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993\n\ static char sccsid[] = "@(#)disklabel.c 8.4 (Berkeley) 5/4/95"; /* from static char sccsid[] = "@(#)disklabel.c 1.2 (Symmetric) 11/28/85"; */ #else -__RCSID("$NetBSD: disklabel.c,v 1.111 2002/12/12 11:34:46 scw Exp $"); +__RCSID("$NetBSD: disklabel.c,v 1.112 2003/01/06 20:30:30 wiz Exp $"); #endif #endif /* not lint */ @@ -128,7 +128,7 @@ static char boot1[MAXPATHLEN]; #endif /* NUMBOOT > 0 */ static enum { - UNSPEC, EDIT, READ, RESTORE, SETWRITEABLE, WRITE, WRITEBOOT, INTERACT + UNSPEC, EDIT, READ, RESTORE, SETWRITABLE, WRITE, WRITEBOOT, INTERACT } op = UNSPEC; static int rflag; @@ -185,7 +185,7 @@ main(int argc, char *argv[]) { struct disklabel *lp; FILE *t; - int ch, f, writeable, error; + int ch, f, writable, error; error = 0; while ((ch = getopt(argc, argv, OPTIONS)) != -1) @@ -212,8 +212,8 @@ main(int argc, char *argv[]) case 'N': if (op != UNSPEC) usage(); - writeable = 0; - op = SETWRITEABLE; + writable = 0; + op = SETWRITABLE; break; case 'R': if (op != UNSPEC) @@ -223,8 +223,8 @@ main(int argc, char *argv[]) case 'W': if (op != UNSPEC) usage(); - writeable = 1; - op = SETWRITEABLE; + writable = 1; + op = SETWRITABLE; break; case 'e': if (op != UNSPEC) @@ -365,8 +365,8 @@ main(int argc, char *argv[]) error = writelabel(f, bootarea, lp); break; - case SETWRITEABLE: - if (ioctl(f, DIOCWLABEL, (char *)&writeable) < 0) + case SETWRITABLE: + if (ioctl(f, DIOCWLABEL, (char *)&writable) < 0) err(4, "ioctl DIOCWLABEL"); break; @@ -477,7 +477,7 @@ confirm(const char *txt) int writelabel(int f, char *boot, struct disklabel *lp) { - int writeable; + int writable; off_t sectoffset; sectoffset = 0; @@ -547,8 +547,8 @@ writelabel(int f, char *boot, struct disklabel *lp) * write enable label sector before write (if necessary), * disable after writing. */ - writeable = 1; - if (ioctl(f, DIOCWLABEL, &writeable) < 0) + writable = 1; + if (ioctl(f, DIOCWLABEL, &writable) < 0) perror("ioctl DIOCWLABEL"); #ifdef __alpha__ @@ -579,8 +579,8 @@ writelabel(int f, char *boot, struct disklabel *lp) } #endif /* NUMBOOT > 0 */ - writeable = 0; - if (ioctl(f, DIOCWLABEL, &writeable) < 0) + writable = 0; + if (ioctl(f, DIOCWLABEL, &writable) < 0) perror("ioctl DIOCWLABEL"); } else { if (ioctl(f, DIOCWDINFO, lp) < 0) { diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c index 30e017fbad01..3b77932527dd 100644 --- a/sbin/mount_cd9660/mount_cd9660.c +++ b/sbin/mount_cd9660/mount_cd9660.c @@ -1,4 +1,4 @@ -/* $NetBSD: mount_cd9660.c,v 1.15 2002/09/21 18:43:33 christos Exp $ */ +/* $NetBSD: mount_cd9660.c,v 1.16 2003/01/06 20:30:31 wiz Exp $ */ /* * Copyright (c) 1992, 1993, 1994 @@ -50,7 +50,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\n\ #if 0 static char sccsid[] = "@(#)mount_cd9660.c 8.7 (Berkeley) 5/1/95"; #else -__RCSID("$NetBSD: mount_cd9660.c,v 1.15 2002/09/21 18:43:33 christos Exp $"); +__RCSID("$NetBSD: mount_cd9660.c,v 1.16 2003/01/06 20:30:31 wiz Exp $"); #endif #endif /* not lint */ @@ -146,7 +146,7 @@ mount_cd9660(argc, argv) #define DEFAULT_ROOTUID -2 /* - * ISO 9660 filesystems are not writeable. + * ISO 9660 filesystems are not writable. */ mntflags |= MNT_RDONLY; args.export.ex_flags = MNT_EXRDONLY; diff --git a/sbin/mount_filecore/mount_filecore.c b/sbin/mount_filecore/mount_filecore.c index 85f3ae7691cd..7378c5b953f3 100644 --- a/sbin/mount_filecore/mount_filecore.c +++ b/sbin/mount_filecore/mount_filecore.c @@ -1,4 +1,4 @@ -/* $NetBSD: mount_filecore.c,v 1.5 2002/09/21 18:43:34 christos Exp $ */ +/* $NetBSD: mount_filecore.c,v 1.6 2003/01/06 20:30:31 wiz Exp $ */ /* * Copyright (c) 1998 Andrew McMurry @@ -140,7 +140,7 @@ mount_filecore(argc, argv) #define DEFAULT_ROOTUID -2 /* - * FILECORE filesystems are not writeable. + * FILECORE filesystems are not writable. */ mntflags |= MNT_RDONLY; if (useuid) args.flags |= FILECOREMNT_USEUID; diff --git a/sys/arch/acorn26/acorn26/pmap.c b/sys/arch/acorn26/acorn26/pmap.c index 92e0a826a1e7..c30ff0a30d6d 100644 --- a/sys/arch/acorn26/acorn26/pmap.c +++ b/sys/arch/acorn26/acorn26/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.5 2002/08/16 22:51:43 bjh21 Exp $ */ +/* $NetBSD: pmap.c,v 1.6 2003/01/06 20:30:31 wiz Exp $ */ /*- * Copyright (c) 1997, 1998, 2000 Ben Harris * All rights reserved. @@ -102,7 +102,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.5 2002/08/16 22:51:43 bjh21 Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.6 2003/01/06 20:30:31 wiz Exp $"); #include /* for cold */ #include @@ -919,7 +919,7 @@ pmap_fault(struct pmap *pmap, vaddr_t va, vm_prot_t atype) if ((atype & ~pv->pv_prot) == 0) { MEMC_WRITE(pv->pv_activate); /* - * If the new mapping is writeable, we should flush the cache + * If the new mapping is writable, we should flush the cache * so that stale data for an existing mapping doesn't get * reused. * XXX: Should this be done more lazily? diff --git a/sys/arch/i386/i386/db_memrw.c b/sys/arch/i386/i386/db_memrw.c index 0a3cdee45ae9..482097fa5e7e 100644 --- a/sys/arch/i386/i386/db_memrw.c +++ b/sys/arch/i386/i386/db_memrw.c @@ -1,4 +1,4 @@ -/* $NetBSD: db_memrw.c,v 1.13 2002/10/01 12:56:50 fvdl Exp $ */ +/* $NetBSD: db_memrw.c,v 1.14 2003/01/06 20:30:31 wiz Exp $ */ /*- * Copyright (c) 1996, 2000 The NetBSD Foundation, Inc. @@ -56,7 +56,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.13 2002/10/01 12:56:50 fvdl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.14 2003/01/06 20:30:31 wiz Exp $"); #include "opt_largepages.h" @@ -157,7 +157,7 @@ db_write_text(vaddr_t addr, size_t size, char *data) */ /* - * Page is now writeable. Do as much access as we + * Page is now writable. Do as much access as we * can in this page. */ for (; limit > 0; limit--) diff --git a/sys/arch/mac68k/obio/iwm_fd.c b/sys/arch/mac68k/obio/iwm_fd.c index 99a63e9829b9..ddf9be512b41 100644 --- a/sys/arch/mac68k/obio/iwm_fd.c +++ b/sys/arch/mac68k/obio/iwm_fd.c @@ -1,4 +1,4 @@ -/* $NetBSD: iwm_fd.c,v 1.20 2003/01/01 01:44:30 thorpej Exp $ */ +/* $NetBSD: iwm_fd.c,v 1.21 2003/01/06 20:30:32 wiz Exp $ */ /* * Copyright (c) 1997, 1998 Hauke Fath. All rights reserved. @@ -714,7 +714,7 @@ fdopen(dev, flags, devType, proc) printf(" Drive %d is empty.\n", fd->unit); #endif } else { - if (!(fd->drvFlags & IWM_WRITEABLE) && (flags & FWRITE)) { + if (!(fd->drvFlags & IWM_WRITABLE) && (flags & FWRITE)) { err = EPERM; #ifdef DIAGNOSTIC @@ -1869,7 +1869,7 @@ getFDType(unit) * Drive flags are: Bit 0 - 1 = Drive is double sided * 1 - 1 = No disk inserted * 2 - 1 = Motor is off - * 3 - 1 = Disk is writeable + * 3 - 1 = Disk is writable * 4 - 1 = Disk is DD (800/720K) * 31 - 1 = No drive / invalid drive # */ diff --git a/sys/arch/mac68k/obio/iwmreg.h b/sys/arch/mac68k/obio/iwmreg.h index 8073592a7562..cc90165542f8 100644 --- a/sys/arch/mac68k/obio/iwmreg.h +++ b/sys/arch/mac68k/obio/iwmreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: iwmreg.h,v 1.3 1999/03/27 05:45:20 scottr Exp $ */ +/* $NetBSD: iwmreg.h,v 1.4 2003/01/06 20:32:41 wiz Exp $ */ /* * Copyright (c) 1996-99 Hauke Fath. All rights reserved. @@ -43,7 +43,7 @@ enum { IWM_DS_DISK = 0x01, IWM_NO_DISK = 0x02, IWM_MOTOR_OFF = 0x04, - IWM_WRITEABLE = 0x08, + IWM_WRITABLE = 0x08, IWM_DD_DISK = 0x10, IWM_NO_DRIVE = 0x80000000 }; diff --git a/sys/arch/mips/mips/pmap.c b/sys/arch/mips/mips/pmap.c index 218a95c07542..7790bc6b785a 100644 --- a/sys/arch/mips/mips/pmap.c +++ b/sys/arch/mips/mips/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.144 2002/11/11 22:30:15 he Exp $ */ +/* $NetBSD: pmap.c,v 1.145 2003/01/06 20:30:32 wiz Exp $ */ /*- * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc. @@ -78,7 +78,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.144 2002/11/11 22:30:15 he Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.145 2003/01/06 20:30:32 wiz Exp $"); /* * Manages physical address maps. @@ -895,7 +895,7 @@ pmap_protect(pmap, sva, eva, prot) if (pmap == pmap_kernel()) { /* * Change entries in kernel pmap. - * This will trap if the page is writeable (in order to set + * This will trap if the page is writable (in order to set * the dirty bit) even if the dirty bit is already set. The * optimization isn't worth the effort since this code isn't * executed much. The common case is to make a user page diff --git a/sys/arch/mips/sibyte/include/sb1250_scd.h b/sys/arch/mips/sibyte/include/sb1250_scd.h index 6f4005a4f74e..b2d6dc48b789 100644 --- a/sys/arch/mips/sibyte/include/sb1250_scd.h +++ b/sys/arch/mips/sibyte/include/sb1250_scd.h @@ -183,7 +183,7 @@ #define V_SYS_CONFIG(x) _SB_MAKEVALUE(x,S_SYS_CONFIG) #define G_SYS_CONFIG(x) _SB_GETVALUE(x,S_SYS_CONFIG,M_SYS_CONFIG) -/* The following bits are writeable by JTAG only. */ +/* The following bits are writable by JTAG only. */ #define M_SYS_CLKSTOP _SB_MAKEMASK1(32) #define M_SYS_CLKSTEP _SB_MAKEMASK1(33) diff --git a/sys/arch/pc532/To.Do b/sys/arch/pc532/To.Do index ab9c1c90d5bd..4fda0d2a9add 100644 --- a/sys/arch/pc532/To.Do +++ b/sys/arch/pc532/To.Do @@ -1,4 +1,4 @@ -$NetBSD: To.Do,v 1.10 2001/05/16 15:01:40 simonb Exp $ +$NetBSD: To.Do,v 1.11 2003/01/06 20:30:33 wiz Exp $ This is the "To Do" list for NetBSD/pc532 (Order is not in order of importance.) @@ -12,7 +12,7 @@ This is the "To Do" list for NetBSD/pc532 - mods to better support ffs boot loader -- improve bim (detect a non-writeable disklabel, ...) +- improve bim (detect a non-writable disklabel, ...) - find or write a "usable" comm package to replace kermit for initial downloading. diff --git a/sys/arch/powerpc/ibm4xx/pmap.c b/sys/arch/powerpc/ibm4xx/pmap.c index bcf6862c1eff..b8de24fa29b2 100644 --- a/sys/arch/powerpc/ibm4xx/pmap.c +++ b/sys/arch/powerpc/ibm4xx/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.15 2003/01/04 18:04:43 thorpej Exp $ */ +/* $NetBSD: pmap.c,v 1.16 2003/01/06 20:30:33 wiz Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -1401,7 +1401,7 @@ pmap_tlbmiss(vaddr_t va, int ctx) return 1; } } else { - /* Create a 16MB writeable mapping. */ + /* Create a 16MB writable mapping. */ #ifdef PPC_4XX_NOCACHE tte = TTE_PA(va) | TTE_ZONE(ZONE_PRIV) | TTE_SZ_16M | TTE_I | TTE_WR; #else diff --git a/sys/arch/prep/include/pnp.h b/sys/arch/prep/include/pnp.h index 15335ff35c34..e5ef5583a19f 100644 --- a/sys/arch/prep/include/pnp.h +++ b/sys/arch/prep/include/pnp.h @@ -220,7 +220,7 @@ #define L1_8_16bit_mem 0x10 /* 8- and 16-bit supported */ #define L1_Decode_Hi 0x04 /* decode supports high address */ #define L1_Cache 0x02 /* read cacheable, write-through */ -#define L1_Writeable 0x01 /* Memory is writeable */ +#define L1_Writable 0x01 /* Memory is writable */ #define L2_Packet 0x82 /* ANSI ID string */ #define L3_Packet 0x83 /* Unicode ID string */ #define L4_Packet 0x84 /* Vendor defined */ diff --git a/sys/arch/sh5/sh5/pmap.c b/sys/arch/sh5/sh5/pmap.c index 01d058507f0d..4fea31a74da6 100644 --- a/sys/arch/sh5/sh5/pmap.c +++ b/sys/arch/sh5/sh5/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.25 2002/11/23 09:25:55 scw Exp $ */ +/* $NetBSD: pmap.c,v 1.26 2003/01/06 20:30:33 wiz Exp $ */ /* * Copyright 2002 Wasabi Systems, Inc. @@ -2194,7 +2194,7 @@ pmap_enter(pmap_t pm, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags) flags |= PMAP_UNMANAGED; pl = &pmap_upvo_pool; if (prot & VM_PROT_WRITE) { - /* Unmanaged pages are writeable from the start. */ + /* Unmanaged pages are writable from the start. */ ptel |= SH5_PTEL_PR_W; } } diff --git a/sys/arch/sparc/sparc/iommureg.h b/sys/arch/sparc/sparc/iommureg.h index f2e234c5d4f0..511b6dd2861d 100644 --- a/sys/arch/sparc/sparc/iommureg.h +++ b/sys/arch/sparc/sparc/iommureg.h @@ -1,4 +1,4 @@ -/* $NetBSD: iommureg.h,v 1.7 2000/05/28 20:54:42 pk Exp $ */ +/* $NetBSD: iommureg.h,v 1.8 2003/01/06 20:30:34 wiz Exp $ */ /* * Copyright (c) 1996 @@ -81,7 +81,7 @@ typedef u_int32_t iopte_t; /* IOMMU PTE bits */ #define IOPTE_PPN 0xffffff00 /* PA<35:12> */ #define IOPTE_C 0x00000080 /* cacheable */ -#define IOPTE_W 0x00000004 /* writeable */ +#define IOPTE_W 0x00000004 /* writable */ #define IOPTE_V 0x00000002 /* valid */ #define IOPTE_WAZ 0x00000001 /* must write as zero */ diff --git a/sys/arch/sparc64/dev/iommureg.h b/sys/arch/sparc64/dev/iommureg.h index 34dbf8afdf80..60cc922b47f5 100644 --- a/sys/arch/sparc64/dev/iommureg.h +++ b/sys/arch/sparc64/dev/iommureg.h @@ -1,4 +1,4 @@ -/* $NetBSD: iommureg.h,v 1.8 2002/03/20 18:54:47 eeh Exp $ */ +/* $NetBSD: iommureg.h,v 1.9 2003/01/06 20:30:34 wiz Exp $ */ /* * Copyright (c) 1992, 1993 @@ -97,7 +97,7 @@ struct iommu_strbuf { #define IOTTE_LOCAL 0x0800000000000000LL /* Accesses to same bus segment? */ #define IOTTE_PAMASK 0x000001ffffffe000LL /* Let's assume this is correct */ #define IOTTE_C 0x0000000000000010LL /* Accesses to cacheable space */ -#define IOTTE_W 0x0000000000000002LL /* Writeable */ +#define IOTTE_W 0x0000000000000002LL /* Writable */ /* * On sun4u each bus controller has a separate IOMMU. The IOMMU has diff --git a/sys/arch/sparc64/include/pte.h b/sys/arch/sparc64/include/pte.h index 510cc4763989..8c9041288a51 100644 --- a/sys/arch/sparc64/include/pte.h +++ b/sys/arch/sparc64/include/pte.h @@ -1,4 +1,4 @@ -/* $NetBSD: pte.h,v 1.11 2002/09/22 07:19:45 chs Exp $ */ +/* $NetBSD: pte.h,v 1.12 2003/01/06 20:30:35 wiz Exp $ */ /* * Copyright (c) 1996-1999 Eduardo Horvath @@ -52,7 +52,7 @@ * data_cacheable:2, (cacheability control) * data_e:1, (explicit accesses only) * data_priv:1, (privileged page) - * data_w:1, (writeable) + * data_w:1, (writable) * data_g:1; (same as tag_g) * }; */ @@ -111,7 +111,7 @@ struct sun4u_data_fields { data_cacheable:2, /* cacheability control */ data_e:1, /* explicit accesses only */ data_priv:1, /* privileged page */ - data_w:1, /* writeable */ + data_w:1, /* writable */ data_g:1; /* same as tag_g */ }; union sun4u_data { struct sun4u_data_fields f; int64_t data; }; diff --git a/sys/arch/sparc64/sparc64/pmap.c b/sys/arch/sparc64/sparc64/pmap.c index 860f43b11cea..007033ead9b6 100644 --- a/sys/arch/sparc64/sparc64/pmap.c +++ b/sys/arch/sparc64/sparc64/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.130 2002/11/11 10:15:46 chs Exp $ */ +/* $NetBSD: pmap.c,v 1.131 2003/01/06 20:30:35 wiz Exp $ */ #undef NO_VCACHE /* Don't forget the locked TLB in dostart */ #define HWREF /* @@ -85,7 +85,7 @@ extern int pseg_set __P((struct pmap *, vaddr_t, int64_t, paddr_t)); * * When we map a page initially, we place a TTE in the page table. It's * inserted with the TLB_W and TLB_ACCESS bits cleared. If a page is really - * writeable we set the TLB_REAL_W bit for the trap handler. + * writable we set the TLB_REAL_W bit for the trap handler. * * Whenever we take a TLB miss trap, the trap handler will set the TLB_ACCESS * bit in the approprate TTE in the page table. Whenever we take a protection diff --git a/sys/arch/sparc64/sparc64/sysioreg.h b/sys/arch/sparc64/sparc64/sysioreg.h index 01c73b543511..32a518fcf244 100644 --- a/sys/arch/sparc64/sparc64/sysioreg.h +++ b/sys/arch/sparc64/sparc64/sysioreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: sysioreg.h,v 1.1.1.1 1998/06/20 04:58:52 eeh Exp $ */ +/* $NetBSD: sysioreg.h,v 1.2 2003/01/06 20:30:35 wiz Exp $ */ /* * Copyright (c) 1996 @@ -140,7 +140,7 @@ typedef u_int32_t iopte_t; #define IOPTE_PPN 0xffffff00 /* PA<35:12> */ #define IOPTE_C 0x00000080 /* cacheable */ -#define IOPTE_W 0x00000004 /* writeable */ +#define IOPTE_W 0x00000004 /* writable */ #define IOPTE_V 0x00000002 /* valid */ #define IOPTE_WAZ 0x00000001 /* must write as zero */ diff --git a/sys/arch/vax/vax/vm_machdep.c b/sys/arch/vax/vax/vm_machdep.c index 936abdda14db..c73e7b9124dc 100644 --- a/sys/arch/vax/vax/vm_machdep.c +++ b/sys/arch/vax/vax/vm_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: vm_machdep.c,v 1.77 2002/03/10 22:32:31 ragge Exp $ */ +/* $NetBSD: vm_machdep.c,v 1.78 2003/01/06 20:30:36 wiz Exp $ */ /* * Copyright (c) 1994 Ludd, University of Lule}, Sweden. @@ -261,7 +261,7 @@ cpu_coredump(p, vp, cred, chdr) } /* - * Map in a bunch of pages read/writeable for the kernel. + * Map in a bunch of pages read/writable for the kernel. */ void ioaccess(vaddr, paddr, npgs) diff --git a/sys/arch/x86_64/x86_64/db_memrw.c b/sys/arch/x86_64/x86_64/db_memrw.c index 6347949a0b9d..f8024d788caa 100644 --- a/sys/arch/x86_64/x86_64/db_memrw.c +++ b/sys/arch/x86_64/x86_64/db_memrw.c @@ -1,4 +1,4 @@ -/* $NetBSD: db_memrw.c,v 1.1 2002/11/29 22:17:16 fvdl Exp $ */ +/* $NetBSD: db_memrw.c,v 1.2 2003/01/06 20:32:42 wiz Exp $ */ /*- * Copyright (c) 1996, 2000 The NetBSD Foundation, Inc. @@ -58,7 +58,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.1 2002/11/29 22:17:16 fvdl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.2 2003/01/06 20:32:42 wiz Exp $"); #include "opt_largepages.h" @@ -160,7 +160,7 @@ db_write_text(vaddr_t addr, size_t size, char *data) pmap_update_pg(pgva); /* - * Page is now writeable. Do as much access as we + * Page is now writable. Do as much access as we * can in this page. */ for (; limit > 0; limit--) diff --git a/sys/coda/coda_vnops.c b/sys/coda/coda_vnops.c index 257d539da405..1980dc9532c4 100644 --- a/sys/coda/coda_vnops.c +++ b/sys/coda/coda_vnops.c @@ -6,7 +6,7 @@ mkdir rmdir symlink */ -/* $NetBSD: coda_vnops.c,v 1.32 2002/09/27 15:37:03 provos Exp $ */ +/* $NetBSD: coda_vnops.c,v 1.33 2003/01/06 20:32:42 wiz Exp $ */ /* * @@ -54,7 +54,7 @@ symlink */ #include -__KERNEL_RCSID(0, "$NetBSD: coda_vnops.c,v 1.32 2002/09/27 15:37:03 provos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: coda_vnops.c,v 1.33 2003/01/06 20:32:42 wiz Exp $"); #include #include @@ -243,7 +243,7 @@ coda_open(v) /* Check for open of control file. */ if (IS_CTL_VP(*vpp)) { /* XXX */ - /* if (WRITEABLE(flag)) */ + /* if (WRITABLE(flag)) */ if (flag & (FWRITE | O_TRUNC | O_CREAT | O_EXCL)) { MARK_INT_FAIL(CODA_OPEN_STATS); return(EACCES); diff --git a/sys/compat/linux/common/linux_uselib.c b/sys/compat/linux/common/linux_uselib.c index 444ef3942203..bbd66666ad4c 100644 --- a/sys/compat/linux/common/linux_uselib.c +++ b/sys/compat/linux/common/linux_uselib.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_uselib.c,v 1.7 2002/10/05 22:34:04 chs Exp $ */ +/* $NetBSD: linux_uselib.c,v 1.8 2003/01/06 20:30:36 wiz Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_uselib.c,v 1.7 2002/10/05 22:34:04 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_uselib.c,v 1.8 2003/01/06 20:30:36 wiz Exp $"); #include #include @@ -77,7 +77,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_uselib.c,v 1.7 2002/10/05 22:34:04 chs Exp $") * a_entry. Read in the header, set up some VM commands and run them. * * Yes, both text and data are mapped at once, so we're left with - * writeable text for the shared libs. The Linux crt0 seemed to break + * writable text for the shared libs. The Linux crt0 seemed to break * sometimes when data was mapped separately. It munmapped a uselib() * of ld.so by hand, which failed with shared text and data for ld.so * Yuck. diff --git a/sys/dev/acpi/acpica/Subsystem/amlresrc.h b/sys/dev/acpi/acpica/Subsystem/amlresrc.h index 856232d6c69b..f602f82688b0 100644 --- a/sys/dev/acpi/acpica/Subsystem/amlresrc.h +++ b/sys/dev/acpi/acpica/Subsystem/amlresrc.h @@ -2,7 +2,7 @@ /****************************************************************************** * * Module Name: amlresrc.h - AML resource descriptors - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * *****************************************************************************/ @@ -143,7 +143,7 @@ #define ASL_RESNAME_REGISTERBITOFFSET "_RBO" #define ASL_RESNAME_REGISTERBITWIDTH "_RBW" #define ASL_RESNAME_RANGETYPE "_RNG" -#define ASL_RESNAME_READWRITETYPE "_RW_" /* ReadOnly(0), Writeable (1) */ +#define ASL_RESNAME_READWRITETYPE "_RW_" /* ReadOnly(0), Writable (1) */ #define ASL_RESNAME_TRANSLATION "_TRA" #define ASL_RESNAME_TRANSTYPE "_TRS" /* Sparse(1), Dense(0) */ #define ASL_RESNAME_TYPE "_TTP" /* Translation(1), Static (0) */ diff --git a/sys/dev/acpi/acpica/Subsystem/aslresource.h b/sys/dev/acpi/acpica/Subsystem/aslresource.h index 05f3627312c0..7f7aa66869b9 100644 --- a/sys/dev/acpi/acpica/Subsystem/aslresource.h +++ b/sys/dev/acpi/acpica/Subsystem/aslresource.h @@ -143,7 +143,7 @@ #define ASL_RESNAME_REGISTERBITOFFSET "_RBO" #define ASL_RESNAME_REGISTERBITWIDTH "_RBW" #define ASL_RESNAME_RANGETYPE "_RNG" -#define ASL_RESNAME_READWRITETYPE "_RW_" /* ReadOnly(0), Writeable (1) */ +#define ASL_RESNAME_READWRITETYPE "_RW_" /* ReadOnly(0), Writable (1) */ #define ASL_RESNAME_TRANSLATION "_TRA" #define ASL_RESNAME_TRANSTYPE "_TRS" /* Sparse(1), Dense(0) */ #define ASL_RESNAME_TYPE "_TTP" /* Translation(1), Static (0) */ diff --git a/sys/dev/ic/rrunner.c b/sys/dev/ic/rrunner.c index 5535998e7b56..1e6a7bbaf277 100644 --- a/sys/dev/ic/rrunner.c +++ b/sys/dev/ic/rrunner.c @@ -1,4 +1,4 @@ -/* $NetBSD: rrunner.c,v 1.34 2002/10/23 09:13:18 jdolecek Exp $ */ +/* $NetBSD: rrunner.c,v 1.35 2003/01/06 20:30:36 wiz Exp $ */ /* * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rrunner.c,v 1.34 2002/10/23 09:13:18 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rrunner.c,v 1.35 2003/01/06 20:30:36 wiz Exp $"); #include "opt_inet.h" #include "opt_ns.h" @@ -3202,7 +3202,7 @@ esh_generic_ioctl(struct esh_softc *sc, u_long cmd, caddr_t data, misc_local_ctl = bus_space_read_4(iot, ioh, RR_MISC_LOCAL_CTL); value = misc_local_ctl & ~(RR_LC_FAST_PROM | RR_LC_ADD_SRAM | RR_LC_PARITY_ON); - if (cmd == EIOCSEEPROM) /* make writeable! */ + if (cmd == EIOCSEEPROM) /* make writable! */ value |= RR_LC_WRITE_PROM; bus_space_write_4(iot, ioh, RR_MISC_LOCAL_CTL, value); diff --git a/sys/dev/isapnp/isapnpdebug.c b/sys/dev/isapnp/isapnpdebug.c index acf448fd65b4..8919334dbac9 100644 --- a/sys/dev/isapnp/isapnpdebug.c +++ b/sys/dev/isapnp/isapnpdebug.c @@ -1,4 +1,4 @@ -/* $NetBSD: isapnpdebug.c,v 1.6 2001/11/13 07:56:41 lukem Exp $ */ +/* $NetBSD: isapnpdebug.c,v 1.7 2003/01/06 20:30:37 wiz Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: isapnpdebug.c,v 1.6 2001/11/13 07:56:41 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isapnpdebug.c,v 1.7 2003/01/06 20:30:37 wiz Exp $"); #ifdef DEBUG_ISAPNP @@ -66,8 +66,8 @@ isapnp_print_mem(str, mem) (mem->flags & ISAPNP_MEMATTR_HIGH_ADDR) ? "high-addr," : "range-len,", (mem->flags & ISAPNP_MEMATTR_CACHEABLE) ? "" : "non-", - (mem->flags & ISAPNP_MEMATTR_WRITEABLE) ? - "writeable," : "read-only,"); + (mem->flags & ISAPNP_MEMATTR_WRITABLE) ? + "writable," : "read-only,"); switch (mem->flags & ISAPNP_MEMWIDTH_MASK) { case ISAPNP_MEMWIDTH_8: diff --git a/sys/dev/isapnp/isapnpreg.h b/sys/dev/isapnp/isapnpreg.h index cec5d5700e85..5ad7dcb427f3 100644 --- a/sys/dev/isapnp/isapnpreg.h +++ b/sys/dev/isapnp/isapnpreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: isapnpreg.h,v 1.8 1999/09/23 16:09:58 christos Exp $ */ +/* $NetBSD: isapnpreg.h,v 1.9 2003/01/06 20:32:43 wiz Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -163,7 +163,7 @@ /* Large Tags */ #define ISAPNP_LARGE_TAG 0x80 #define ISAPNP_TAG_MEM_RANGE_DESC 0x81 -#define ISAPNP_MEMATTR_WRITEABLE 0x01 +#define ISAPNP_MEMATTR_WRITABLE 0x01 #define ISAPNP_MEMATTR_CACHEABLE 0x02 #define ISAPNP_MEMATTR_HIGH_ADDR 0x04 #define ISAPNP_MEMATTR_SHADOWABLE 0x20 diff --git a/sys/dev/scsipi/sd.c b/sys/dev/scsipi/sd.c index fb7a64254b63..dd7162ef1a73 100644 --- a/sys/dev/scsipi/sd.c +++ b/sys/dev/scsipi/sd.c @@ -1,4 +1,4 @@ -/* $NetBSD: sd.c,v 1.192 2002/12/15 01:55:44 fvdl Exp $ */ +/* $NetBSD: sd.c,v 1.193 2003/01/06 20:30:38 wiz Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -54,7 +54,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.192 2002/12/15 01:55:44 fvdl Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.193 2003/01/06 20:30:38 wiz Exp $"); #include "opt_scsi.h" #include "opt_bufq.h" @@ -1101,7 +1101,7 @@ bad: case DIOCCACHESYNC: /* - * XXX Do we really need to care about having a writeable + * XXX Do we really need to care about having a writable * file descriptor here? */ if ((flag & FWRITE) == 0) diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index 9c4dc0088975..47996fae69e6 100644 --- a/sys/kern/sys_socket.c +++ b/sys/kern/sys_socket.c @@ -1,4 +1,4 @@ -/* $NetBSD: sys_socket.c,v 1.33 2002/10/23 09:14:23 jdolecek Exp $ */ +/* $NetBSD: sys_socket.c,v 1.34 2003/01/06 20:30:38 wiz Exp $ */ /* * Copyright (c) 1982, 1986, 1990, 1993 @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sys_socket.c,v 1.33 2002/10/23 09:14:23 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sys_socket.c,v 1.34 2003/01/06 20:30:38 wiz Exp $"); #include #include @@ -173,7 +173,7 @@ soo_poll(fp, events, p) revents |= events & (POLLIN | POLLRDNORM); if (events & (POLLOUT | POLLWRNORM)) - if (sowriteable(so)) + if (sowritable(so)) revents |= events & (POLLOUT | POLLWRNORM); if (events & (POLLPRI | POLLRDBAND)) diff --git a/sys/miscfs/union/union_vfsops.c b/sys/miscfs/union/union_vfsops.c index 8858f5ade0e5..462da659f4c1 100644 --- a/sys/miscfs/union/union_vfsops.c +++ b/sys/miscfs/union/union_vfsops.c @@ -1,4 +1,4 @@ -/* $NetBSD: union_vfsops.c,v 1.32 2002/09/21 18:09:31 christos Exp $ */ +/* $NetBSD: union_vfsops.c,v 1.33 2003/01/06 20:30:38 wiz Exp $ */ /* * Copyright (c) 1994 The Regents of the University of California. @@ -44,7 +44,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: union_vfsops.c,v 1.32 2002/09/21 18:09:31 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: union_vfsops.c,v 1.33 2003/01/06 20:30:38 wiz Exp $"); #include #include @@ -476,7 +476,7 @@ union_statfs(mp, sbp, p) * The "total" fields count total resources in all layers, * the "free" fields count only those resources which are * free in the upper layer (since only the upper layer - * is writeable). + * is writable). */ if (mstat.f_bsize != lbsize) diff --git a/sys/netsmb/smb_trantcp.c b/sys/netsmb/smb_trantcp.c index 7e6df74c341e..91b109ff5e1b 100644 --- a/sys/netsmb/smb_trantcp.c +++ b/sys/netsmb/smb_trantcp.c @@ -1,4 +1,4 @@ -/* $NetBSD: smb_trantcp.c,v 1.3 2002/01/04 02:39:45 deberg Exp $ */ +/* $NetBSD: smb_trantcp.c,v 1.4 2003/01/06 20:30:38 wiz Exp $ */ /* * Copyright (c) 2000-2001 Boris Popov @@ -118,7 +118,7 @@ nb_poll(struct nbpcb *nbp, int events, struct proc *p) revents |= events & (POLLIN | POLLRDNORM); if (events & (POLLOUT | POLLWRNORM)) - if (sowriteable(so)) + if (sowritable(so)) revents |= events & (POLLOUT | POLLWRNORM); if (events & (POLLPRI | POLLRDBAND)) diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h index 4e3b33cd29dd..9363a3cdd5c8 100644 --- a/sys/sys/socketvar.h +++ b/sys/sys/socketvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: socketvar.h,v 1.55 2002/10/23 09:15:01 jdolecek Exp $ */ +/* $NetBSD: socketvar.h,v 1.56 2003/01/06 20:30:39 wiz Exp $ */ /*- * Copyright (c) 1982, 1986, 1990, 1993 @@ -190,7 +190,7 @@ do { \ (so)->so_qlen || (so)->so_error) /* can we write something to so? */ -#define sowriteable(so) \ +#define sowritable(so) \ ((sbspace(&(so)->so_snd) >= (so)->so_snd.sb_lowat && \ (((so)->so_state&SS_ISCONNECTED) || \ ((so)->so_proto->pr_flags&PR_CONNREQUIRED)==0)) || \ diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 44b33b200690..fffb65d1e4c2 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -1,4 +1,4 @@ -/* $NetBSD: vnode.h,v 1.100 2002/10/29 12:31:26 blymn Exp $ */ +/* $NetBSD: vnode.h,v 1.101 2003/01/06 20:30:39 wiz Exp $ */ /* * Copyright (c) 1989, 1993 @@ -240,7 +240,7 @@ extern const int vttoif_tab[]; */ #define SKIPSYSTEM 0x0001 /* vflush: skip vnodes marked VSYSTEM */ #define FORCECLOSE 0x0002 /* vflush: force file closeure */ -#define WRITECLOSE 0x0004 /* vflush: only close writeable files */ +#define WRITECLOSE 0x0004 /* vflush: only close writable files */ #define DOCLOSE 0x0008 /* vclean: close active files */ #define V_SAVE 0x0001 /* vinvalbuf: sync file first */ diff --git a/sys/ufs/ext2fs/ext2fs_dinode.h b/sys/ufs/ext2fs/ext2fs_dinode.h index ebefb4aaa6a8..799c96300874 100644 --- a/sys/ufs/ext2fs/ext2fs_dinode.h +++ b/sys/ufs/ext2fs/ext2fs_dinode.h @@ -1,4 +1,4 @@ -/* $NetBSD: ext2fs_dinode.h,v 1.7 2002/12/01 00:12:06 matt Exp $ */ +/* $NetBSD: ext2fs_dinode.h,v 1.8 2003/01/06 20:30:39 wiz Exp $ */ /* * Copyright (c) 1997 Manuel Bouyer. @@ -98,7 +98,7 @@ struct ext2fs_dinode { /* File permissions. */ #define EXT2_IEXEC 0000100 /* Executable. */ -#define EXT2_IWRITE 0000200 /* Writeable. */ +#define EXT2_IWRITE 0000200 /* Writable. */ #define EXT2_IREAD 0000400 /* Readable. */ #define EXT2_ISVTX 0001000 /* Sticky bit. */ #define EXT2_ISGID 0002000 /* Set-gid. */ diff --git a/sys/ufs/ufs/dinode.h b/sys/ufs/ufs/dinode.h index 2a83a69d29c5..92a0e48a3fde 100644 --- a/sys/ufs/ufs/dinode.h +++ b/sys/ufs/ufs/dinode.h @@ -1,4 +1,4 @@ -/* $NetBSD: dinode.h,v 1.14 2002/09/28 20:11:09 dbj Exp $ */ +/* $NetBSD: dinode.h,v 1.15 2003/01/06 20:30:39 wiz Exp $ */ /* * Copyright (c) 1982, 1989, 1993 @@ -118,7 +118,7 @@ struct dinode { /* File permissions. */ #define IEXEC 0000100 /* Executable. */ -#define IWRITE 0000200 /* Writeable. */ +#define IWRITE 0000200 /* Writable. */ #define IREAD 0000400 /* Readable. */ #define ISVTX 0001000 /* Sticky bit. */ #define ISGID 0002000 /* Set-gid. */ diff --git a/usr.bin/file/file.c b/usr.bin/file/file.c index 295de7fc9273..0fd45105ec46 100644 --- a/usr.bin/file/file.c +++ b/usr.bin/file/file.c @@ -1,4 +1,4 @@ -/* $NetBSD: file.c,v 1.28 2002/07/09 14:59:54 pooka Exp $ */ +/* $NetBSD: file.c,v 1.29 2003/01/06 20:30:40 wiz Exp $ */ /* * file - find type of a file or files - main program. @@ -63,7 +63,7 @@ #if 0 FILE_RCSID("@(#)Id: file.c,v 1.66 2002/07/03 19:00:41 christos Exp ") #else -__RCSID("$NetBSD: file.c,v 1.28 2002/07/09 14:59:54 pooka Exp $"); +__RCSID("$NetBSD: file.c,v 1.29 2003/01/06 20:30:40 wiz Exp $"); #endif #endif /* lint */ @@ -424,7 +424,7 @@ process(const char *inname, int wid) if ((fd = open(inname, O_RDONLY)) < 0) { /* We can't open it, but we were able to stat it. */ - if (sb.st_mode & 0002) ckfputs("writeable, ", stdout); + if (sb.st_mode & 0002) ckfputs("writable, ", stdout); if (sb.st_mode & 0111) ckfputs("executable, ", stdout); ckfprintf(stdout, "can't read `%s' (%s).\n", inname, strerror(errno)); diff --git a/usr.bin/finger/sprint.c b/usr.bin/finger/sprint.c index 6c92eba2b188..bce2545f12fa 100644 --- a/usr.bin/finger/sprint.c +++ b/usr.bin/finger/sprint.c @@ -1,4 +1,4 @@ -/* $NetBSD: sprint.c,v 1.13 2002/08/20 14:02:45 christos Exp $ */ +/* $NetBSD: sprint.c,v 1.14 2003/01/06 20:30:40 wiz Exp $ */ /* * Copyright (c) 1989, 1993 @@ -41,7 +41,7 @@ #if 0 static char sccsid[] = "@(#)sprint.c 8.3 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: sprint.c,v 1.13 2002/08/20 14:02:45 christos Exp $"); +__RCSID("$NetBSD: sprint.c,v 1.14 2003/01/06 20:30:40 wiz Exp $"); #endif #endif /* not lint */ @@ -83,7 +83,7 @@ sflag_print() * login name * real name * terminal name (the XX of ttyXX) - * if terminal writeable (add an '*' to the terminal name + * if terminal writable (add an '*' to the terminal name * if not) * if logged in show idle time and day logged in, else * show last login date and time. If > 6 months, diff --git a/usr.bin/mkdep/mkdep.append b/usr.bin/mkdep/mkdep.append index ba8085c9582e..56d6a451429a 100644 --- a/usr.bin/mkdep/mkdep.append +++ b/usr.bin/mkdep/mkdep.append @@ -1,6 +1,6 @@ #!/bin/sh - # -# $NetBSD: mkdep.append,v 1.3 1998/03/31 04:25:30 perry Exp $ +# $NetBSD: mkdep.append,v 1.4 2003/01/06 20:30:40 wiz Exp $ # # Copyright (c) 1991, 1993 # The Regents of the University of California. All rights reserved. @@ -64,7 +64,7 @@ if [ $# = 0 ] ; then fi if [ ! -w $MAKE ]; then - echo "mkdep: no writeable file \"$MAKE\"" + echo "mkdep: no writable file \"$MAKE\"" exit 1 fi diff --git a/usr.bin/mkdep/mkdep.old.compiler b/usr.bin/mkdep/mkdep.old.compiler index ba0818cf411e..a66db015542a 100644 --- a/usr.bin/mkdep/mkdep.old.compiler +++ b/usr.bin/mkdep/mkdep.old.compiler @@ -1,6 +1,6 @@ #!/bin/sh - # -# $NetBSD: mkdep.old.compiler,v 1.3 1998/03/31 04:25:30 perry Exp $ +# $NetBSD: mkdep.old.compiler,v 1.4 2003/01/06 20:30:40 wiz Exp $ # # Copyright (c) 1991, 1993 # The Regents of the University of California. All rights reserved. @@ -67,7 +67,7 @@ if [ $# = 0 ] ; then fi if [ ! -w $MAKE ]; then - echo "mkdep: no writeable file \"$MAKE\"" + echo "mkdep: no writable file \"$MAKE\"" exit 1 fi diff --git a/usr.bin/mkdep/mkdep.ultrix b/usr.bin/mkdep/mkdep.ultrix index cb4a6225ce79..bf0d6ea557cb 100644 --- a/usr.bin/mkdep/mkdep.ultrix +++ b/usr.bin/mkdep/mkdep.ultrix @@ -1,6 +1,6 @@ #!/bin/sh - # -# $NetBSD: mkdep.ultrix,v 1.2 1994/12/23 07:35:04 jtc Exp $ +# $NetBSD: mkdep.ultrix,v 1.3 2003/01/06 20:30:40 wiz Exp $ # # Copyright (c) 1991, 1993 # The Regents of the University of California. All rights reserved. @@ -64,7 +64,7 @@ if [ $# = 0 ] ; then fi if [ ! -w $MAKE ]; then - echo "mkdep: no writeable file \"$MAKE\"" + echo "mkdep: no writable file \"$MAKE\"" exit 1 fi diff --git a/usr.bin/patch/util.c b/usr.bin/patch/util.c index 813604f707cb..3339664465ca 100644 --- a/usr.bin/patch/util.c +++ b/usr.bin/patch/util.c @@ -1,7 +1,7 @@ -/* $NetBSD: util.c,v 1.12 2002/03/16 22:36:42 kristerw Exp $ */ +/* $NetBSD: util.c,v 1.13 2003/01/06 20:30:41 wiz Exp $ */ #include #ifndef lint -__RCSID("$NetBSD: util.c,v 1.12 2002/03/16 22:36:42 kristerw Exp $"); +__RCSID("$NetBSD: util.c,v 1.13 2003/01/06 20:30:41 wiz Exp $"); #endif /* not lint */ #include @@ -290,7 +290,7 @@ ask(const char *pat, ...) write(1, buf, strlen(buf)); r = read(1, buf, sizeof buf); } else if ((ttyfd = open("/dev/tty", 2)) >= 0 && isatty(ttyfd)) { - /* might be deleted or unwriteable */ + /* might be deleted or unwritable */ write(ttyfd, buf, strlen(buf)); r = read(ttyfd, buf, sizeof buf); Close(ttyfd); diff --git a/usr.bin/vi/common/exf.c b/usr.bin/vi/common/exf.c index 9b5ad38d1359..bd4eb96978b6 100644 --- a/usr.bin/vi/common/exf.c +++ b/usr.bin/vi/common/exf.c @@ -1,4 +1,4 @@ -/* $NetBSD: exf.c,v 1.10 2002/04/15 08:31:43 pooka Exp $ */ +/* $NetBSD: exf.c,v 1.11 2003/01/06 20:30:41 wiz Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -16,7 +16,7 @@ #if 0 static const char sccsid[] = "@(#)exf.c 10.49 (Berkeley) 10/10/96"; #else -__RCSID("$NetBSD: exf.c,v 1.10 2002/04/15 08:31:43 pooka Exp $"); +__RCSID("$NetBSD: exf.c,v 1.11 2003/01/06 20:30:41 wiz Exp $"); #endif #endif /* not lint */ @@ -371,7 +371,7 @@ file_init(sp, frp, rcv_name, flags) * * Otherwise, try and figure out if a file is readonly. This is a * dangerous thing to do. The kernel is the only arbiter of whether - * or not a file is writeable, and the best that a user program can + * or not a file is writable, and the best that a user program can * do is guess. Obvious loopholes are files that are on a file system * mounted readonly (access catches this one on a few systems), or * alternate protection mechanisms, ACL's for example, that we can't diff --git a/usr.bin/vi/ex/ex_init.c b/usr.bin/vi/ex/ex_init.c index bb22aaffe99b..e4751d3fe7b2 100644 --- a/usr.bin/vi/ex/ex_init.c +++ b/usr.bin/vi/ex/ex_init.c @@ -1,4 +1,4 @@ -/* $NetBSD: ex_init.c,v 1.9 2002/04/09 01:47:33 thorpej Exp $ */ +/* $NetBSD: ex_init.c,v 1.10 2003/01/06 20:30:41 wiz Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 @@ -327,7 +327,7 @@ ex_run_str(sp, name, str, len, ex_flags, nocopy) * .exrc file to be owned by root, the $HOME .exrc file to be owned by the * user's effective ID (or that the user's effective ID be root) and the * local .exrc files to be owned by the user's effective ID. In all cases, - * the file cannot be writeable by anyone other than its owner. + * the file cannot be writable by anyone other than its owner. * * In O'Reilly ("Learning the VI Editor", Fifth Ed., May 1992, page 106), * it notes that System V release 3.2 and later has an option "[no]exrc". @@ -397,7 +397,7 @@ denied: a = msg_print(sp, path, &nf1); break; case WRITER: msgq(sp, M_ERR, - "127|%s/%s: not sourced: writeable by a user other than the owner", b, a); + "127|%s/%s: not sourced: writable by a user other than the owner", b, a); break; } if (nf2) @@ -414,7 +414,7 @@ denied: a = msg_print(sp, path, &nf1); break; case WRITER: msgq(sp, M_ERR, - "130|%s: not sourced: writeable by a user other than the owner", a); + "130|%s: not sourced: writable by a user other than the owner", a); break; } diff --git a/usr.bin/vi/vi/v_txt.c b/usr.bin/vi/vi/v_txt.c index e71444bae518..1aba4d981a19 100644 --- a/usr.bin/vi/vi/v_txt.c +++ b/usr.bin/vi/vi/v_txt.c @@ -1,4 +1,4 @@ -/* $NetBSD: v_txt.c,v 1.9 2002/04/09 01:47:36 thorpej Exp $ */ +/* $NetBSD: v_txt.c,v 1.10 2003/01/06 20:30:41 wiz Exp $ */ /*- * Copyright (c) 1993, 1994 @@ -16,7 +16,7 @@ #if 0 static const char sccsid[] = "@(#)v_txt.c 10.87 (Berkeley) 10/13/96"; #else -__RCSID("$NetBSD: v_txt.c,v 1.9 2002/04/09 01:47:36 thorpej Exp $"); +__RCSID("$NetBSD: v_txt.c,v 1.10 2003/01/06 20:30:41 wiz Exp $"); #endif #endif /* not lint */ @@ -2931,7 +2931,7 @@ txt_Rresolve(sp, tiqh, tp, orig_len) /* * If the user has entered less characters than the original line - * was long, restore any overwriteable characters to the original + * was long, restore any overwritable characters to the original * characters. These characters are entered as "insert characters", * because they're after the cursor and we don't want to lose them. * (This is okay because the R command has no insert characters.)