summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sbin/pdisk/dump.c2
-rw-r--r--sbin/pdisk/pdisk.c14
-rw-r--r--usr.bin/file/file.c6
-rw-r--r--usr.bin/mkdep/mkdep.append4
-rw-r--r--usr.bin/mkdep/mkdep.old.compiler4
-rw-r--r--usr.bin/mkdep/mkdep.ultrix4
-rw-r--r--usr.bin/vi/ex/ex_init.c6
7 files changed, 20 insertions, 20 deletions
diff --git a/sbin/pdisk/dump.c b/sbin/pdisk/dump.c
index 01d47fcdb2d..bd1bee0872b 100644
--- a/sbin/pdisk/dump.c
+++ b/sbin/pdisk/dump.c
@@ -388,7 +388,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->writeable)?kStringEmpty:kStringNot);
printf(", but%s changed\n", (map->changed)?kStringEmpty:kStringNot);
printf("\n");
diff --git a/sbin/pdisk/pdisk.c b/sbin/pdisk/pdisk.c
index a8e7800ba9d..d3fe0c88b05 100644
--- a/sbin/pdisk/pdisk.c
+++ b/sbin/pdisk/pdisk.c
@@ -657,7 +657,7 @@ do_create_partition(partition_map_header *map, int get_type)
return;
}
if (!rflag && map->writeable == 0) {
- printf("The map is not writeable.\n");
+ 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,7 +765,7 @@ do_rename_partition(partition_map_header *map)
return;
}
if (!rflag && map->writeable == 0) {
- printf("The map is not writeable.\n");
+ printf("The map is not writable.\n");
}
if (get_number_argument("Partition number: ", &index, kDefault) == 0) {
bad_input("Bad partition number");
@@ -802,7 +802,7 @@ do_change_type(partition_map_header *map)
}
if (!rflag && map->writeable == 0) {
- printf("The map is not writeable.\n");
+ printf("The map is not writable.\n");
}
if (get_number_argument("Partition number: ", &index, kDefault) == 0) {
@@ -844,7 +844,7 @@ do_delete_partition(partition_map_header *map)
return;
}
if (!rflag && map->writeable == 0) {
- printf("The map is not writeable.\n");
+ printf("The map is not writable.\n");
}
if (get_number_argument("Partition number: ", &index, kDefault) == 0) {
bad_input("Bad partition number");
@@ -872,7 +872,7 @@ do_reorder(partition_map_header *map)
return;
}
if (!rflag && map->writeable == 0) {
- printf("The map is not writeable.\n");
+ printf("The map is not writable.\n");
}
if (get_number_argument("Partition number: ", &old_index, kDefault) == 0) {
bad_input("Bad partition number");
@@ -899,7 +899,7 @@ do_write_partition_map(partition_map_header *map)
return;
}
if (map->writeable == 0) {
- bad_input("The map is not writeable.");
+ bad_input("The map is not writable.");
return;
}
printf("Writing the map destroys what was there before. ");
@@ -1006,7 +1006,7 @@ do_change_map_size(partition_map_header *map)
return;
}
if (!rflag && map->writeable == 0) {
- printf("The map is not writeable.\n");
+ printf("The map is not writable.\n");
}
if (get_number_argument("New size: ", &size, kDefault) == 0) {
bad_input("Bad size");
diff --git a/usr.bin/file/file.c b/usr.bin/file/file.c
index 7c1bcec6089..ba84ad6a4f3 100644
--- a/usr.bin/file/file.c
+++ b/usr.bin/file/file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: file.c,v 1.9 2002/11/29 00:27:03 millert Exp $ */
+/* $OpenBSD: file.c,v 1.10 2002/12/15 13:30:17 henning Exp $ */
/*
* file - find type of a file or files - main program.
@@ -27,7 +27,7 @@
* 4. This notice may not be removed or altered.
*/
#ifndef lint
-static char *moduleid = "$OpenBSD: file.c,v 1.9 2002/11/29 00:27:03 millert Exp $";
+static char *moduleid = "$OpenBSD: file.c,v 1.10 2002/12/15 13:30:17 henning Exp $";
#endif /* lint */
#include <stdio.h>
@@ -316,7 +316,7 @@ 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/mkdep/mkdep.append b/usr.bin/mkdep/mkdep.append
index ddda7c23d87..a1242039b98 100644
--- a/usr.bin/mkdep/mkdep.append
+++ b/usr.bin/mkdep/mkdep.append
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: mkdep.append,v 1.5 1997/01/25 14:27:43 niklas Exp $
+# $OpenBSD: mkdep.append,v 1.6 2002/12/15 13:30:17 henning Exp $
# $NetBSD: mkdep.append,v 1.2 1994/12/23 07:34:57 jtc Exp $
#
# Copyright (c) 1991, 1993
@@ -62,7 +62,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 9338fc3c0e1..e0c182450e9 100644
--- a/usr.bin/mkdep/mkdep.old.compiler
+++ b/usr.bin/mkdep/mkdep.old.compiler
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: mkdep.old.compiler,v 1.4 1997/01/25 08:47:57 deraadt Exp $
+# $OpenBSD: mkdep.old.compiler,v 1.5 2002/12/15 13:30:17 henning Exp $
# $NetBSD: mkdep.old.compiler,v 1.2 1994/12/23 07:35:00 jtc Exp $
#
# Copyright (c) 1991, 1993
@@ -66,7 +66,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 39edbcb1748..b032565241b 100644
--- a/usr.bin/mkdep/mkdep.ultrix
+++ b/usr.bin/mkdep/mkdep.ultrix
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: mkdep.ultrix,v 1.5 1997/01/25 14:27:45 niklas Exp $
+# $OpenBSD: mkdep.ultrix,v 1.6 2002/12/15 13:30:17 henning Exp $
# $NetBSD: mkdep.ultrix,v 1.2 1994/12/23 07:35:04 jtc Exp $
#
# Copyright (c) 1991, 1993
@@ -62,7 +62,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/vi/ex/ex_init.c b/usr.bin/vi/ex/ex_init.c
index d679a4a5f93..b6b5fd7c8f1 100644
--- a/usr.bin/vi/ex/ex_init.c
+++ b/usr.bin/vi/ex/ex_init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ex_init.c,v 1.7 2002/02/16 21:27:57 millert Exp $ */
+/* $OpenBSD: ex_init.c,v 1.8 2002/12/15 13:30:17 henning Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -392,7 +392,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)
@@ -409,7 +409,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;
}