projects
/
project
/
uci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ucimap: free memory allocated for fixups
[project/uci.git]
/
util.c
diff --git
a/util.c
b/util.c
index
d5bcd8a
..
f0b2094
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++;
}
@@
-120,6
+132,7
@@
static void uci_alloc_parse_context(struct uci_context *ctx)
int uci_parse_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str)
{
char *last = NULL;
int uci_parse_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str)
{
char *last = NULL;
+ char *tmp;
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, str);
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, str);
@@
-153,8
+166,12
@@
int uci_parse_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str)
ptr->target = UCI_TYPE_OPTION;
}
ptr->target = UCI_TYPE_OPTION;
}
+ tmp = strsep(&str, ".");
+ if (tmp)
+ goto error;
+
lastval:
lastval:
- if (ptr->package && !uci_validate_
str(ptr->package, fals
e))
+ if (ptr->package && !uci_validate_
package(ptr->packag
e))
goto error;
if (ptr->section && !uci_validate_name(ptr->section))
ptr->flags |= UCI_LOOKUP_EXTENDED;
goto error;
if (ptr->section && !uci_validate_name(ptr->section))
ptr->flags |= UCI_LOOKUP_EXTENDED;
@@
-393,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;
@@
-437,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);
@@
-462,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);