Module Name: src
Committed By: snj
Date: Sat Jan 9 01:15:43 UTC 2010
Modified Files:
src/dist/pdisk [netbsd-5]: pdisk.c
src/distrib/amiga/floppies/upgr [netbsd-5]: upgrade.sh
src/sbin/newfs_udf [netbsd-5]: newfs_udf.8 udf_create.c
Log Message:
Pull up following revision(s) (requested by mbalmer in ticket #1209):
dist/pdisk/pdisk.c: revision 1.18
distrib/amiga/floppies/upgr/upgrade.sh: revision 1.9
sbin/newfs_udf/newfs_udf.8: revision 1.6
sbin/newfs_udf/udf_create.c: revision 1.17
Fix typo in command output.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.26.1 src/dist/pdisk/pdisk.c
cvs rdiff -u -r1.8 -r1.8.40.1 src/distrib/amiga/floppies/upgr/upgrade.sh
cvs rdiff -u -r1.4.4.1 -r1.4.4.2 src/sbin/newfs_udf/newfs_udf.8
cvs rdiff -u -r1.12.4.3 -r1.12.4.4 src/sbin/newfs_udf/udf_create.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/pdisk/pdisk.c
diff -u src/dist/pdisk/pdisk.c:1.17 src/dist/pdisk/pdisk.c:1.17.26.1
--- src/dist/pdisk/pdisk.c:1.17 Wed Jul 13 15:25:29 2005
+++ src/dist/pdisk/pdisk.c Sat Jan 9 01:15:43 2010
@@ -165,7 +165,7 @@
init_program_name(argv);
if (sizeof(DPME) != PBLOCK_SIZE) {
- fatal(-1, "Size of partion map entry (%d) "
+ fatal(-1, "Size of partition map entry (%d) "
"is not equal to block size (%d)\n",
sizeof(DPME), PBLOCK_SIZE);
}
Index: src/distrib/amiga/floppies/upgr/upgrade.sh
diff -u src/distrib/amiga/floppies/upgr/upgrade.sh:1.8 src/distrib/amiga/floppies/upgr/upgrade.sh:1.8.40.1
--- src/distrib/amiga/floppies/upgr/upgrade.sh:1.8 Sat Jul 26 17:06:31 2003
+++ src/distrib/amiga/floppies/upgr/upgrade.sh Sat Jan 9 01:15:43 2010
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: upgrade.sh,v 1.8 2003/07/26 17:06:31 salo Exp $
+# $NetBSD: upgrade.sh,v 1.8.40.1 2010/01/09 01:15:43 snj Exp $
#
# Copyright (c) 1994 Christopher G. Demetriou
# All rights reserved.
@@ -148,7 +148,7 @@
echo "system. If it cannot, hit Control-C at the prompt."
echo ""
while [ "X${drivename}" = "X" ]; do
- echo -n "Which disk contains your root partion? "
+ echo -n "Which disk contains your root partition? "
getresp
otherdrives=`echo "${driveunits}" | sed -e s,${resp},,`
if [ "X${driveunits}" = "X${otherdrives}" ]; then
Index: src/sbin/newfs_udf/newfs_udf.8
diff -u src/sbin/newfs_udf/newfs_udf.8:1.4.4.1 src/sbin/newfs_udf/newfs_udf.8:1.4.4.2
--- src/sbin/newfs_udf/newfs_udf.8:1.4.4.1 Wed Feb 18 00:37:00 2009
+++ src/sbin/newfs_udf/newfs_udf.8 Sat Jan 9 01:15:43 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: newfs_udf.8,v 1.4.4.1 2009/02/18 00:37:00 snj Exp $
+.\" $NetBSD: newfs_udf.8,v 1.4.4.2 2010/01/09 01:15:43 snj Exp $
.\"
.\" Copyright (c) 2008 Reinoud Zandijk
.\" All rights reserved.
@@ -70,7 +70,7 @@
.Ar setlabel .
For strict conformance and interchange, don't set this manually.
.It Fl M
-Disable metadata partion creation when selected UDF version or media dictates
+Disable metadata partition creation when selected UDF version or media dictates
this. For strict conformance and interchange, don't disable this unless its
causing problems.
.It Fl s Ar size
Index: src/sbin/newfs_udf/udf_create.c
diff -u src/sbin/newfs_udf/udf_create.c:1.12.4.3 src/sbin/newfs_udf/udf_create.c:1.12.4.4
--- src/sbin/newfs_udf/udf_create.c:1.12.4.3 Sat Jun 6 22:04:40 2009
+++ src/sbin/newfs_udf/udf_create.c Sat Jan 9 01:15:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_create.c,v 1.12.4.3 2009/06/06 22:04:40 bouyer Exp $ */
+/* $NetBSD: udf_create.c,v 1.12.4.4 2010/01/09 01:15:43 snj Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: udf_create.c,v 1.12.4.3 2009/06/06 22:04:40 bouyer Exp $");
+__RCSID("$NetBSD: udf_create.c,v 1.12.4.4 2010/01/09 01:15:43 snj Exp $");
#endif /* not lint */
#include <stdio.h>
@@ -309,7 +309,7 @@
printf("\tsparable size\t\t%d\n", layout.sparable_area_size);
printf("\tsparable\t\t%d\n", layout.sparable_area);
}
- printf("\tpartion start lba\t%d\n", layout.part_start_lba);
+ printf("\tpartition start lba\t%d\n", layout.part_start_lba);
printf("\tpartition size\t\t%d KiB, %d MiB\n",
(layout.part_size_lba * sector_size) / 1024,
(layout.part_size_lba * sector_size) / (1024*1024));
@@ -782,7 +782,7 @@
context.part_size[log_part] = layout.part_size_lba;
context.part_free[log_part] = layout.part_size_lba;
- /* increment number of partions and length */
+ /* increment number of partitions and length */
logvol->n_pm = udf_rw32(log_part + 1);
logvol->mt_l = udf_rw32(udf_rw32(logvol->mt_l) + pmap1_size);
@@ -820,7 +820,7 @@
context.part_size[log_part] = 0xffffffff;
context.part_free[log_part] = 0xffffffff;
- /* increment number of partions and length */
+ /* increment number of partitions and length */
logvol->n_pm = udf_rw32(log_part + 1);
logvol->mt_l = udf_rw32(udf_rw32(logvol->mt_l) + pmapv_size);
@@ -875,7 +875,7 @@
context.part_size[log_part] = layout.part_size_lba;
context.part_free[log_part] = layout.part_size_lba;
- /* increment number of partions and length */
+ /* increment number of partitions and length */
logvol->n_pm = udf_rw32(log_part + 1);
logvol->mt_l = udf_rw32(udf_rw32(logvol->mt_l) + pmaps_size);
@@ -962,7 +962,7 @@
context.part_size[log_part] = layout.meta_part_size_lba;
context.part_free[log_part] = layout.meta_part_size_lba;
- /* increment number of partions and length */
+ /* increment number of partitions and length */
logvol->n_pm = udf_rw32(log_part + 1);
logvol->mt_l = udf_rw32(udf_rw32(logvol->mt_l) + pmapv_size);
@@ -1792,7 +1792,7 @@
free(extattr);
- /* writeout VAT locations (partion offsets) */
+ /* writeout VAT locations (partition offsets) */
vat_pos = (uint32_t *) (fe->data + udf_rw32(fe->l_ea));
vat_pos[layout.rootdir] = udf_rw32(layout.rootdir);
vat_pos[layout.fsd ] = udf_rw32(layout.fsd);
