tests: use uci instead of uci-static

[project/uci.git] / util.c

diff --git a/util.c b/util.c
index 916f0c1..09f1817 100644 (file)
--- a/util.c
+++ b/util.c
@@ -27,11 +27,12 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include <libgen.h>
 
 #include "uci.h"
 #include "uci_internal.h"
 
-__plugin void *uci_malloc(struct uci_context *ctx, size_t size)
+__private void *uci_malloc(struct uci_context *ctx, size_t size)
 {
        void *ptr;
 
@@ -43,7 +44,7 @@ __plugin void *uci_malloc(struct uci_context *ctx, size_t size)
        return ptr;
 }
 
-__plugin void *uci_realloc(struct uci_context *ctx, void *ptr, size_t size)
+__private void *uci_realloc(struct uci_context *ctx, void *ptr, size_t size)
 {
        ptr = realloc(ptr, size);
        if (!ptr)
@@ -52,7 +53,7 @@ __plugin void *uci_realloc(struct uci_context *ctx, void *ptr, size_t size)
        return ptr;
 }
 
-__plugin char *uci_strdup(struct uci_context *ctx, const char *str)
+__private char *uci_strdup(struct uci_context *ctx, const char *str)
 {
        char *ptr;
 
@@ -68,7 +69,7 @@ __plugin char *uci_strdup(struct uci_context *ctx, const char *str)
  * for names, only alphanum and _ is allowed (shell compatibility)
  * for types, we allow more characters
  */
-__plugin bool uci_validate_str(const char *str, bool name)
+__private bool uci_validate_str(const char *str, bool name)
 {
        if (!*str)
                return false;
@@ -88,9 +89,12 @@ bool uci_validate_text(const char *str)
 {
        while (*str) {
                unsigned char c = *str;
-               if ((c == '\r') || (c == '\n') ||
-                       ((c < 32) && (c != '\t')))
+               if (((c < 32) &&
+                    (c != '\t') &&
+                    (c != '\n') &&
+                    (c != '\r'))) {
                        return false;
+               }
                str++;
        }
        return true;
@@ -160,12 +164,12 @@ error:
 }
 
 
-__private void uci_parse_error(struct uci_context *ctx, char *pos, char *reason)
+__private void uci_parse_error(struct uci_context *ctx, char *reason)
 {
        struct uci_parse_context *pctx = ctx->pctx;
 
        pctx->reason = reason;
-       pctx->byte = pos - pctx->buf;
+       pctx->byte = pctx_pos(pctx);
        UCI_THROW(ctx, UCI_ERR_PARSE);
 }
 
@@ -177,22 +181,39 @@ __private void uci_parse_error(struct uci_context *ctx, char *pos, char *reason)
  * note: when opening for write and seeking to the beginning of
  * the stream, truncate the file
  */
-__private FILE *uci_open_stream(struct uci_context *ctx, const char *filename, int pos, bool write, bool create)
+__private FILE *uci_open_stream(struct uci_context *ctx, const char *filename, const char *origfilename, int pos, bool write, bool create)
 {
        struct stat statbuf;
        FILE *file = NULL;
        int fd, ret;
-       int mode = (write ? O_RDWR : O_RDONLY);
+       int flags = (write ? O_RDWR : O_RDONLY);
+       mode_t mode = UCI_FILEMODE;
+       char *name = NULL;
+       char *filename2 = NULL;
+
+       if (create) {
+               flags |= O_CREAT;
+               if (origfilename) {
+                       name = basename((char *) origfilename);
+               } else {
+                       name = basename((char *) filename);
+               }
+               if ((asprintf(&filename2, "%s/%s", ctx->confdir, name) < 0) || !filename2) {
+                       UCI_THROW(ctx, UCI_ERR_MEM);
+               } else {
+                       if (stat(filename2, &statbuf) == 0)
+                               mode = statbuf.st_mode;
 
-       if (create)
-               mode |= O_CREAT;
+                       free(filename2);
+               }
+       }
 
        if (!write && ((stat(filename, &statbuf) < 0) ||
-               ((statbuf.st_mode &  S_IFMT) != S_IFREG))) {
+               ((statbuf.st_mode & S_IFMT) != S_IFREG))) {
                UCI_THROW(ctx, UCI_ERR_NOTFOUND);
        }
 
-       fd = open(filename, mode, UCI_FILEMODE);
+       fd = open(filename, flags, mode);
        if (fd < 0)
                goto error;