Skip to content

L
lxc
Unverified Commit a111dc9f by Christian Brauner
Options

tree-wide: replace sizeof() with SIZEOF2STRLEN()

Signed-off-by: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent b4616616
Showing with 62 additions and 59 deletions
src/lxc/caps.c
...@@ -299,7 +299,7 @@ static long int _real_caps_last_cap(void) ...@@ -299,7 +299,7 @@ static long int _real_caps_last_cap(void)
char buf[INTTYPE_TO_STRLEN(int)] = {0}; char buf[INTTYPE_TO_STRLEN(int)] = {0};
again: again:
n = read(fd, buf, sizeof(buf) - 1); n = read(fd, buf, STRARRAYLEN(buf));
if (n < 0 && errno == EINTR) { if (n < 0 && errno == EINTR) {
goto again; goto again;
} else if (n >= 0) { } else if (n >= 0) {
......
src/lxc/cgroups/cgfsng.c
...@@ -134,8 +134,9 @@ static char *cg_legacy_must_prefix_named(char *entry) ...@@ -134,8 +134,9 @@ static char *cg_legacy_must_prefix_named(char *entry)
len = strlen(entry); len = strlen(entry);
prefixed = must_alloc(len + 6); prefixed = must_alloc(len + 6);
memcpy(prefixed, "name=", sizeof("name=") - 1);
memcpy(prefixed + sizeof("name=") - 1, entry, len); memcpy(prefixed, "name=", STRLITERALLEN("name="));
memcpy(prefixed + STRLITERALLEN("name="), entry, len);
prefixed[len + 5] = '\0'; prefixed[len + 5] = '\0';
return prefixed; return prefixed;
} }
...@@ -1882,8 +1883,8 @@ static int __cg_unified_attach(const struct hierarchy *h, const char *name, ...@@ -1882,8 +1883,8 @@ static int __cg_unified_attach(const struct hierarchy *h, const char *name,
free(full_path); free(full_path);
len = strlen(base_path) + sizeof("/lxc-1000") - 1 + len = strlen(base_path) + STRLITERALLEN("/lxc-1000") +
sizeof("/cgroup-procs") - 1; STRLITERALLEN("/cgroup-procs");
full_path = must_alloc(len + 1); full_path = must_alloc(len + 1);
do { do {
if (idx) if (idx)
......
src/lxc/conf.c
...@@ -371,7 +371,8 @@ int run_script_argv(const char *name, unsigned int hook_version, ...@@ -371,7 +371,8 @@ int run_script_argv(const char *name, unsigned int hook_version,
for (i = 0; argv && argv[i]; i++) for (i = 0; argv && argv[i]; i++)
size += strlen(argv[i]) + 1; size += strlen(argv[i]) + 1;
size += sizeof("exec"); size += STRLITERALLEN("exec");
size++;
size += strlen(script); size += strlen(script);
size++; size++;
...@@ -509,7 +510,7 @@ int run_script(const char *name, const char *section, const char *script, ...) ...@@ -509,7 +510,7 @@ int run_script(const char *name, const char *section, const char *script, ...)
size += strlen(p) + 1; size += strlen(p) + 1;
va_end(ap); va_end(ap);
size += strlen("exec"); size += STRLITERALLEN("exec");
size += strlen(script); size += strlen(script);
size += strlen(name); size += strlen(name);
size += strlen(section); size += strlen(section);
...@@ -1637,13 +1638,13 @@ static int lxc_setup_devpts(struct lxc_conf *conf) ...@@ -1637,13 +1638,13 @@ static int lxc_setup_devpts(struct lxc_conf *conf)
mntopt_sets[0] = devpts_mntopts; mntopt_sets[0] = devpts_mntopts;
/* !gid=5 && max= */ /* !gid=5 && max= */
mntopt_sets[1] = devpts_mntopts + sizeof("gid=5"); mntopt_sets[1] = devpts_mntopts + STRLITERALLEN("gid=5") + 1;
/* gid=5 && !max= */ /* gid=5 && !max= */
mntopt_sets[2] = default_devpts_mntopts; mntopt_sets[2] = default_devpts_mntopts;
/* !gid=5 && !max= */ /* !gid=5 && !max= */
mntopt_sets[3] = default_devpts_mntopts + sizeof("gid=5"); mntopt_sets[3] = default_devpts_mntopts + STRLITERALLEN("gid=5") + 1;
/* end */ /* end */
mntopt_sets[4] = NULL; mntopt_sets[4] = NULL;
...@@ -2779,7 +2780,7 @@ int write_id_mapping(enum idtype idtype, pid_t pid, const char *buf, ...@@ -2779,7 +2780,7 @@ int write_id_mapping(enum idtype idtype, pid_t pid, const char *buf,
} }
if (fd >= 0) { if (fd >= 0) {
buflen = sizeof("deny\n") - 1; buflen = STRLITERALLEN("deny\n");
errno = 0; errno = 0;
ret = lxc_write_nointr(fd, "deny\n", buflen); ret = lxc_write_nointr(fd, "deny\n", buflen);
close(fd); close(fd);
...@@ -3808,12 +3809,12 @@ int lxc_clear_cgroups(struct lxc_conf *c, const char *key, int version) ...@@ -3808,12 +3809,12 @@ int lxc_clear_cgroups(struct lxc_conf *c, const char *key, int version)
if (version == CGROUP2_SUPER_MAGIC) { if (version == CGROUP2_SUPER_MAGIC) {
global_token = "lxc.cgroup2"; global_token = "lxc.cgroup2";
namespaced_token = "lxc.cgroup2."; namespaced_token = "lxc.cgroup2.";
namespaced_token_len = sizeof("lxc.cgroup2.") - 1; namespaced_token_len = STRLITERALLEN("lxc.cgroup2.");
list = &c->cgroup2; list = &c->cgroup2;
} else if (version == CGROUP_SUPER_MAGIC) { } else if (version == CGROUP_SUPER_MAGIC) {
global_token = "lxc.cgroup"; global_token = "lxc.cgroup";
namespaced_token = "lxc.cgroup."; namespaced_token = "lxc.cgroup.";
namespaced_token_len = sizeof("lxc.cgroup.") - 1; namespaced_token_len = STRLITERALLEN("lxc.cgroup.");
list = &c->cgroup; list = &c->cgroup;
} else { } else {
return -EINVAL; return -EINVAL;
...@@ -3821,7 +3822,7 @@ int lxc_clear_cgroups(struct lxc_conf *c, const char *key, int version) ...@@ -3821,7 +3822,7 @@ int lxc_clear_cgroups(struct lxc_conf *c, const char *key, int version)
if (strcmp(key, global_token) == 0) if (strcmp(key, global_token) == 0)
all = true; all = true;
else if (strncmp(key, namespaced_token, sizeof(namespaced_token) - 1) == 0) else if (strncmp(key, namespaced_token, namespaced_token_len) == 0)
k += namespaced_token_len; k += namespaced_token_len;
else else
return -EINVAL; return -EINVAL;
...@@ -3850,10 +3851,10 @@ int lxc_clear_limits(struct lxc_conf *c, const char *key) ...@@ -3850,10 +3851,10 @@ int lxc_clear_limits(struct lxc_conf *c, const char *key)
if (strcmp(key, "lxc.limit") == 0 || strcmp(key, "lxc.prlimit") == 0) if (strcmp(key, "lxc.limit") == 0 || strcmp(key, "lxc.prlimit") == 0)
all = true; all = true;
else if (strncmp(key, "lxc.limit.", sizeof("lxc.limit.") - 1) == 0) else if (strncmp(key, "lxc.limit.", STRLITERALLEN("lxc.limit.")) == 0)
k = key + sizeof("lxc.limit.") - 1; k = key + STRLITERALLEN("lxc.limit.");
else if (strncmp(key, "lxc.prlimit.", sizeof("lxc.prlimit.") - 1) == 0) else if (strncmp(key, "lxc.prlimit.", STRLITERALLEN("lxc.prlimit.")) == 0)
k = key + sizeof("lxc.prlimit.") - 1; k = key + STRLITERALLEN("lxc.prlimit.");
else else
return -1; return -1;
...@@ -3880,8 +3881,8 @@ int lxc_clear_sysctls(struct lxc_conf *c, const char *key) ...@@ -3880,8 +3881,8 @@ int lxc_clear_sysctls(struct lxc_conf *c, const char *key)
if (strcmp(key, "lxc.sysctl") == 0) if (strcmp(key, "lxc.sysctl") == 0)
all = true; all = true;
else if (strncmp(key, "lxc.sysctl.", sizeof("lxc.sysctl.") - 1) == 0) else if (strncmp(key, "lxc.sysctl.", STRLITERALLEN("lxc.sysctl.")) == 0)
k = key + sizeof("lxc.sysctl.") - 1; k = key + STRLITERALLEN("lxc.sysctl.");
else else
return -1; return -1;
...@@ -3909,8 +3910,8 @@ int lxc_clear_procs(struct lxc_conf *c, const char *key) ...@@ -3909,8 +3910,8 @@ int lxc_clear_procs(struct lxc_conf *c, const char *key)
if (strcmp(key, "lxc.proc") == 0) if (strcmp(key, "lxc.proc") == 0)
all = true; all = true;
else if (strncmp(key, "lxc.proc.", sizeof("lxc.proc.") - 1) == 0) else if (strncmp(key, "lxc.proc.", STRLITERALLEN("lxc.proc.")) == 0)
k = key + sizeof("lxc.proc.") - 1; k = key + STRLITERALLEN("lxc.proc.");
else else
return -1; return -1;
...@@ -3984,8 +3985,8 @@ int lxc_clear_hooks(struct lxc_conf *c, const char *key) ...@@ -3984,8 +3985,8 @@ int lxc_clear_hooks(struct lxc_conf *c, const char *key)
if (strcmp(key, "lxc.hook") == 0) if (strcmp(key, "lxc.hook") == 0)
all = true; all = true;
else if (strncmp(key, "lxc.hook.", sizeof("lxc.hook.") - 1) == 0) else if (strncmp(key, "lxc.hook.", STRLITERALLEN("lxc.hook.")) == 0)
k = key + sizeof("lxc.hook.") - 1; k = key + STRLITERALLEN("lxc.hook.");
else else
return -1; return -1;
......
src/lxc/confile.c
...@@ -1319,10 +1319,10 @@ static int set_config_prlimit(const char *key, const char *value, ...@@ -1319,10 +1319,10 @@ static int set_config_prlimit(const char *key, const char *value,
if (lxc_config_value_empty(value)) if (lxc_config_value_empty(value))
return lxc_clear_limits(lxc_conf, key); return lxc_clear_limits(lxc_conf, key);
if (strncmp(key, "lxc.prlimit.", sizeof("lxc.prlimit.") - 1) != 0) if (strncmp(key, "lxc.prlimit.", STRLITERALLEN("lxc.prlimit.")) != 0)
return -1; return -1;
key += sizeof("lxc.prlimit.") - 1; key += STRLITERALLEN("lxc.prlimit.");
/* soft limit comes first in the value */ /* soft limit comes first in the value */
if (!parse_limit_value(&value, &limit_value)) if (!parse_limit_value(&value, &limit_value))
...@@ -1408,10 +1408,10 @@ static int set_config_sysctl(const char *key, const char *value, ...@@ -1408,10 +1408,10 @@ static int set_config_sysctl(const char *key, const char *value,
if (lxc_config_value_empty(value)) if (lxc_config_value_empty(value))
return clr_config_sysctl(key, lxc_conf, NULL); return clr_config_sysctl(key, lxc_conf, NULL);
if (strncmp(key, "lxc.sysctl.", sizeof("lxc.sysctl.") - 1) != 0) if (strncmp(key, "lxc.sysctl.", STRLITERALLEN("lxc.sysctl.")) != 0)
return -1; return -1;
key += sizeof("lxc.sysctl.") - 1; key += STRLITERALLEN("lxc.sysctl.");
/* find existing list element */ /* find existing list element */
lxc_list_for_each(iter, &lxc_conf->sysctls) { lxc_list_for_each(iter, &lxc_conf->sysctls) {
...@@ -1473,10 +1473,10 @@ static int set_config_proc(const char *key, const char *value, ...@@ -1473,10 +1473,10 @@ static int set_config_proc(const char *key, const char *value,
if (lxc_config_value_empty(value)) if (lxc_config_value_empty(value))
return clr_config_proc(key, lxc_conf, NULL); return clr_config_proc(key, lxc_conf, NULL);
if (strncmp(key, "lxc.proc.", sizeof("lxc.proc.") -1) != 0) if (strncmp(key, "lxc.proc.", STRLITERALLEN("lxc.proc.")) != 0)
return -1; return -1;
subkey = key + sizeof("lxc.proc.") - 1; subkey = key + STRLITERALLEN("lxc.proc.");
if (*subkey == '\0') if (*subkey == '\0')
return -EINVAL; return -EINVAL;
...@@ -2157,7 +2157,7 @@ static int set_config_namespace_share(const char *key, const char *value, ...@@ -2157,7 +2157,7 @@ static int set_config_namespace_share(const char *key, const char *value,
if (lxc_config_value_empty(value)) if (lxc_config_value_empty(value))
return clr_config_namespace_share(key, lxc_conf, data); return clr_config_namespace_share(key, lxc_conf, data);
namespace = key + sizeof("lxc.namespace.share.") - 1; namespace = key + STRLITERALLEN("lxc.namespace.share.");
ns_idx = lxc_namespace_2_ns_idx(namespace); ns_idx = lxc_namespace_2_ns_idx(namespace);
if (ns_idx < 0) if (ns_idx < 0)
return ns_idx; return ns_idx;
...@@ -2975,11 +2975,11 @@ static int __get_config_cgroup_controller(const char *key, char *retv, ...@@ -2975,11 +2975,11 @@ static int __get_config_cgroup_controller(const char *key, char *retv,
if (version == CGROUP2_SUPER_MAGIC) { if (version == CGROUP2_SUPER_MAGIC) {
global_token = "lxc.cgroup2"; global_token = "lxc.cgroup2";
namespaced_token = "lxc.cgroup2."; namespaced_token = "lxc.cgroup2.";
namespaced_token_len = sizeof("lxc.cgroup2.") - 1;; namespaced_token_len = STRLITERALLEN("lxc.cgroup2.");
} else if (version == CGROUP_SUPER_MAGIC) { } else if (version == CGROUP_SUPER_MAGIC) {
global_token = "lxc.cgroup"; global_token = "lxc.cgroup";
namespaced_token = "lxc.cgroup."; namespaced_token = "lxc.cgroup.";
namespaced_token_len = sizeof("lxc.cgroup.") - 1;; namespaced_token_len = STRLITERALLEN("lxc.cgroup.");
} else { } else {
return -1; return -1;
} }
...@@ -3520,8 +3520,8 @@ static int get_config_prlimit(const char *key, char *retv, int inlen, ...@@ -3520,8 +3520,8 @@ static int get_config_prlimit(const char *key, char *retv, int inlen,
struct lxc_limit *lim = it->elem; struct lxc_limit *lim = it->elem;
if (lim->limit.rlim_cur == RLIM_INFINITY) { if (lim->limit.rlim_cur == RLIM_INFINITY) {
memcpy(buf, "unlimited", sizeof("unlimited")); memcpy(buf, "unlimited", STRLITERALLEN("unlimited") + 1);
partlen = sizeof("unlimited") - 1; partlen = STRLITERALLEN("unlimited");
} else { } else {
partlen = sprintf(buf, "%" PRIu64, partlen = sprintf(buf, "%" PRIu64,
(uint64_t)lim->limit.rlim_cur); (uint64_t)lim->limit.rlim_cur);
...@@ -3529,7 +3529,7 @@ static int get_config_prlimit(const char *key, char *retv, int inlen, ...@@ -3529,7 +3529,7 @@ static int get_config_prlimit(const char *key, char *retv, int inlen,
if (lim->limit.rlim_cur != lim->limit.rlim_max) { if (lim->limit.rlim_cur != lim->limit.rlim_max) {
if (lim->limit.rlim_max == RLIM_INFINITY) if (lim->limit.rlim_max == RLIM_INFINITY)
memcpy(buf + partlen, ":unlimited", memcpy(buf + partlen, ":unlimited",
sizeof(":unlimited")); STRLITERALLEN(":unlimited") + 1);
else else
sprintf(buf + partlen, ":%" PRIu64, sprintf(buf + partlen, ":%" PRIu64,
(uint64_t)lim->limit.rlim_max); (uint64_t)lim->limit.rlim_max);
...@@ -3565,8 +3565,8 @@ static int get_config_sysctl(const char *key, char *retv, int inlen, ...@@ -3565,8 +3565,8 @@ static int get_config_sysctl(const char *key, char *retv, int inlen,
if (strcmp(key, "lxc.sysctl") == 0) if (strcmp(key, "lxc.sysctl") == 0)
get_all = true; get_all = true;
else if (strncmp(key, "lxc.sysctl.", sizeof("lxc.sysctl.") - 1) == 0) else if (strncmp(key, "lxc.sysctl.", STRLITERALLEN("lxc.sysctl.")) == 0)
key += sizeof("lxc.sysctl.") - 1; key += STRLITERALLEN("lxc.sysctl.");
else else
return -1; return -1;
...@@ -3598,8 +3598,8 @@ static int get_config_proc(const char *key, char *retv, int inlen, ...@@ -3598,8 +3598,8 @@ static int get_config_proc(const char *key, char *retv, int inlen,
if (strcmp(key, "lxc.proc") == 0) if (strcmp(key, "lxc.proc") == 0)
get_all = true; get_all = true;
else if (strncmp(key, "lxc.proc.", sizeof("lxc.proc.") - 1) == 0) else if (strncmp(key, "lxc.proc.", STRLITERALLEN("lxc.proc.")) == 0)
key += sizeof("lxc.proc.") - 1; key += STRLITERALLEN("lxc.proc.");
else else
return -1; return -1;
...@@ -3667,7 +3667,7 @@ static int get_config_namespace_share(const char *key, char *retv, int inlen, ...@@ -3667,7 +3667,7 @@ static int get_config_namespace_share(const char *key, char *retv, int inlen,
else else
memset(retv, 0, inlen); memset(retv, 0, inlen);
namespace = key + sizeof("lxc.namespace.share.") - 1; namespace = key + STRLITERALLEN("lxc.namespace.share.");
ns_idx = lxc_namespace_2_ns_idx(namespace); ns_idx = lxc_namespace_2_ns_idx(namespace);
if (ns_idx < 0) if (ns_idx < 0)
return ns_idx; return ns_idx;
...@@ -4075,7 +4075,7 @@ static int clr_config_namespace_share(const char *key, ...@@ -4075,7 +4075,7 @@ static int clr_config_namespace_share(const char *key,
int ns_idx; int ns_idx;
const char *namespace; const char *namespace;
namespace = key + sizeof("lxc.namespace.share.") - 1; namespace = key + STRLITERALLEN("lxc.namespace.share.");
ns_idx = lxc_namespace_2_ns_idx(namespace); ns_idx = lxc_namespace_2_ns_idx(namespace);
if (ns_idx < 0) if (ns_idx < 0)
return ns_idx; return ns_idx;
......
src/lxc/confile_utils.c
...@@ -721,9 +721,9 @@ bool parse_limit_value(const char **value, rlim_t *res) ...@@ -721,9 +721,9 @@ bool parse_limit_value(const char **value, rlim_t *res)
{ {
char *endptr = NULL; char *endptr = NULL;
if (strncmp(*value, "unlimited", sizeof("unlimited") - 1) == 0) { if (strncmp(*value, "unlimited", STRLITERALLEN("unlimited")) == 0) {
*res = RLIM_INFINITY; *res = RLIM_INFINITY;
*value += sizeof("unlimited") - 1; *value += STRLITERALLEN("unlimited");
return true; return true;
} }
......
src/lxc/log.c
...@@ -347,7 +347,7 @@ static int log_append_logfile(const struct lxc_log_appender *appender, ...@@ -347,7 +347,7 @@ static int log_append_logfile(const struct lxc_log_appender *appender,
if (n < 0) if (n < 0)
return n; return n;
if ((size_t)n < (sizeof(buffer) - 1)) { if ((size_t)n < STRARRAYLEN(buffer)) {
ret = vsnprintf(buffer + n, sizeof(buffer) - n, event->fmt, *event->vap); ret = vsnprintf(buffer + n, sizeof(buffer) - n, event->fmt, *event->vap);
if (ret < 0) if (ret < 0)
return 0; return 0;
...@@ -356,7 +356,7 @@ static int log_append_logfile(const struct lxc_log_appender *appender, ...@@ -356,7 +356,7 @@ static int log_append_logfile(const struct lxc_log_appender *appender,
} }
if ((size_t)n >= sizeof(buffer)) if ((size_t)n >= sizeof(buffer))
n = sizeof(buffer) - 1; n = STRARRAYLEN(buffer);
buffer[n] = '\n'; buffer[n] = '\n';
...@@ -835,7 +835,7 @@ inline const char *lxc_log_get_file(void) ...@@ -835,7 +835,7 @@ inline const char *lxc_log_get_file(void)
inline void lxc_log_set_prefix(const char *prefix) inline void lxc_log_set_prefix(const char *prefix)
{ {
/* We don't care if thte prefix is truncated. */ /* We don't care if the prefix is truncated. */
(void)strlcpy(log_prefix, prefix, sizeof(log_prefix)); (void)strlcpy(log_prefix, prefix, sizeof(log_prefix));
} }
......
src/lxc/lxclock.c
...@@ -106,7 +106,7 @@ static char *lxclock_name(const char *p, const char *n) ...@@ -106,7 +106,7 @@ static char *lxclock_name(const char *p, const char *n)
*/ */
/* length of "/lxc/lock/" + $lxcpath + "/" + "." + $lxcname + '\0' */ /* length of "/lxc/lock/" + $lxcpath + "/" + "." + $lxcname + '\0' */
len = (sizeof("/lxc/lock/") - 1) + strlen(n) + strlen(p) + 3; len = STRLITERALLEN("/lxc/lock/") + strlen(n) + strlen(p) + 3;
rundir = get_rundir(); rundir = get_rundir();
if (!rundir) if (!rundir)
......
src/lxc/storage/overlay.c
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include "confile.h" #include "confile.h"
#include "log.h" #include "log.h"
#include "lxccontainer.h" #include "lxccontainer.h"
#include "macro.h"
#include "overlay.h" #include "overlay.h"
#include "rsync.h" #include "rsync.h"
#include "storage.h" #include "storage.h"
...@@ -94,7 +95,7 @@ int ovl_clonepaths(struct lxc_storage *orig, struct lxc_storage *new, const char ...@@ -94,7 +95,7 @@ int ovl_clonepaths(struct lxc_storage *orig, struct lxc_storage *new, const char
return -22; return -22;
} }
if (strlen(lastslash) < (sizeof("/rootfs") - 1)) { if (strlen(lastslash) < STRLITERALLEN("/rootfs")) {
ERROR("Failed to detect \"/rootfs\" in string \"%s\"", ERROR("Failed to detect \"/rootfs\" in string \"%s\"",
new->dest); new->dest);
return -22; return -22;
...@@ -110,8 +111,8 @@ int ovl_clonepaths(struct lxc_storage *orig, struct lxc_storage *new, const char ...@@ -110,8 +111,8 @@ int ovl_clonepaths(struct lxc_storage *orig, struct lxc_storage *new, const char
} }
memcpy(delta, new->dest, lastslashidx + 1); memcpy(delta, new->dest, lastslashidx + 1);
memcpy(delta + lastslashidx, "delta0", sizeof("delta0") - 1); memcpy(delta + lastslashidx, "delta0", STRLITERALLEN("delta0"));
delta[lastslashidx + sizeof("delta0") - 1] = '\0'; delta[lastslashidx + STRLITERALLEN("delta0")] = '\0';
ret = mkdir(delta, 0755); ret = mkdir(delta, 0755);
if (ret < 0 && errno != EEXIST) { if (ret < 0 && errno != EEXIST) {
...@@ -142,8 +143,8 @@ int ovl_clonepaths(struct lxc_storage *orig, struct lxc_storage *new, const char ...@@ -142,8 +143,8 @@ int ovl_clonepaths(struct lxc_storage *orig, struct lxc_storage *new, const char
} }
memcpy(work, new->dest, lastslashidx + 1); memcpy(work, new->dest, lastslashidx + 1);
memcpy(work + lastslashidx, "olwork", sizeof("olwork") - 1); memcpy(work + lastslashidx, "olwork", STRLITERALLEN("olwork"));
work[lastslashidx + sizeof("olwork") - 1] = '\0'; work[lastslashidx + STRLITERALLEN("olwork")] = '\0';
ret = mkdir(work, 0755); ret = mkdir(work, 0755);
if (ret < 0) { if (ret < 0) {
...@@ -253,8 +254,8 @@ int ovl_clonepaths(struct lxc_storage *orig, struct lxc_storage *new, const char ...@@ -253,8 +254,8 @@ int ovl_clonepaths(struct lxc_storage *orig, struct lxc_storage *new, const char
} }
memcpy(work, ndelta, lastslashidx + 1); memcpy(work, ndelta, lastslashidx + 1);
memcpy(work + lastslashidx, "olwork", sizeof("olwork") - 1); memcpy(work + lastslashidx, "olwork", STRLITERALLEN("olwork"));
work[lastslashidx + sizeof("olwork") - 1] = '\0'; work[lastslashidx + STRLITERALLEN("olwork")] = '\0';
ret = mkdir(work, 0755); ret = mkdir(work, 0755);
if (ret < 0 && errno != EEXIST) { if (ret < 0 && errno != EEXIST) {
...@@ -335,11 +336,11 @@ int ovl_clonepaths(struct lxc_storage *orig, struct lxc_storage *new, const char ...@@ -335,11 +336,11 @@ int ovl_clonepaths(struct lxc_storage *orig, struct lxc_storage *new, const char
return -1; return -1;
} }
if (!strncmp(s1, "/snaps", sizeof("/snaps") - 1)) { if (!strncmp(s1, "/snaps", STRLITERALLEN("/snaps"))) {
s1 = clean_new_path; s1 = clean_new_path;
s2 = clean_old_path; s2 = clean_old_path;
s3 = (char *)cname; s3 = (char *)cname;
} else if (!strncmp(s2, "/snaps", sizeof("/snaps") - 1)) { } else if (!strncmp(s2, "/snaps", STRLITERALLEN("/snaps"))) {
s1 = clean_old_path; s1 = clean_old_path;
s2 = clean_new_path; s2 = clean_new_path;
s3 = (char *)oldname; s3 = (char *)oldname;
...@@ -415,7 +416,7 @@ int ovl_create(struct lxc_storage *bdev, const char *dest, const char *n, ...@@ -415,7 +416,7 @@ int ovl_create(struct lxc_storage *bdev, const char *dest, const char *n,
ERROR("Failed to allocate memory"); ERROR("Failed to allocate memory");
return -1; return -1;
} }
memcpy(delta + len - 6, "delta0", sizeof("delta0") - 1); memcpy(delta + len - 6, "delta0", STRLITERALLEN("delta0"));
ret = mkdir_p(delta, 0755); ret = mkdir_p(delta, 0755);
if (ret < 0) { if (ret < 0) {
...@@ -568,8 +569,8 @@ int ovl_mount(struct lxc_storage *bdev) ...@@ -568,8 +569,8 @@ int ovl_mount(struct lxc_storage *bdev)
} }
memcpy(work, upper, lastslashidx + 1); memcpy(work, upper, lastslashidx + 1);
memcpy(work + lastslashidx, "olwork", sizeof("olwork") - 1); memcpy(work + lastslashidx, "olwork", STRLITERALLEN("olwork"));
work[lastslashidx + sizeof("olwork") - 1] = '\0'; work[lastslashidx + STRLITERALLEN("olwork")] = '\0';
ret = parse_mntopts(bdev->mntopts, &mntflags, &mntdata); ret = parse_mntopts(bdev->mntopts, &mntflags, &mntdata);
if (ret < 0) { if (ret < 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment