* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
*/
/*
- * This file contains wrappers to standard functions, which
- * throw exceptions upon failure.
+ * This file contains misc utility functions and wrappers to standard
+ * functions, which throw exceptions upon failure.
*/
+#define _GNU_SOURCE
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/file.h>
#include <unistd.h>
#include <ctype.h>
#include <fcntl.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <libgen.h>
-#define LINEBUF 32
-#define LINEBUF_MAX 4096
+#include "uci.h"
+#include "uci_internal.h"
-static void *uci_malloc(struct uci_context *ctx, size_t size)
+__private void *uci_malloc(struct uci_context *ctx, size_t size)
{
void *ptr;
return ptr;
}
-static 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)
return ptr;
}
-static char *uci_strdup(struct uci_context *ctx, const char *str)
+__private char *uci_strdup(struct uci_context *ctx, const char *str)
{
char *ptr;
return ptr;
}
-static bool uci_validate_name(const char *str)
+/*
+ * validate strings for names and types, reject special characters
+ * for names, only alphanum and _ is allowed (shell compatibility)
+ * for types, we allow more characters
+ */
+__private bool uci_validate_str(const char *str, bool name, bool package)
{
if (!*str)
return false;
+ for (; *str; str++) {
+ unsigned char c = *str;
+
+ if (isalnum(c) || c == '_')
+ continue;
+
+ if (c == '-' && package)
+ continue;
+
+ if (name || (c < 33) || (c > 126))
+ return false;
+ }
+ return true;
+}
+
+bool uci_validate_text(const char *str)
+{
while (*str) {
- if (!isalnum(*str) && (*str != '_'))
+ unsigned char c = *str;
+
+ if (c < 32 && c != '\t' && c != '\n' && c != '\r')
return false;
+
str++;
}
return true;
}
-int uci_parse_tuple(struct uci_context *ctx, char *str, char **package, char **section, char **option, char **value)
+__private void uci_alloc_parse_context(struct uci_context *ctx)
+{
+ ctx->pctx = (struct uci_parse_context *) uci_malloc(ctx, sizeof(struct uci_parse_context));
+}
+
+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 && package && section && option);
+ UCI_ASSERT(ctx, str);
+ UCI_ASSERT(ctx, ptr);
+
+ memset(ptr, 0, sizeof(struct uci_ptr));
- *package = strtok(str, ".");
- if (!*package || !uci_validate_name(*package))
+ /* value */
+ last = strchr(str, '=');
+ if (last) {
+ *last = 0;
+ last++;
+ ptr->value = last;
+ }
+
+ ptr->package = strsep(&str, ".");
+ if (!ptr->package)
goto error;
- last = *package;
- *section = strtok(NULL, ".");
- if (!*section)
+ ptr->section = strsep(&str, ".");
+ if (!ptr->section) {
+ ptr->target = UCI_TYPE_PACKAGE;
goto lastval;
+ }
- last = *section;
- *option = strtok(NULL, ".");
- if (!*option)
+ ptr->option = strsep(&str, ".");
+ if (!ptr->option) {
+ ptr->target = UCI_TYPE_SECTION;
goto lastval;
+ } else {
+ ptr->target = UCI_TYPE_OPTION;
+ }
- last = *option;
+ tmp = strsep(&str, ".");
+ if (tmp)
+ goto error;
lastval:
- last = strchr(last, '=');
- if (last) {
- if (!value)
- goto error;
-
- *last = 0;
- last++;
- if (!*last)
- goto error;
- *value = last;
- }
-
- if (*section && !uci_validate_name(*section))
+ if (ptr->package && !uci_validate_package(ptr->package))
+ goto error;
+ if (ptr->section && !uci_validate_name(ptr->section))
+ ptr->flags |= UCI_LOOKUP_EXTENDED;
+ if (ptr->option && !uci_validate_name(ptr->option))
goto error;
- if (*option && !uci_validate_name(*option))
+ if (ptr->value && !uci_validate_text(ptr->value))
goto error;
- goto done;
+ return 0;
error:
+ memset(ptr, 0, sizeof(struct uci_ptr));
UCI_THROW(ctx, UCI_ERR_PARSE);
-
-done:
- return 0;
}
-static 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);
}
-/*
- * Fetch a new line from the input stream and resize buffer if necessary
- */
-static void uci_getln(struct uci_context *ctx, int offset)
-{
- struct uci_parse_context *pctx = ctx->pctx;
- char *p;
- int ofs;
-
- if (pctx->buf == NULL) {
- pctx->buf = uci_malloc(ctx, LINEBUF);
- pctx->bufsz = LINEBUF;
- }
-
- ofs = offset;
- do {
- p = &pctx->buf[ofs];
- p[ofs] = 0;
-
- p = fgets(p, pctx->bufsz - ofs, pctx->file);
- if (!p || !*p)
- return;
-
- ofs += strlen(p);
- if (pctx->buf[ofs - 1] == '\n') {
- pctx->line++;
- pctx->buf[ofs - 1] = 0;
- return;
- }
-
- if (pctx->bufsz > LINEBUF_MAX/2)
- uci_parse_error(ctx, p, "line too long");
-
- pctx->bufsz *= 2;
- pctx->buf = uci_realloc(ctx, pctx->buf, pctx->bufsz);
- } while (1);
-}
/*
* open a stream and go to the right position
* note: when opening for write and seeking to the beginning of
* the stream, truncate the file
*/
-static 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);
- if (fd <= 0)
+ fd = open(filename, flags, mode);
+ 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);
return file;
}
-static void uci_close_stream(FILE *stream)
+__private void uci_close_stream(FILE *stream)
{
int fd;
if (!stream)
return;
+ fflush(stream);
fd = fileno(stream);
flock(fd, LOCK_UN);
fclose(stream);
projects / project / uci.git / blobdiff