proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-15 02:19:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lxccontainer: do_add_remove_node()

Browse Source 
thread-safety: s/exit()/_exit()/g

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2018-02-23 14:21:51 +01:00
parent d8480a31b4
commit a7764ce792
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lxc/lxccontainer.c
View File

@ -4262,11 +4262,11 @@ static bool do_add_remove_node(pid_t init_pid, const char *path, bool add,
ret = chroot(chrootpath); ret = chroot(chrootpath);
if (ret < 0) if (ret < 0)
exit(EXIT_FAILURE); _exit(EXIT_FAILURE);
ret = chdir("/"); ret = chdir("/");
if (ret < 0) if (ret < 0)
exit(EXIT_FAILURE); _exit(EXIT_FAILURE);
/* remove path if it exists */ /* remove path if it exists */
ret = faccessat(AT_FDCWD, path, F_OK, AT_SYMLINK_NOFOLLOW); ret = faccessat(AT_FDCWD, path, F_OK, AT_SYMLINK_NOFOLLOW);
@ -4274,24 +4274,24 @@ static bool do_add_remove_node(pid_t init_pid, const char *path, bool add,
ret = unlink(path); ret = unlink(path);
if (ret < 0) { if (ret < 0) {
ERROR("%s - Failed to remove \"%s\"", strerror(errno), path); ERROR("%s - Failed to remove \"%s\"", strerror(errno), path);
exit(EXIT_FAILURE); _exit(EXIT_FAILURE);
} }
} }
if (!add) if (!add)
exit(EXIT_SUCCESS); _exit(EXIT_SUCCESS);
/* create any missing directories */ /* create any missing directories */
tmp = strdup(path); tmp = strdup(path);
if (!tmp) if (!tmp)
exit(EXIT_FAILURE); _exit(EXIT_FAILURE);
directory_path = dirname(tmp); directory_path = dirname(tmp);
ret = mkdir_p(directory_path, 0755); ret = mkdir_p(directory_path, 0755);
if (ret < 0 && errno != EEXIST) { if (ret < 0 && errno != EEXIST) {
ERROR("%s - Failed to create path \"%s\"", strerror(errno), directory_path); ERROR("%s - Failed to create path \"%s\"", strerror(errno), directory_path);
free(tmp); free(tmp);
exit(EXIT_FAILURE); _exit(EXIT_FAILURE);
} }
/* create the device node */ /* create the device node */
@ -4299,10 +4299,10 @@ static bool do_add_remove_node(pid_t init_pid, const char *path, bool add,
free(tmp); free(tmp);
if (ret < 0) { if (ret < 0) {
ERROR("%s - Failed to create device node at \"%s\"", strerror(errno), path); ERROR("%s - Failed to create device node at \"%s\"", strerror(errno), path);
exit(EXIT_FAILURE); _exit(EXIT_FAILURE);
} }
exit(EXIT_SUCCESS); _exit(EXIT_SUCCESS);
} }
static bool add_remove_device_node(struct lxc_container *c, const char *src_path, const char *dest_path, bool add) static bool add_remove_device_node(struct lxc_container *c, const char *src_path, const char *dest_path, bool add)