projects
/
project
/
uci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
protect ucimap.h against multiple inclusions
[project/uci.git]
/
util.c
diff --git
a/util.c
b/util.c
index dde7bfc96dd15c907bc387eac6faa02ab5d1b4b3..f0b2094810bcd8c75cb6097b62a76dbaabbc45da 100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-23,6
+23,7
@@
#include <unistd.h>
#include <ctype.h>
#include <fcntl.h>
#include <unistd.h>
#include <ctype.h>
#include <fcntl.h>
+#include <errno.h>
#define LINEBUF 32
#define LINEBUF_MAX 4096
#define LINEBUF 32
#define LINEBUF_MAX 4096
@@
-86,7
+87,7
@@
__plugin bool uci_validate_str(const char *str, bool name)
return false;
while (*str) {
return false;
while (*str) {
- char c = *str;
+
unsigned
char c = *str;
if (!isalnum(c) && c != '_') {
if (name || (c < 33) || (c > 126))
return false;
if (!isalnum(c) && c != '_') {
if (name || (c < 33) || (c > 126))
return false;
@@
-96,6
+97,16
@@
__plugin bool uci_validate_str(const char *str, bool name)
return true;
}
return true;
}
+static inline bool uci_validate_package(const char *str)
+{
+ return uci_validate_str(str, false);
+}
+
+static inline bool uci_validate_type(const char *str)
+{
+ return uci_validate_str(str, false);
+}
+
static inline bool uci_validate_name(const char *str)
{
return uci_validate_str(str, true);
static inline bool uci_validate_name(const char *str)
{
return uci_validate_str(str, true);
@@
-104,8
+115,9
@@
static inline bool uci_validate_name(const char *str)
bool uci_validate_text(const char *str)
{
while (*str) {
bool uci_validate_text(const char *str)
{
while (*str) {
- if ((*str == '\r') || (*str == '\n') ||
- ((*str < 32) && (*str != '\t')))
+ unsigned char c = *str;
+ if ((c == '\r') || (c == '\n') ||
+ ((c < 32) && (c != '\t')))
return false;
str++;
}
return false;
str++;
}
@@
-117,59
+129,62
@@
static void uci_alloc_parse_context(struct uci_context *ctx)
ctx->pctx = (struct uci_parse_context *) uci_malloc(ctx, sizeof(struct uci_parse_context));
}
ctx->pctx = (struct uci_parse_context *) uci_malloc(ctx, sizeof(struct uci_parse_context));
}
-int uci_parse_
tuple(struct uci_context *ctx, char *str, char **package, char **section, char **option, char **value
)
+int uci_parse_
ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str
)
{
char *last = NULL;
{
char *last = NULL;
-
bool internal = ctx->internal
;
+
char *tmp
;
UCI_HANDLE_ERR(ctx);
UCI_HANDLE_ERR(ctx);
- UCI_ASSERT(ctx, str && package && section && option);
+ UCI_ASSERT(ctx, str);
+ UCI_ASSERT(ctx, ptr);
+
+ memset(ptr, 0, sizeof(struct uci_ptr));
+ /* value */
last = strchr(str, '=');
if (last) {
*last = 0;
last++;
last = strchr(str, '=');
if (last) {
*last = 0;
last++;
+ ptr->value = last;
}
}
-
*
package = strsep(&str, ".");
- if (!
*package || !uci_validate_str(*package, false)
)
+
ptr->
package = strsep(&str, ".");
+ if (!
ptr->package
)
goto error;
goto error;
- *section = strsep(&str, ".");
- *option = NULL;
- if (value)
- *value = NULL;
- if (!*section)
+ ptr->section = strsep(&str, ".");
+ if (!ptr->section) {
+ ptr->target = UCI_TYPE_PACKAGE;
goto lastval;
goto lastval;
+ }
- *option = strsep(&str, ".");
- if (!*option)
+ ptr->option = strsep(&str, ".");
+ if (!ptr->option) {
+ ptr->target = UCI_TYPE_SECTION;
goto lastval;
goto lastval;
-
-lastval:
- if (last) {
- if (!value)
- goto error;
-
- if (!*last)
- goto error;
- *value = last;
+ } else {
+ ptr->target = UCI_TYPE_OPTION;
}
}
- if (*section && *section[0] && !internal && !uci_validate_name(*section))
+ tmp = strsep(&str, ".");
+ if (tmp)
goto error;
goto error;
- if (*option && !uci_validate_name(*option))
+
+lastval:
+ if (ptr->package && !uci_validate_package(ptr->package))
goto error;
goto error;
- if (value && *value && !uci_validate_text(*value))
+ if (ptr->section && !uci_validate_name(ptr->section))
+ ptr->flags |= UCI_LOOKUP_EXTENDED;
+ if (ptr->option && !uci_validate_name(ptr->option))
+ goto error;
+ if (ptr->value && !uci_validate_text(ptr->value))
goto error;
goto error;
-
goto done
;
+
return 0
;
error:
error:
+ memset(ptr, 0, sizeof(struct uci_ptr));
UCI_THROW(ctx, UCI_ERR_PARSE);
UCI_THROW(ctx, UCI_ERR_PARSE);
-
-done:
- return 0;
}
}
@@
-395,14
+410,14
@@
int uci_parse_argument(struct uci_context *ctx, FILE *stream, char **str, char *
UCI_ASSERT(ctx, str != NULL);
UCI_ASSERT(ctx, result != NULL);
UCI_ASSERT(ctx, str != NULL);
UCI_ASSERT(ctx, result != NULL);
- if (ctx->pctx) {
- if (ctx->pctx->file != stream) {
- uci_cleanup(ctx);
- }
- } else {
+ if (ctx->pctx && (ctx->pctx->file != stream))
+ uci_cleanup(ctx);
+
+ if (!ctx->pctx)
uci_alloc_parse_context(ctx);
uci_alloc_parse_context(ctx);
- ctx->pctx->file = stream;
- }
+
+ ctx->pctx->file = stream;
+
if (!*str) {
uci_getln(ctx, 0);
*str = ctx->pctx->buf;
if (!*str) {
uci_getln(ctx, 0);
*str = ctx->pctx->buf;
@@
-439,7
+454,8
@@
static FILE *uci_open_stream(struct uci_context *ctx, const char *filename, int
if (fd < 0)
goto error;
if (fd < 0)
goto error;
- if (flock(fd, (write ? LOCK_EX : LOCK_SH)) < 0)
+ ret = flock(fd, (write ? LOCK_EX : LOCK_SH));
+ if ((ret < 0) && (errno != ENOSYS))
goto error;
ret = lseek(fd, 0, pos);
goto error;
ret = lseek(fd, 0, pos);
@@
-464,6
+480,7
@@
static void uci_close_stream(FILE *stream)
if (!stream)
return;
if (!stream)
return;
+ fflush(stream);
fd = fileno(stream);
flock(fd, LOCK_UN);
fclose(stream);
fd = fileno(stream);
flock(fd, LOCK_UN);
fclose(stream);