#include <stdio.h>
#define UCI_CONFDIR "/etc/config"
+#define UCI_SAVEDIR "/tmp/.uci"
+#define UCI_FILEMODE 0600
enum
{
UCI_ERR_NOTFOUND,
UCI_ERR_IO,
UCI_ERR_PARSE,
+ UCI_ERR_DUPLICATE,
UCI_ERR_UNKNOWN,
UCI_ERR_LAST
};
struct uci_section;
struct uci_option;
struct uci_history;
+struct uci_context;
struct uci_parse_context;
/**
+ * uci_parse_tuple: Parse an uci tuple
+ * @ctx: uci context
+ * @str: input string
+ * @package: output package pointer
+ * @section: output section pointer
+ * @option: output option pointer
+ * @value: output value pointer
+ *
+ * format: <package>[.<section>[.<option>]][=<value>]
+ */
+extern int uci_parse_tuple(struct uci_context *ctx, char *str, char **package, char **section, char **option, char **value);
+
+/**
* uci_alloc_context: Allocate a new uci context
*/
extern struct uci_context *uci_alloc_context(void);
* @single: ignore the 'package' keyword and parse everything into a single package
*
* the name parameter is for config files that don't explicitly use the 'package <...>' keyword
+ * if 'package' points to a non-null struct pointer, enable history tracking and merge
*/
extern int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_package **package, bool single);
* @option: option name
* @value: value (option) or type (section)
*/
-extern int uci_set(struct uci_context *ctx, char *package, char *section, char *option, char *value);
+extern int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char *option, char *value);
/**
- * uci_commit: commit changes to a package
+ * uci_rename: Rename an element
+ * @ctx: uci context
+ * @package: package name
+ * @section: section name
+ * @option: option name
+ * @name: new name
+ */
+extern int uci_rename(struct uci_context *ctx, struct uci_package *p, char *section, char *option, char *name);
+
+/**
+ * uci_delete_element: Delete a section or option
+ * @ctx: uci context
+ * @e: element (section or option)
+ */
+extern int uci_delete_element(struct uci_context *ctx, struct uci_element *e);
+
+/**
+ * uci_delete: Delete a section or option
+ * @ctx: uci context
+ * @p: uci package
+ * @section: section name
+ * @option: option name (optional)
+ */
+extern int uci_delete(struct uci_context *ctx, struct uci_package *p, char *section, char *option);
+
+/**
+ * uci_save: save change history for a package
* @ctx: uci context
* @p: uci_package struct
*/
-extern int uci_commit(struct uci_context *ctx, struct uci_package *p);
+extern int uci_save(struct uci_context *ctx, struct uci_package *p);
+
+/**
+ * uci_commit: commit changes to a package
+ * @ctx: uci context
+ * @p: uci_package struct pointer
+ *
+ * committing may reload the whole uci_package data,
+ * the supplied pointer is updated accordingly
+ */
+extern int uci_commit(struct uci_context *ctx, struct uci_package **p);
/**
* uci_list_configs: List available uci config files
*
* @ctx: uci context
*/
-extern char **uci_list_configs(struct uci_context *ctx);
+extern int uci_list_configs(struct uci_context *ctx, char ***list);
/* UCI data structures */
enum uci_type {
- UCI_TYPE_PACKAGE = 0,
- UCI_TYPE_SECTION = 1,
- UCI_TYPE_OPTION = 2
+ UCI_TYPE_HISTORY = 0,
+ UCI_TYPE_PACKAGE = 1,
+ UCI_TYPE_SECTION = 2,
+ UCI_TYPE_OPTION = 3
+};
+
+enum uci_flags {
+ UCI_FLAG_STRICT = (1 << 0), /* strict mode for the parser */
+ UCI_FLAG_PERROR = (1 << 1), /* print error messages to stderr */
};
struct uci_element
/* parser context, use for error handling only */
struct uci_parse_context *pctx;
+ /* uci runtime flags */
+ enum uci_flags flags;
+
/* private: */
int errno;
const char *func;
jmp_buf trap;
+ bool internal;
char *buf;
int bufsz;
};
/* private: */
struct uci_package *package;
struct uci_section *section;
+ bool merge;
FILE *file;
const char *name;
char *buf;
struct uci_element e;
struct uci_list options;
struct uci_package *package;
+ bool anonymous;
char *type;
};
enum uci_command {
UCI_CMD_ADD,
UCI_CMD_REMOVE,
- UCI_CMD_CHANGE
+ UCI_CMD_CHANGE,
+ UCI_CMD_RENAME
};
struct uci_history
{
- struct uci_list list;
+ struct uci_element e;
enum uci_command cmd;
char *section;
- char *option;
char *value;
};
#define uci_list_empty(list) ((list)->next == (list))
/* wrappers for dynamic type handling */
+#define uci_type_history UCI_TYPE_HISTORY
#define uci_type_package UCI_TYPE_PACKAGE
#define uci_type_section UCI_TYPE_SECTION
#define uci_type_option UCI_TYPE_OPTION
/* element typecasting */
#ifdef UCI_DEBUG_TYPECAST
static const char *uci_typestr[] = {
+ [uci_type_history] = "history",
[uci_type_package] = "package",
[uci_type_section] = "section",
- [uci_type_option] = "option"
+ [uci_type_option] = "option",
};
static void uci_typecast_error(int from, int to)
return (struct uci_ ## _type *) e; \
}
+BUILD_CAST(history)
BUILD_CAST(package)
BUILD_CAST(section)
BUILD_CAST(option)
#else
+#define uci_to_history(ptr) container_of(ptr, struct uci_history, e)
#define uci_to_package(ptr) container_of(ptr, struct uci_package, e)
#define uci_to_section(ptr) container_of(ptr, struct uci_section, e)
#define uci_to_option(ptr) container_of(ptr, struct uci_option, e)