[src/trunk]: src/sbin/gpt In the manpage:

[jnemeth <jnemeth%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/29400a755b23
branches:  trunk
changeset: 791520:29400a755b23
user:      jnemeth <jnemeth%NetBSD.org@localhost>
date:      Fri Nov 22 03:50:05 2013 +0000

description:
In the manpage:
- s/-b number/-b blocknr/
- s/-s count/-s sectors/
- s/-p count/-p partitions/

In the program:
- s/-b lba/-b blocknr/
- s/-s lba/-s sectors/

This makes the documentation in the manpage and the program consistent
and makes it more clear what the parameters are.  Also, "-s lba" was
just plain wrong since LBA stands for Logical Block Address[ing], and
the -s option didn't represent any kind of address, but rather a size.

diffstat:

 sbin/gpt/add.c    |   6 +++---
 sbin/gpt/gpt.8    |  28 ++++++++++++++--------------
 sbin/gpt/label.c  |   4 ++--
 sbin/gpt/remove.c |   4 ++--
 sbin/gpt/resize.c |   5 +++--
 5 files changed, 24 insertions(+), 23 deletions(-)

diffs (192 lines):

diff -r a5d3f26e5ac1 -r 29400a755b23 sbin/gpt/add.c
--- a/sbin/gpt/add.c    Fri Nov 22 02:02:35 2013 +0000
+++ b/sbin/gpt/add.c    Fri Nov 22 03:50:05 2013 +0000
@@ -29,7 +29,7 @@
 __FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: add.c,v 1.17 2013/11/19 22:41:43 jnemeth Exp $");
+__RCSID("$NetBSD: add.c,v 1.18 2013/11/22 03:50:05 jnemeth Exp $");
 #endif
 
 #include <sys/types.h>
@@ -50,8 +50,8 @@
 static unsigned int entry;
 static uint8_t *name;
 
-const char addmsg1[] = "add [-a alignment] [-b lba] [-i index] [-l label]";
-const char addmsg2[] = "    [-s lba] [-t type] device ...";
+const char addmsg1[] = "add [-a alignment] [-b blocknr] [-i index] [-l label]";
+const char addmsg2[] = "    [-s sectors] [-t type] device ...";
 
 __dead static void
 usage_add(void)
diff -r a5d3f26e5ac1 -r 29400a755b23 sbin/gpt/gpt.8
--- a/sbin/gpt/gpt.8    Fri Nov 22 02:02:35 2013 +0000
+++ b/sbin/gpt/gpt.8    Fri Nov 22 03:50:05 2013 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: gpt.8,v 1.18 2013/11/20 08:11:36 wiz Exp $
+.\" $NetBSD: gpt.8,v 1.19 2013/11/22 03:50:05 jnemeth Exp $
 .\"
 .\" Copyright (c) 2002 Marcel Moolenaar
 .\" All rights reserved.
@@ -68,7 +68,7 @@
 have an effect on all commands.
 .Pp
 The
-.Fl p Ar count
+.Fl p Ar partitions
 option allows the user to change the number of partitions the GPT can
 accommodate.
 This is used whenever a new GPT is created.
@@ -94,8 +94,8 @@
 .Ss Commands
 .Bl -tag -width indent
 .\" ==== add ====
-.It Nm Ic add Oo Fl a Ar alignment Oc Oo Fl b Ar number Oc \
-Oo Fl i Ar index Oc Oo Fl l Ar label Oc Oo Fl s Ar count Oc \
+.It Nm Ic add Oo Fl a Ar alignment Oc Oo Fl b Ar blocknr Oc \
+Oo Fl i Ar index Oc Oo Fl l Ar label Oc Oo Fl s Ar sectors Oc \
 Oo Fl t Ar type Oc Ar device ...
 The
 .Ic add
@@ -113,7 +113,7 @@
 If it can not, then it will attempt to create an unaligned partition.
 .Pp
 The
-.Fl b Ar number
+.Fl b Ar blocknr
 option allows the user to specify the starting (beginning) sector number of
 the partition.
 The minimum sector number is 1, but has to fall inside an unused region of
@@ -130,7 +130,7 @@
 option allows the user to specify a label for the partition.
 .Pp
 The
-.Fl s Ar count
+.Fl s Ar sectors
 option allows the user to specify the size of the partition in sectors.
 The minimum size is 1.
 .Pp
@@ -200,8 +200,8 @@
 to destroy the table in a way that it can be recovered.
 .\" ==== label ====
 .It Nm Ic label Oo Fl a Oc Ao Fl f Ar file | Fl l Ar label Ac Ar device ...
-.It Nm Ic label Oo Fl b Ar number Oc Oo Fl i Ar index Oc \
-Oo Fl s Ar count Oc Oo Fl t Ar type Oc \
+.It Nm Ic label Oo Fl b Ar blocknr Oc Oo Fl i Ar index Oc \
+Oo Fl s Ar sectors Oc Oo Fl t Ar type Oc \
 Ao Fl f Ar file | Fl l Ar label Ac Ar device ...
 The
 .Ic label
@@ -214,7 +214,7 @@
 It is mutually exclusive with all other selection options.
 .Pp
 The
-.Fl b Ar number
+.Fl b Ar blocknr
 option selects the partition that starts at the given block number.
 .Pp
 The
@@ -222,7 +222,7 @@
 option selects the partition with the given partition number.
 .Pp
 The
-.Fl s Ar count
+.Fl s Ar sectors
 option selects all partitions that have the given size.
 This can cause multiple partitions to be labeled.
 .Pp
@@ -304,8 +304,8 @@
 It is very useful in case the primary label was deleted.
 .\" ==== remove ====
 .It Nm Ic remove Oo Fl a Oc Ar device ...
-.It Nm Ic remove Oo Fl b Ar number Oc Oo Fl i Ar index Oc \
-Oo Fl s Ar count Oc Oo Fl t Ar type Oc Ar device ...
+.It Nm Ic remove Oo Fl b Ar blocknr Oc Oo Fl i Ar index Oc \
+Oo Fl s Ar sectors Oc Oo Fl t Ar type Oc Ar device ...
 The
 .Ic remove
 command allows the user to remove any and all partitions that match the
@@ -318,7 +318,7 @@
 No other information is changed.
 .\" ==== resize ====
 .It Nm Ic resize Fl i Ar index Oo Fl a Ar alignment Oc \
-Oo Fl s Ar count Oc Ar device ...
+Oo Fl s Ar sectors Oc Ar device ...
 The
 .Ic resize
 command allows the user to resize a partition.
@@ -423,7 +423,7 @@
 possible that future versions will not be compatible in the strictest sense
 of the word.
 For example, the
-.Fl p Ar count
+.Fl p Ar partitions
 option may be changed to a command option rather than a generic option.
 There are only two commands that use it so there is a chance that the natural
 tendency for people is to use it as a command option.
diff -r a5d3f26e5ac1 -r 29400a755b23 sbin/gpt/label.c
--- a/sbin/gpt/label.c  Fri Nov 22 02:02:35 2013 +0000
+++ b/sbin/gpt/label.c  Fri Nov 22 03:50:05 2013 +0000
@@ -29,7 +29,7 @@
 __FBSDID("$FreeBSD: src/sbin/gpt/label.c,v 1.3 2006/10/04 18:20:25 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: label.c,v 1.10 2013/04/13 18:04:33 jakllsch Exp $");
+__RCSID("$NetBSD: label.c,v 1.11 2013/11/22 03:50:05 jnemeth Exp $");
 #endif
 
 #include <sys/types.h>
@@ -51,7 +51,7 @@
 static uint8_t *name;
 
 const char labelmsg1[] = "label -a <-l label | -f file> device ...";
-const char labelmsg2[] = "label [-b lba] [-i index] [-s lba]";
+const char labelmsg2[] = "label [-b blocknr] [-i index] [-s sectors]";
 const char labelmsg3[] = "      [-t uuid] <-l label | -f file> device ...";
 
 __dead static void
diff -r a5d3f26e5ac1 -r 29400a755b23 sbin/gpt/remove.c
--- a/sbin/gpt/remove.c Fri Nov 22 02:02:35 2013 +0000
+++ b/sbin/gpt/remove.c Fri Nov 22 03:50:05 2013 +0000
@@ -29,7 +29,7 @@
 __FBSDID("$FreeBSD: src/sbin/gpt/remove.c,v 1.10 2006/10/04 18:20:25 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: remove.c,v 1.8 2013/04/13 18:04:33 jakllsch Exp $");
+__RCSID("$NetBSD: remove.c,v 1.9 2013/11/22 03:50:05 jnemeth Exp $");
 #endif
 
 #include <sys/types.h>
@@ -50,7 +50,7 @@
 static unsigned int entry;
 
 const char removemsg1[] = "remove -a device ...";
-const char removemsg2[] = "remove [-b lba] [-i index] [-s lba] "
+const char removemsg2[] = "remove [-b blocknr] [-i index] [-s sectors] "
        "[-t type] device ...";
 
 __dead static void
diff -r a5d3f26e5ac1 -r 29400a755b23 sbin/gpt/resize.c
--- a/sbin/gpt/resize.c Fri Nov 22 02:02:35 2013 +0000
+++ b/sbin/gpt/resize.c Fri Nov 22 03:50:05 2013 +0000
@@ -29,7 +29,7 @@
 __FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: resize.c,v 1.1 2013/11/20 08:08:47 jnemeth Exp $");
+__RCSID("$NetBSD: resize.c,v 1.2 2013/11/22 03:50:05 jnemeth Exp $");
 #endif
 
 #include <sys/types.h>
@@ -48,7 +48,8 @@
 static off_t alignment, size;
 static unsigned int entry;
 
-const char resizemsg[] = "resize -i index [-a alignment] [-s lba] device ...";
+const char resizemsg[] = "resize -i index [-a alignment] [-s sectors] "
+       "device ...";
 
 __dead static void
 usage_resize(void)