mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-09-01 13:59:29 +00:00
Code Issues Releases Wiki Activity

Factorize handle of create=dir and create=file

Browse Source 
Signed-off-by: Nicolas Cornu <ncornu@aldebaran.com>
This commit is contained in:
Nicolas Cornu
2015-08-06 10:35:16 +02:00
parent f69d74e359
commit 4d5b72a186
1 changed files with 24 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/lxc/conf.c
View File

@@ -1804,36 +1804,46 @@ static void cull_mntent_opt(struct mntent *mntent)
} }
} }
static inline int mount_entry_on_systemfs(struct mntent *mntent) static int mount_entry_create_dir_file(const struct mntent *mntent,
const char* path)
{ {
unsigned long mntflags; char *pathdirname = NULL;
char *mntdata;
int ret; int ret;
FILE *pathfile = NULL; FILE *pathfile = NULL;
char* pathdirname = NULL;
bool optional = hasmntopt(mntent, "optional") != NULL;
if (hasmntopt(mntent, "create=dir")) { if (hasmntopt(mntent, "create=dir")) {
if (mkdir_p(mntent->mnt_dir, 0755) < 0) { if (mkdir_p(path, 0755) < 0) {
WARN("Failed to create mount target '%s'", mntent->mnt_dir); WARN("Failed to create mount target '%s'", path);
ret = -1; ret = -1;
} }
} }
if (hasmntopt(mntent, "create=file") && access(mntent->mnt_dir, F_OK)) { if (hasmntopt(mntent, "create=file") && access(path, F_OK)) {
pathdirname = strdup(mntent->mnt_dir); pathdirname = strdup(path);
pathdirname = dirname(pathdirname); pathdirname = dirname(pathdirname);
if (mkdir_p(pathdirname, 0755) < 0) { if (mkdir_p(pathdirname, 0755) < 0) {
WARN("Failed to create target directory"); WARN("Failed to create target directory");
} }
pathfile = fopen(mntent->mnt_dir, "wb"); pathfile = fopen(path, "wb");
if (!pathfile) { if (!pathfile) {
WARN("Failed to create mount target '%s'", mntent->mnt_dir); WARN("Failed to create mount target '%s'", path);
ret = -1; ret = -1;
} }
else else
fclose(pathfile); fclose(pathfile);
} }
free(pathdirname);
return ret;
}
static inline int mount_entry_on_systemfs(struct mntent *mntent)
{
unsigned long mntflags;
char *mntdata;
int ret;
bool optional = hasmntopt(mntent, "optional") != NULL;
ret = mount_entry_create_dir_file(mntent, mntent->mnt_dir);
cull_mntent_opt(mntent); cull_mntent_opt(mntent);
@@ -1845,7 +1855,6 @@ static inline int mount_entry_on_systemfs(struct mntent *mntent)
ret = mount_entry(mntent->mnt_fsname, mntent->mnt_dir, ret = mount_entry(mntent->mnt_fsname, mntent->mnt_dir,
mntent->mnt_type, mntflags, mntdata, optional); mntent->mnt_type, mntflags, mntdata, optional);
free(pathdirname);
free(mntdata); free(mntdata);
return ret; return ret;
@@ -1861,8 +1870,6 @@ static int mount_entry_on_absolute_rootfs(struct mntent *mntent,
char *mntdata; char *mntdata;
int r, ret = 0, offset; int r, ret = 0, offset;
const char *lxcpath; const char *lxcpath;
FILE *pathfile = NULL;
char *pathdirname = NULL;
bool optional = hasmntopt(mntent, "optional") != NULL; bool optional = hasmntopt(mntent, "optional") != NULL;
lxcpath = lxc_global_config_value("lxc.lxcpath"); lxcpath = lxc_global_config_value("lxc.lxcpath");
@@ -1901,27 +1908,8 @@ skipabs:
goto out; goto out;
} }
if (hasmntopt(mntent, "create=dir")) { ret = mount_entry_create_dir_file(mntent, path);
if (mkdir_p(path, 0755) < 0) {
WARN("Failed to create mount target '%s'", path);
ret = -1;
}
}
if (hasmntopt(mntent, "create=file") && access(path, F_OK)) {
pathdirname = strdup(path);
pathdirname = dirname(pathdirname);
if (mkdir_p(pathdirname, 0755) < 0) {
WARN("Failed to create target directory");
}
pathfile = fopen(path, "wb");
if (!pathfile) {
WARN("Failed to create mount target '%s'", path);
ret = -1;
}
else
fclose(pathfile);
}
cull_mntent_opt(mntent); cull_mntent_opt(mntent);
if (parse_mntopts(mntent->mnt_opts, &mntflags, &mntdata) < 0) { if (parse_mntopts(mntent->mnt_opts, &mntflags, &mntdata) < 0) {
@@ -1935,7 +1923,6 @@ skipabs:
free(mntdata); free(mntdata);
out: out:
free(pathdirname);
return ret; return ret;
} }
@@ -1946,8 +1933,6 @@ static int mount_entry_on_relative_rootfs(struct mntent *mntent,
unsigned long mntflags; unsigned long mntflags;
char *mntdata; char *mntdata;
int ret; int ret;
FILE *pathfile = NULL;
char *pathdirname = NULL;
bool optional = hasmntopt(mntent, "optional") != NULL; bool optional = hasmntopt(mntent, "optional") != NULL;
/* relative to root mount point */ /* relative to root mount point */
@@ -1957,27 +1942,8 @@ static int mount_entry_on_relative_rootfs(struct mntent *mntent,
return -1; return -1;
} }
if (hasmntopt(mntent, "create=dir")) { ret = mount_entry_create_dir_file(mntent, path);
if (mkdir_p(path, 0755) < 0) {
WARN("Failed to create mount target '%s'", path);
ret = -1;
}
}
if (hasmntopt(mntent, "create=file") && access(path, F_OK)) {
pathdirname = strdup(path);
pathdirname = dirname(pathdirname);
if (mkdir_p(pathdirname, 0755) < 0) {
WARN("Failed to create target directory");
}
pathfile = fopen(path, "wb");
if (!pathfile) {
WARN("Failed to create mount target '%s'", path);
ret = -1;
}
else
fclose(pathfile);
}
cull_mntent_opt(mntent); cull_mntent_opt(mntent);
if (parse_mntopts(mntent->mnt_opts, &mntflags, &mntdata) < 0) { if (parse_mntopts(mntent->mnt_opts, &mntflags, &mntdata) < 0) {
@@ -1988,7 +1954,6 @@ static int mount_entry_on_relative_rootfs(struct mntent *mntent,
ret = mount_entry(mntent->mnt_fsname, path, mntent->mnt_type, ret = mount_entry(mntent->mnt_fsname, path, mntent->mnt_type,
mntflags, mntdata, optional); mntflags, mntdata, optional);
free(pathdirname);
free(mntdata); free(mntdata);
return ret; return ret;