mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-09-02 14:39:34 +00:00
Code Issues Releases Wiki Activity

lxccontainer: tweak some array handling helpers

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner
2021-08-27 16:14:19 +02:00
parent d993287e4f
commit 1f7dd3d5a0
1 changed files with 48 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
src/lxc/lxccontainer.c
View File

@@ -2301,17 +2301,18 @@ static bool add_to_clist(struct lxc_container ***list, struct lxc_container *c,
return true; return true;
} }
static char** get_from_array(char ***names, char *cname, int size) static char **get_from_array(char ***names, char *cname, int size)
{ {
if (!*names) if (!*names)
return NULL; return NULL;
return (char **)bsearch(&cname, *names, size, sizeof(char *), (int (*)(const void *, const void *))string_cmp); return bsearch(&cname, *names, size, sizeof(char *),
(int (*)(const void *, const void *))string_cmp);
} }
static bool array_contains(char ***names, char *cname, int size) static bool array_contains(char ***names, char *cname, int size)
{ {
if(get_from_array(names, cname, size) != NULL) if (get_from_array(names, cname, size))
return true; return true;
return false; return false;
@@ -2319,16 +2320,19 @@ static bool array_contains(char ***names, char *cname, int size)
static bool remove_from_array(char ***names, char *cname, int size) static bool remove_from_array(char ***names, char *cname, int size)
{ {
char **result = get_from_array(names, cname, size); char **result;
if (result != NULL) {
result = get_from_array(names, cname, size);
if (result) {
size_t i = result - *names; size_t i = result - *names;
char **newnames;
free(*result); free(*result);
memmove(*names+i, *names+i+1, (size-i-1) * sizeof(char*)); memmove(*names + i, *names + i + 1, (size - i - 1) * sizeof(char *));
char **newnames = (char**)realloc(*names, (size-1) * sizeof(char *));
if (!newnames) { newnames = realloc(*names, (size - 1) * sizeof(char *));
ERROR("Out of memory"); if (!newnames)
return true; return ret_set_errno(true, ENOMEM);
}
*names = newnames; *names = newnames;
return true; return true;
@@ -5421,10 +5425,11 @@ int lxc_get_wait_states(const char **states)
* These next two could probably be done smarter with reusing a common function * These next two could probably be done smarter with reusing a common function
* with different iterators and tests... * with different iterators and tests...
*/ */
int list_defined_containers(const char *lxcpath, char ***names, struct lxc_container ***cret) int list_defined_containers(const char *lxcpath, char ***names,
struct lxc_container ***cret)
{ {
__do_closedir DIR *dir = NULL; __do_closedir DIR *dir = NULL;
int i, cfound = 0, nfound = 0; size_t array_len = 0, name_array_len = 0, ct_array_len = 0;
struct dirent *direntp; struct dirent *direntp;
struct lxc_container *c; struct lxc_container *c;
@@ -5451,60 +5456,51 @@ int list_defined_containers(const char *lxcpath, char ***names, struct lxc_conta
if (!config_file_exists(lxcpath, direntp->d_name)) if (!config_file_exists(lxcpath, direntp->d_name))
continue; continue;
if (names) if (cret) {
if (!add_to_array(names, direntp->d_name, cfound)) c = lxc_container_new(direntp->d_name, lxcpath);
if (!c) {
INFO("Container %s:%s has a config but could not be loaded",
lxcpath, direntp->d_name);
continue;
}
if (!do_lxcapi_is_defined(c)) {
INFO("Container %s:%s has a config but is not defined",
lxcpath, direntp->d_name);
lxc_container_put(c);
continue;
}
}
if (names) {
if (!add_to_array(names, direntp->d_name, array_len))
goto free_bad; goto free_bad;
name_array_len++;
cfound++;
if (!cret) {
nfound++;
continue;
} }
c = lxc_container_new(direntp->d_name, lxcpath); if (cret) {
if (!c) { if (!add_to_clist(cret, c, array_len, true)) {
INFO("Container %s:%s has a config but could not be loaded", lxc_container_put(c);
lxcpath, direntp->d_name); goto free_bad;
}
if (names) ct_array_len++;
if(!remove_from_array(names, direntp->d_name, cfound--))
goto free_bad;
continue;
} }
if (!do_lxcapi_is_defined(c)) { array_len++;
INFO("Container %s:%s has a config but is not defined",
lxcpath, direntp->d_name);
if (names)
if(!remove_from_array(names, direntp->d_name, cfound--))
goto free_bad;
lxc_container_put(c);
continue;
}
if (!add_to_clist(cret, c, nfound, true)) {
lxc_container_put(c);
goto free_bad;
}
nfound++;
} }
return nfound; return array_len;
free_bad: free_bad:
if (names && *names) { if (names && *names) {
for (i = 0; i < cfound; i++) for (int i = 0; i < name_array_len; i++)
free((*names)[i]); free((*names)[i]);
free(*names); free(*names);
} }
if (cret && *cret) { if (cret && *cret) {
for (i = 0; i < nfound; i++) for (int i = 0; i < ct_array_len; i++)
lxc_container_put((*cret)[i]); lxc_container_put((*cret)[i]);
free(*cret); free(*cret);
} }