ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lsblk: fix ul_path_read_string() usage 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2018-06-20 16:41:51 +02:00
parent d6d24dda29
commit 905bc7817e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/path.c
View File

@ -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) {

2
misc-utils/lsblk.c
View File

@ -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, "-");