projects
/
project
/
uci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: add test case for parsing long option values.
[project/uci.git]
/
file.c
diff --git
a/file.c
b/file.c
index
3f02c11
..
cf0dfaf
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
@@
-69,11
+68,10
@@
__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);
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);
}
@@
-157,7
+155,6
@@
static void parse_double_quote(struct uci_context *ctx, int *target)
break;
}
}
break;
}
}
- uci_parse_error(ctx, "unterminated \"");
}
/*
}
/*
@@
-180,14
+177,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,7
+235,7
@@
done:
/*
* extract the next argument from the command line
*/
/*
* extract the next argument from the command line
*/
-static int next_arg(struct uci_context *ctx, bool required, bool name)
+static int next_arg(struct uci_context *ctx, bool required, bool name
, bool package
)
{
struct uci_parse_context *pctx = ctx->pctx;
int val, ptr;
{
struct uci_parse_context *pctx = ctx->pctx;
int val, ptr;
@@
-258,7
+254,7
@@
static int 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:
@@
-280,16
+276,12
@@
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);
}
}
- /*FIXME do we need to skip empty lines? */
- ofs_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);
*result = pctx_str(ctx->pctx, ofs_result);
*str = pctx_cur_str(ctx->pctx);
@@
-343,7
+335,7
@@
static void assert_eol(struct uci_context *ctx)
int ofs_tmp;
skip_whitespace(ctx);
int ofs_tmp;
skip_whitespace(ctx);
- ofs_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");
tmp = pctx_str(ctx->pctx, ofs_tmp);
if (*tmp && (ctx->flags & UCI_FLAG_STRICT))
uci_parse_error(ctx, "too many arguments");
@@
-396,7
+388,7
@@
static void uci_parse_package(struct uci_context *ctx, bool single)
/* 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;
- ofs_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)
name = pctx_str(pctx, ofs_name);
assert_eol(ctx);
if (single)
@@
-429,12
+421,12
@@
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;
- ofs_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");
type = pctx_str(pctx, ofs_type);
if (!uci_validate_type(type))
uci_parse_error(ctx, "invalid character in type field");
- ofs_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);
type = pctx_str(pctx, ofs_type);
name = pctx_str(pctx, ofs_name);
assert_eol(ctx);
@@
-474,8
+466,8
@@
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;
- ofs_name = next_arg(ctx, true, true);
- ofs_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);
name = pctx_str(pctx, ofs_name);
value = pctx_str(pctx, ofs_value);
assert_eol(ctx);