Eliminate the partially implemented -p option in blkid.

bitmap-optimize
Theodore Ts'o 2004-03-21 20:40:20 -05:00
parent 1cdb6f7602
commit 9b2d5e912b
3 changed files with 9 additions and 10 deletions

View File

@ -1,3 +1,9 @@
2004-03-21 Theodore Ts'o <tytso@mit.edu>
* 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 <tytso@mit.edu>
* blkid.c (main, print_tags): Add new option -o which allows the

View File

@ -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 .

View File

@ -38,7 +38,7 @@ static void usage(int error)
print_version(out);
fprintf(out,
"usage:\t%s [-c <file>] [-h] [-o format] "
"[-p] [-s <tag>] [-t <token>]\n [-v] [-w <file>] [dev ...]\n"
"[-s <tag>] [-t <token>]\n [-v] [-w <file>] [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)