External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 19:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce code duplication in virFileMakePath(Helper)

Browse Source 
Move stat and mkdir to virFileMakePathHelper.

Also use the stat result to detect whether the existing path
is a directory and set errno accordingly if it's not.
This commit is contained in:
Matthias Bolte 2011-07-06 15:39:21 +02:00
parent 2d2d6a01d7
commit cd9a4232e5
1 changed files with 14 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/util/util.c
View File

@ -1013,11 +1013,17 @@ int virDirCreate(const char *path ATTRIBUTE_UNUSED,
static int virFileMakePathHelper(char *path)
{
struct stat st;
char *p = NULL;
char *p;
if (stat(path, &st) >= 0)
return 0;
else if (errno != ENOENT)
if (stat(path, &st) >= 0) {
if (S_ISDIR(st.st_mode))
return 0;
errno = ENOTDIR;
return -1;
}
if (errno != ENOENT)
return -1;
if ((p = strrchr(path, '/')) == NULL) {
@ -1049,39 +1055,15 @@ static int virFileMakePathHelper(char *path)
int virFileMakePath(const char *path)
{
int ret = -1;
struct stat st;
char *parent = NULL;
char *p;
char *tmp;
if (stat(path, &st) >= 0)
return 0;
else if (errno != ENOENT)
if ((tmp = strdup(path)) == NULL)
goto cleanup;
if ((parent = strdup(path)) == NULL) {
errno = ENOMEM;
goto cleanup;
}
if ((p = strrchr(parent, '/')) == NULL) {
errno = EINVAL;
goto cleanup;
}
if (p != parent) {
*p = '\0';
if (virFileMakePathHelper(parent) < 0)
goto cleanup;
}
if (mkdir(path, 0777) < 0 && errno != EEXIST)
goto cleanup;
ret = 0;
ret = virFileMakePathHelper(tmp);
cleanup:
VIR_FREE(parent);
VIR_FREE(tmp);
return ret;
}