libfdisk: reduce number of asprintf() calls, check return value
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
parent
7377518976
commit
e6dfbd70ea
|
@ -153,25 +153,30 @@ char *fdisk_partname(const char *dev, size_t partno)
|
||||||
if ((strncmp(dev, _PATH_DEV_BYID, sizeof(_PATH_DEV_BYID) - 1) == 0) ||
|
if ((strncmp(dev, _PATH_DEV_BYID, sizeof(_PATH_DEV_BYID) - 1) == 0) ||
|
||||||
strncmp(dev, _PATH_DEV_BYPATH, sizeof(_PATH_DEV_BYPATH) - 1) == 0 ||
|
strncmp(dev, _PATH_DEV_BYPATH, sizeof(_PATH_DEV_BYPATH) - 1) == 0 ||
|
||||||
strncmp(dev, "/dev/mapper", sizeof("/dev/mapper") - 1) == 0) {
|
strncmp(dev, "/dev/mapper", sizeof("/dev/mapper") - 1) == 0) {
|
||||||
asprintf(&res, "%.*s%zu", w, dev, partno);
|
|
||||||
if (access(res, F_OK) == 0){
|
/* check for <name><partno>, e.g. mpatha1 */
|
||||||
p = "";
|
if (asprintf(&res, "%.*s%zu", w, dev, partno) <= 0)
|
||||||
} else {
|
res = NULL;
|
||||||
/* check for partition seperator "p" */
|
if (res && access(res, F_OK) == 0)
|
||||||
p = "p";
|
goto done;
|
||||||
free(res);
|
|
||||||
asprintf(&res, "%.*s%s%zu", w, dev, p, partno);
|
|
||||||
if (access(res, F_OK) != 0){
|
|
||||||
/* otherwise, default to "-path" */
|
|
||||||
p = "-part";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
free(res);
|
free(res);
|
||||||
|
|
||||||
|
/* check for partition seperator "p" */
|
||||||
|
if (asprintf(&res, "%.*sp%zu", w, dev, partno) <= 0)
|
||||||
|
res = NULL;
|
||||||
|
if (res && access(res, F_OK) == 0)
|
||||||
|
goto done;
|
||||||
|
|
||||||
|
free(res);
|
||||||
|
|
||||||
|
/* otherwise, default to "-path" */
|
||||||
|
p = "-part";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (asprintf(&res, "%.*s%s%zu", w, dev, p, partno) <= 0)
|
if (asprintf(&res, "%.*s%s%zu", w, dev, p, partno) <= 0)
|
||||||
res = NULL;
|
res = NULL;
|
||||||
|
done:
|
||||||
free(dev_mapped);
|
free(dev_mapped);
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue