diff options
| author | Karel Zak | 2014-03-28 10:36:05 +0100 |
|---|---|---|
| committer | Karel Zak | 2014-03-28 10:36:05 +0100 |
| commit | c48508c2faa356c48c26d7d0070a6f20ae4ba9a0 (patch) | |
| tree | 9e60a32ca2ba8ac140a239d54048675d9945a662 /misc-utils/findfs.c | |
| parent | findfs: use symbolic exit values, and tell about them in manual (diff) | |
| download | kernel-qcow2-util-linux-c48508c2faa356c48c26d7d0070a6f20ae4ba9a0.tar.gz kernel-qcow2-util-linux-c48508c2faa356c48c26d7d0070a6f20ae4ba9a0.tar.xz kernel-qcow2-util-linux-c48508c2faa356c48c26d7d0070a6f20ae4ba9a0.zip | |
findfs: add ability to work with PART{UUID,LABEL}= too
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'misc-utils/findfs.c')
| -rw-r--r-- | misc-utils/findfs.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/misc-utils/findfs.c b/misc-utils/findfs.c index 23d121b0b..59f9ce072 100644 --- a/misc-utils/findfs.c +++ b/misc-utils/findfs.c @@ -25,8 +25,7 @@ static void __attribute__((__noreturn__)) usage(int rc) { FILE *out = rc ? stderr : stdout; fputs(USAGE_HEADER, out); - fprintf(out, _(" %1$s [options] LABEL=<label>\n" - " %1$s [options] UUID=<uuid>\n"), + fprintf(out, _(" %s [options] {LABEL,UUID,PARTUUID,PARTLABEL}=<value>\n"), program_invocation_short_name); fputs(USAGE_OPTIONS, out); fputs(USAGE_HELP, out); @@ -37,7 +36,7 @@ static void __attribute__((__noreturn__)) usage(int rc) int main(int argc, char **argv) { - char *dev, *tk, *vl; + char *dev; setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALEDIR); @@ -49,23 +48,17 @@ int main(int argc, char **argv) * with version from e2fsprogs */ usage(FINDFS_USAGE_ERROR); - if (!strncmp(argv[1], "LABEL=", 6)) { - tk = "LABEL"; - vl = argv[1] + 6; - } else if (!strncmp(argv[1], "UUID=", 5)) { - tk = "UUID"; - vl = argv[1] + 5; - } else if (strcmp(argv[1], "-V") == 0 || + if (strcmp(argv[1], "-V") == 0 || strcmp(argv[1], "--version") == 0) { printf(UTIL_LINUX_VERSION); return FINDFS_SUCCESS; } else if (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0) { usage(FINDFS_SUCCESS); - } else + } else if (argv[1][0] == '-') usage(FINDFS_USAGE_ERROR); - dev = blkid_evaluate_tag(tk, vl, NULL); + dev = blkid_evaluate_tag(argv[1], NULL, NULL); if (!dev) errx(FINDFS_NOT_FOUND, _("unable to resolve '%s'"), argv[1]); |