projects
/
project
/
uci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
file: remove unnecessary uci_fixup_section calls
[project/uci.git]
/
file.c
diff --git
a/file.c
b/file.c
index
cf0dfaf
..
9856369
100644
(file)
--- a/
file.c
+++ b/
file.c
@@
-70,8
+70,6
@@
__private void uci_getln(struct uci_context *ctx, int offset)
pctx->bufsz *= 2;
pctx->buf = uci_realloc(ctx, pctx->buf, pctx->bufsz);
pctx->bufsz *= 2;
pctx->buf = uci_realloc(ctx, pctx->buf, pctx->bufsz);
- if (!pctx->buf)
- UCI_THROW(ctx, UCI_ERR_MEM);
} while (1);
}
} while (1);
}
@@
-410,7
+408,6
@@
static void uci_parse_config(struct uci_context *ctx)
char *name;
char *type;
char *name;
char *type;
- uci_fixup_section(ctx, ctx->pctx->section);
if (!ctx->pctx->package) {
if (!ctx->pctx->name)
uci_parse_error(ctx, "attempting to import a file without a package name");
if (!ctx->pctx->package) {
if (!ctx->pctx->name)
uci_parse_error(ctx, "attempting to import a file without a package name");
@@
-437,8
+434,13
@@
static void uci_parse_config(struct uci_context *ctx)
} else {
uci_fill_ptr(ctx, &ptr, &pctx->package->e);
e = uci_lookup_list(&pctx->package->sections, name);
} else {
uci_fill_ptr(ctx, &ptr, &pctx->package->e);
e = uci_lookup_list(&pctx->package->sections, name);
- if (e)
+ if (e)
{
ptr.s = uci_to_section(e);
ptr.s = uci_to_section(e);
+
+ if ((ctx->flags & UCI_FLAG_STRICT) && strcmp(ptr.s->type, type))
+ uci_parse_error(ctx, "section of different type overwrites prior section with same name");
+ }
+
ptr.section = name;
ptr.value = type;
ptr.section = name;
ptr.value = type;
@@
-686,7
+688,6
@@
error:
UCI_THROW(ctx, ctx->err);
}
UCI_THROW(ctx, ctx->err);
}
- uci_fixup_section(ctx, ctx->pctx->section);
if (!pctx->package && name)
uci_switch_config(ctx);
if (package)
if (!pctx->package && name)
uci_switch_config(ctx);
if (package)
@@
-735,17
+736,6
@@
static void uci_file_commit(struct uci_context *ctx, struct uci_package **packag
if ((asprintf(&filename, "%s/.%s.uci-XXXXXX", ctx->confdir, p->e.name) < 0) || !filename)
UCI_THROW(ctx, UCI_ERR_MEM);
if ((asprintf(&filename, "%s/.%s.uci-XXXXXX", ctx->confdir, p->e.name) < 0) || !filename)
UCI_THROW(ctx, UCI_ERR_MEM);
- if (!mktemp(filename))
- *filename = 0;
-
- if (!*filename) {
- free(filename);
- UCI_THROW(ctx, UCI_ERR_IO);
- }
-
- if ((stat(filename, &statbuf) == 0) && ((statbuf.st_mode & S_IFMT) != S_IFREG))
- UCI_THROW(ctx, UCI_ERR_IO);
-
/* open the config file for writing now, so that it is locked */
f1 = uci_open_stream(ctx, p->path, NULL, SEEK_SET, true, true);
/* open the config file for writing now, so that it is locked */
f1 = uci_open_stream(ctx, p->path, NULL, SEEK_SET, true, true);
@@
-780,6
+770,17
@@
static void uci_file_commit(struct uci_context *ctx, struct uci_package **packag
goto done;
}
goto done;
}
+ if (!mktemp(filename))
+ *filename = 0;
+
+ if (!*filename) {
+ free(filename);
+ UCI_THROW(ctx, UCI_ERR_IO);
+ }
+
+ if ((stat(filename, &statbuf) == 0) && ((statbuf.st_mode & S_IFMT) != S_IFREG))
+ UCI_THROW(ctx, UCI_ERR_IO);
+
f2 = uci_open_stream(ctx, filename, p->path, SEEK_SET, true, true);
uci_export(ctx, f2, p, false);
f2 = uci_open_stream(ctx, filename, p->path, SEEK_SET, true, true);
uci_export(ctx, f2, p, false);
@@
-795,12
+796,15
@@
done:
free(name);
free(path);
uci_close_stream(f1);
free(name);
free(path);
uci_close_stream(f1);
- if (do_rename && rename(filename, p->path)) {
- unlink(filename);
- UCI_THROW(ctx, UCI_ERR_IO);
+ if (do_rename) {
+ path = realpath(p->path, NULL);
+ if (!path || rename(filename, path)) {
+ unlink(filename);
+ UCI_THROW(ctx, UCI_ERR_IO);
+ }
+ free(path);
}
free(filename);
}
free(filename);
- sync();
if (ctx->err)
UCI_THROW(ctx, ctx->err);
}
if (ctx->err)
UCI_THROW(ctx, ctx->err);
}
@@
-827,7
+831,7
@@
static char **uci_list_config_files(struct uci_context *ctx)
{
char **configs;
glob_t globbuf;
{
char **configs;
glob_t globbuf;
- int size, i;
+ int size, i
, j, skipped
;
char *buf;
char *dir;
char *buf;
char *dir;
@@
-839,18
+843,22
@@
static char **uci_list_config_files(struct uci_context *ctx)
}
size = sizeof(char *) * (globbuf.gl_pathc + 1);
}
size = sizeof(char *) * (globbuf.gl_pathc + 1);
+ skipped = 0;
for(i = 0; i < globbuf.gl_pathc; i++) {
char *p;
p = get_filename(globbuf.gl_pathv[i]);
for(i = 0; i < globbuf.gl_pathc; i++) {
char *p;
p = get_filename(globbuf.gl_pathv[i]);
- if (!p)
+ if (!p) {
+ skipped++;
continue;
continue;
+ }
size += strlen(p) + 1;
}
size += strlen(p) + 1;
}
- configs = uci_malloc(ctx, size);
- buf = (char *) &configs[globbuf.gl_pathc + 1];
+ configs = uci_malloc(ctx, size - skipped);
+ buf = (char *) &configs[globbuf.gl_pathc + 1 - skipped];
+ j = 0;
for(i = 0; i < globbuf.gl_pathc; i++) {
char *p;
for(i = 0; i < globbuf.gl_pathc; i++) {
char *p;
@@
-861,7
+869,7
@@
static char **uci_list_config_files(struct uci_context *ctx)
if (!uci_validate_package(p))
continue;
if (!uci_validate_package(p))
continue;
- configs[
i
] = buf;
+ configs[
j++
] = buf;
strcpy(buf, p);
buf += strlen(buf) + 1;
}
strcpy(buf, p);
buf += strlen(buf) + 1;
}