label: use internal utility functions wher epossible

This commit is contained in:
Lennart Poettering 2010-11-07 23:03:19 -05:00
parent e23a0ce8ba
commit dce8e2e123

View File

@ -258,20 +258,15 @@ int label_mkdir(
if (use_selinux() && label_hnd) { if (use_selinux() && label_hnd) {
if (path[0] == '/') if (path_is_absolute(path))
r = selabel_lookup_raw(label_hnd, &fcon, path, mode); r = selabel_lookup_raw(label_hnd, &fcon, path, mode);
else { else {
char *cwd = NULL, *newpath = NULL; char *newpath = NULL;
cwd = get_current_dir_name(); if (!(newpath = path_make_absolute_cwd(path)))
return -ENOMEM;
if (cwd || asprintf(&newpath, "%s/%s", cwd, path) < 0) {
free(cwd);
return -errno;
}
r = selabel_lookup_raw(label_hnd, &fcon, newpath, mode); r = selabel_lookup_raw(label_hnd, &fcon, newpath, mode);
free(cwd);
free(newpath); free(newpath);
} }