diff options
| author | Karel Zak | 2018-06-20 16:41:51 +0200 |
|---|---|---|
| committer | Karel Zak | 2018-06-21 13:19:28 +0200 |
| commit | 905bc7817ecae1df10e32bed2a0a68c11928ddc9 (patch) | |
| tree | bbb1dba28fafcbf31dd2ab5619eab94e84ee856c | |
| parent | tests: add simple ATA and NVME lsblk dump (diff) | |
| download | kernel-qcow2-util-linux-905bc7817ecae1df10e32bed2a0a68c11928ddc9.tar.gz kernel-qcow2-util-linux-905bc7817ecae1df10e32bed2a0a68c11928ddc9.tar.xz kernel-qcow2-util-linux-905bc7817ecae1df10e32bed2a0a68c11928ddc9.zip | |
lsblk: fix ul_path_read_string() usage
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | lib/path.c | 8 | ||||
| -rw-r--r-- | misc-utils/lsblk.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/path.c b/lib/path.c index cfc1c2372..602674956 100644 --- a/lib/path.c +++ b/lib/path.c @@ -1141,12 +1141,12 @@ int main(int argc, char *argv[]) errx(EXIT_FAILURE, "<file> not defined"); file = argv[optind++]; - if (ul_path_read_string(pc, &res, file) != 0) - err(EXIT_FAILURE, "read u64 failed"); + if (ul_path_read_string(pc, &res, file) < 0) + err(EXIT_FAILURE, "read string failed"); printf("read: %s: %s\n", file, res); - if (ul_path_readf_string(pc, &res, "%s", file) != 0) - err(EXIT_FAILURE, "readf u64 failed"); + if (ul_path_readf_string(pc, &res, "%s", file) < 0) + err(EXIT_FAILURE, "readf string failed"); printf("readf: %s: %s\n", file, res); } else if (strcmp(command, "read-link") == 0) { diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c index a6c78a268..815ba1d71 100644 --- a/misc-utils/lsblk.c +++ b/misc-utils/lsblk.c @@ -716,7 +716,7 @@ static char *get_type(struct blkdev_cxt *cxt) /* The DM_UUID prefix should be set to subsystem owning * the device - LVM, CRYPT, DMRAID, MPATH, PART */ - if (ul_path_read_string(cxt->sysfs, &dm_uuid, "dm/uuid") == 0 + if (ul_path_read_string(cxt->sysfs, &dm_uuid, "dm/uuid") > 0 && dm_uuid) { char *tmp = dm_uuid; char *dm_uuid_prefix = strsep(&tmp, "-"); |