projects
/
project
/
uci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lua: support extended section notation
[project/uci.git]
/
file.c
diff --git
a/file.c
b/file.c
index
ffa3afa
..
9856369
100644
(file)
--- a/
file.c
+++ b/
file.c
@@
-33,7
+33,6
@@
#include "uci_internal.h"
#define LINEBUF 32
#include "uci_internal.h"
#define LINEBUF 32
-#define LINEBUF_MAX 4096
/*
* Fetch a new line from the input stream and resize buffer if necessary
/*
* Fetch a new line from the input stream and resize buffer if necessary
@@
-48,8
+47,8
@@
__private void uci_getln(struct uci_context *ctx, int offset)
pctx->buf = uci_malloc(ctx, LINEBUF);
pctx->bufsz = LINEBUF;
}
pctx->buf = uci_malloc(ctx, LINEBUF);
pctx->bufsz = LINEBUF;
}
- /*
`offset' may off by one
*/
- if (offset >= pctx->bufsz) {
+ /*
It takes 2 slots for fgets to read 1 char.
*/
+ if (offset >= pctx->bufsz
- 1
) {
pctx->bufsz *= 2;
pctx->buf = uci_realloc(ctx, pctx->buf, pctx->bufsz);
}
pctx->bufsz *= 2;
pctx->buf = uci_realloc(ctx, pctx->buf, pctx->bufsz);
}
@@
-69,9
+68,6
@@
__private void uci_getln(struct uci_context *ctx, int offset)
return;
}
return;
}
- if (pctx->bufsz > LINEBUF_MAX/2)
- uci_parse_error(ctx, "line too long");
-
pctx->bufsz *= 2;
pctx->buf = uci_realloc(ctx, pctx->buf, pctx->bufsz);
} while (1);
pctx->bufsz *= 2;
pctx->buf = uci_realloc(ctx, pctx->buf, pctx->bufsz);
} while (1);
@@
-157,7
+153,6
@@
static void parse_double_quote(struct uci_context *ctx, int *target)
break;
}
}
break;
}
}
- uci_parse_error(ctx, "unterminated \"");
}
/*
}
/*
@@
-180,14
+175,13
@@
static void parse_single_quote(struct uci_context *ctx, int *target)
/* Multi-line str value */
uci_getln(ctx, pctx->pos);
if (!pctx_cur_char(pctx))
/* Multi-line str value */
uci_getln(ctx, pctx->pos);
if (!pctx_cur_char(pctx))
- uci_parse_error(ctx, "EOF with unterminated
\"
");
+ uci_parse_error(ctx, "EOF with unterminated
'
");
break;
default:
addc(ctx, target, &pctx->pos);
}
}
break;
default:
addc(ctx, target, &pctx->pos);
}
}
- uci_parse_error(ctx, "unterminated '");
}
/*
}
/*
@@
-239,14
+233,14
@@
done:
/*
* extract the next argument from the command line
*/
/*
* extract the next argument from the command line
*/
-static
char *next_arg(struct uci_context *ctx, bool required, bool nam
e)
+static
int next_arg(struct uci_context *ctx, bool required, bool name, bool packag
e)
{
struct uci_parse_context *pctx = ctx->pctx;
int val, ptr;
skip_whitespace(ctx);
val = ptr = pctx_pos(pctx);
{
struct uci_parse_context *pctx = ctx->pctx;
int val, ptr;
skip_whitespace(ctx);
val = ptr = pctx_pos(pctx);
- if(pctx_cur_char(pctx) == ';') {
+ if
(pctx_cur_char(pctx) == ';') {
pctx_cur_char(pctx) = 0;
pctx->pos += 1;
} else {
pctx_cur_char(pctx) = 0;
pctx->pos += 1;
} else {
@@
-258,15
+252,17
@@
static char *next_arg(struct uci_context *ctx, bool required, bool name)
goto done;
}
goto done;
}
- if (name && !uci_validate_
name(pctx_str(pctx, val)
))
+ if (name && !uci_validate_
str(pctx_str(pctx, val), name, package
))
uci_parse_error(ctx, "invalid character in name field");
done:
uci_parse_error(ctx, "invalid character in name field");
done:
- return
pctx_str(pctx, val)
;
+ return
val
;
}
int uci_parse_argument(struct uci_context *ctx, FILE *stream, char **str, char **result)
{
}
int uci_parse_argument(struct uci_context *ctx, FILE *stream, char **str, char **result)
{
+ int ofs_result;
+
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, str != NULL);
UCI_ASSERT(ctx, result != NULL);
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, str != NULL);
UCI_ASSERT(ctx, result != NULL);
@@
-278,15
+274,14
@@
int uci_parse_argument(struct uci_context *ctx, FILE *stream, char **str, char *
uci_alloc_parse_context(ctx);
ctx->pctx->file = stream;
uci_alloc_parse_context(ctx);
ctx->pctx->file = stream;
-
if (!*str) {
if (!*str) {
+ ctx->pctx->pos = 0;
uci_getln(ctx, 0);
uci_getln(ctx, 0);
- *str = ctx->pctx->buf;
- } else {
- UCI_ASSERT(ctx, ctx->pctx->pos == *str - ctx->pctx->buf);
}
}
- *result = next_arg(ctx, false, false);
+ ofs_result = next_arg(ctx, false, false, false);
+ *result = pctx_str(ctx->pctx, ofs_result);
+ *str = pctx_cur_str(ctx->pctx);
return 0;
}
return 0;
}
@@
-335,9
+330,11
@@
fill_package:
static void assert_eol(struct uci_context *ctx)
{
char *tmp;
static void assert_eol(struct uci_context *ctx)
{
char *tmp;
+ int ofs_tmp;
skip_whitespace(ctx);
skip_whitespace(ctx);
- tmp = next_arg(ctx, false, false);
+ ofs_tmp = next_arg(ctx, false, false, false);
+ tmp = pctx_str(ctx->pctx, ofs_tmp);
if (*tmp && (ctx->flags & UCI_FLAG_STRICT))
uci_parse_error(ctx, "too many arguments");
}
if (*tmp && (ctx->flags & UCI_FLAG_STRICT))
uci_parse_error(ctx, "too many arguments");
}
@@
-383,12
+380,14
@@
static void uci_switch_config(struct uci_context *ctx)
static void uci_parse_package(struct uci_context *ctx, bool single)
{
struct uci_parse_context *pctx = ctx->pctx;
static void uci_parse_package(struct uci_context *ctx, bool single)
{
struct uci_parse_context *pctx = ctx->pctx;
- char *name = NULL;
+ int ofs_name;
+ char *name;
/* command string null-terminated by strtok */
pctx->pos += strlen(pctx_cur_str(pctx)) + 1;
/* command string null-terminated by strtok */
pctx->pos += strlen(pctx_cur_str(pctx)) + 1;
- name = next_arg(ctx, true, true);
+ ofs_name = next_arg(ctx, true, true, true);
+ name = pctx_str(pctx, ofs_name);
assert_eol(ctx);
if (single)
return;
assert_eol(ctx);
if (single)
return;
@@
-405,10
+404,10
@@
static void uci_parse_config(struct uci_context *ctx)
struct uci_parse_context *pctx = ctx->pctx;
struct uci_element *e;
struct uci_ptr ptr;
struct uci_parse_context *pctx = ctx->pctx;
struct uci_element *e;
struct uci_ptr ptr;
- char *name = NULL;
- char *type = NULL;
+ int ofs_name, ofs_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");
@@
-419,10
+418,14
@@
static void uci_parse_config(struct uci_context *ctx)
/* command string null-terminated by strtok */
pctx->pos += strlen(pctx_cur_str(pctx)) + 1;
/* command string null-terminated by strtok */
pctx->pos += strlen(pctx_cur_str(pctx)) + 1;
- type = next_arg(ctx, true, false);
+ ofs_type = next_arg(ctx, true, false, false);
+ type = pctx_str(pctx, ofs_type);
if (!uci_validate_type(type))
uci_parse_error(ctx, "invalid character in type field");
if (!uci_validate_type(type))
uci_parse_error(ctx, "invalid character in type field");
- name = next_arg(ctx, false, true);
+
+ ofs_name = next_arg(ctx, false, true, false);
+ type = pctx_str(pctx, ofs_type);
+ name = pctx_str(pctx, ofs_name);
assert_eol(ctx);
if (!name || !name[0]) {
assert_eol(ctx);
if (!name || !name[0]) {
@@
-431,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;
@@
-450,6
+458,7
@@
static void uci_parse_option(struct uci_context *ctx, bool list)
struct uci_parse_context *pctx = ctx->pctx;
struct uci_element *e;
struct uci_ptr ptr;
struct uci_parse_context *pctx = ctx->pctx;
struct uci_element *e;
struct uci_ptr ptr;
+ int ofs_name, ofs_value;
char *name = NULL;
char *value = NULL;
char *name = NULL;
char *value = NULL;
@@
-459,8
+468,10
@@
static void uci_parse_option(struct uci_context *ctx, bool list)
/* command string null-terminated by strtok */
pctx->pos += strlen(pctx_cur_str(pctx)) + 1;
/* command string null-terminated by strtok */
pctx->pos += strlen(pctx_cur_str(pctx)) + 1;
- name = next_arg(ctx, true, true);
- value = next_arg(ctx, false, false);
+ ofs_name = next_arg(ctx, true, true, false);
+ ofs_value = next_arg(ctx, false, false, false);
+ name = pctx_str(pctx, ofs_name);
+ value = pctx_str(pctx, ofs_value);
assert_eol(ctx);
uci_fill_ptr(ctx, &ptr, &pctx->section->e);
assert_eol(ctx);
uci_fill_ptr(ctx, &ptr, &pctx->section->e);
@@
-677,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)
@@
-726,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);
@@
-771,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);
@@
-786,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);
}
@@
-818,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;
@@
-830,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;
@@
-852,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;
}