From 9b2d5e912b98a4a22d8daab2004ae92bd4a2d2a3 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sun, 21 Mar 2004 20:40:20 -0500 Subject: [PATCH] Eliminate the partially implemented -p option in blkid. --- misc/ChangeLog | 6 ++++++ misc/blkid.8.in | 9 +-------- misc/blkid.c | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/misc/ChangeLog b/misc/ChangeLog index 9ba40fb..70d5e6c 100644 --- a/misc/ChangeLog +++ b/misc/ChangeLog @@ -1,3 +1,9 @@ +2004-03-21 Theodore Ts'o + + * blkid.c: Remove the partially implemented -p option (it never + did anything, but was documented in the man page and the + usage display). + 2004-03-20 Theodore Ts'o * blkid.c (main, print_tags): Add new option -o which allows the diff --git a/misc/blkid.8.in b/misc/blkid.8.in index 6a4ca2d..14d9057 100644 --- a/misc/blkid.8.in +++ b/misc/blkid.8.in @@ -11,7 +11,7 @@ blkid \- command\-line utility to locate/print block device attributes .SH SYNOPSIS .B blkid [ -.B \-hpv +.B \-hv ] [ [ @@ -78,13 +78,6 @@ or .I device (only print the device name). .TP -.B \-p -Probe all available devices. This is the default when displaying -tokens. When searching for a token normally the cache file is -used to locate the device and only that device is probed (to ensure -cache coherency) and all devices are probed only if the token cannot -be found in the cache. -.TP .B \-s Show only the tags for each (specified) device that match .IR tag . diff --git a/misc/blkid.c b/misc/blkid.c index c529b07..1c5ac1b 100644 --- a/misc/blkid.c +++ b/misc/blkid.c @@ -38,7 +38,7 @@ static void usage(int error) print_version(out); fprintf(out, "usage:\t%s [-c ] [-h] [-o format] " - "[-p] [-s ] [-t ]\n [-v] [-w ] [dev ...]\n" + "[-s ] [-t ]\n [-v] [-w ] [dev ...]\n" "\t-c\tcache file (default: /etc/blkid.tab, /dev/null = none)\n" "\t-h\tprint this usage message and exit\n" "\t-s\tshow specified tag(s) (default show all tags)\n" @@ -103,7 +103,7 @@ int main(int argc, char **argv) int output_format = 0; char c; - while ((c = getopt (argc, argv, "c:f:ho:ps:t:w:v")) != EOF) + while ((c = getopt (argc, argv, "c:f:ho:s:t:w:v")) != EOF) switch (c) { case 'c': if (optarg && !*optarg) -- 1.8.3.1