#include <stdio.h>
#include <ctype.h>
-#define LINEBUF 128
+#define LINEBUF 32
#define LINEBUF_MAX 4096
/*
* Fetch a new line from the input stream and resize buffer if necessary
*/
-static void uci_getln(struct uci_context *ctx)
+static void uci_getln(struct uci_context *ctx, int offset)
{
struct uci_parse_context *pctx = ctx->pctx;
char *p;
pctx->bufsz = LINEBUF;
}
- ofs = 0;
+ ofs = offset;
do {
p = &pctx->buf[ofs];
p[ofs] = 0;
p = fgets(p, pctx->bufsz - ofs, pctx->file);
- if (!p || !p[ofs])
+ if (!p || !*p)
return;
ofs += strlen(p);
free(pctx);
}
+/*
+ * parse a character escaped by '\'
+ * returns true if the escaped character is to be parsed
+ * returns false if the escaped character is to be ignored
+ */
+static inline bool parse_backslash(struct uci_context *ctx, char **str)
+{
+ /* skip backslash */
+ *str += 1;
+
+ /* undecoded backslash at the end of line, fetch the next line */
+ if (!**str) {
+ *str += 1;
+ uci_getln(ctx, *str - ctx->pctx->buf);
+ return false;
+ }
+
+ /* FIXME: decode escaped char, necessary? */
+ return true;
+}
+
/*
* move the string pointer forward until a non-whitespace character or
* EOL is reached
*/
-static void skip_whitespace(char **str)
+static void skip_whitespace(struct uci_context *ctx, char **str)
{
+restart:
while (**str && isspace(**str))
*str += 1;
+
+ if (**str == '\\') {
+ if (!parse_backslash(ctx, str))
+ goto restart;
+ }
}
static inline void addc(char **dest, char **src)
*src += 1;
}
-static inline void parse_backslash(char **str, char **target)
-{
- /* skip backslash */
- *str += 1;
- /* FIXME: decode escaped characters? */
- addc(target, str);
-}
-
/*
* parse a double quoted string argument from the command line
*/
while ((c = **str)) {
switch(c) {
- case '\\':
- parse_backslash(str, target);
- continue;
case '"':
**target = 0;
*str += 1;
return;
+ case '\\':
+ if (!parse_backslash(ctx, str))
+ continue;
+ /* fall through */
default:
addc(target, str);
break;
{
do {
switch(**str) {
- case '\\':
- parse_backslash(str, target);
- continue;
case '\'':
parse_single_quote(ctx, str, target);
break;
break;
case 0:
goto done;
+ case '\\':
+ if (!parse_backslash(ctx, str))
+ continue;
+ /* fall through */
default:
addc(target, str);
break;
char *ptr;
val = ptr = *str;
- skip_whitespace(str);
+ skip_whitespace(ctx, str);
parse_str(ctx, str, &ptr);
if (required && !*val) {
ctx->pctx->reason = "insufficient arguments";
}
/*
+ * parse the 'package' uci command (next config package)
+ */
+static void uci_parse_package(struct uci_context *ctx, char **str)
+{
+ char *name = NULL;
+
+ /* command string null-terminated by strtok */
+ *str += strlen(*str) + 1;
+
+ UCI_TRAP_SAVE(ctx, error);
+ name = next_arg(ctx, str, true);
+ assert_eol(ctx, str);
+ ctx->pctx->name = name;
+ uci_switch_config(ctx);
+ UCI_TRAP_RESTORE(ctx);
+ return;
+
+error:
+ if (name)
+ free(name);
+ UCI_THROW(ctx, ctx->errno);
+}
+
+/*
* parse the 'config' uci command (open a section)
*/
static void uci_parse_config(struct uci_context *ctx, char **str)
word = strtok_r(word, " \t", &pbrk);
switch(word[0]) {
+ case 'p':
+ if ((word[1] == 0) || !strcmp(word + 1, "ackage"))
+ uci_parse_package(ctx, &word);
+ break;
case 'c':
if ((word[1] == 0) || !strcmp(word + 1, "onfig"))
uci_parse_config(ctx, &word);
pctx->name = name;
while (!feof(pctx->file)) {
- uci_getln(ctx);
+ uci_getln(ctx, 0);
if (pctx->buf[0])
uci_parse_line(ctx);
}