uci_parse_error(ctx, "invalid character in type field");
ofs_name = next_arg(ctx, false, true, false);
+ assert_eol(ctx);
type = pctx_str(pctx, ofs_type);
name = pctx_str(pctx, ofs_name);
- assert_eol(ctx);
if (!name || !name[0]) {
ctx->internal = !pctx->merge;
ofs_name = next_arg(ctx, true, true, false);
ofs_value = next_arg(ctx, false, false, false);
+ assert_eol(ctx);
name = pctx_str(pctx, ofs_name);
value = pctx_str(pctx, ofs_value);
- assert_eol(ctx);
uci_fill_ptr(ctx, &ptr, &pctx->section->e);
e = uci_lookup_list(&pctx->section->options, name);
len = end - str;
/* make sure that we have enough room in the buffer */
- while (ofs + len + sizeof(UCI_QUOTE_ESCAPE) + 1 > ctx->bufsz) {
+ while (ofs + len + (int) sizeof(UCI_QUOTE_ESCAPE) + 1 > ctx->bufsz) {
ctx->bufsz *= 2;
ctx->buf = uci_realloc(ctx, ctx->buf, ctx->bufsz);
}
{
struct uci_package *p = *package;
FILE *f1, *f2 = NULL;
- char *name = NULL;
- char *path = NULL;
+ char *volatile name = NULL;
+ char *volatile path = NULL;
char *filename = NULL;
- bool do_rename = false;
+ struct stat statbuf;
+ volatile bool do_rename = false;
int fd;
if (!p->path) {
uci_close_stream(f1);
if (do_rename) {
path = realpath(p->path, NULL);
- if (!path || rename(filename, path)) {
+ if (!path || stat(path, &statbuf) || chmod(filename, statbuf.st_mode) || rename(filename, path)) {
unlink(filename);
UCI_THROW(ctx, UCI_ERR_IO);
}
{
char **configs;
glob_t globbuf;
- int size, i, j, skipped;
+ int size, j, skipped;
+ size_t i;
char *buf;
char *dir;
return configs;
}
-static struct uci_package *uci_file_load(struct uci_context *ctx, const char *name)
+static struct uci_package *uci_file_load(struct uci_context *ctx,
+ const char *volatile name)
{
struct uci_package *package = NULL;
char *filename;
bool confdir;
- FILE *file = NULL;
+ FILE *volatile file = NULL;
switch (name[0]) {
case '.':