add support for parsing escaped newline characters

[project/uci.git] / uci.h

diff --git a/uci.h b/uci.h
index 6dc00f1..7cd7eb9 100644 (file)
--- a/uci.h
+++ b/uci.h
@@ -62,6 +62,17 @@ extern void uci_free(struct uci_context *ctx);
 extern void uci_perror(struct uci_context *ctx, const char *str);
 
 /**
 extern void uci_perror(struct uci_context *ctx, const char *str);
 
 /**

+ * uci_import: Import uci config data from a stream
+ * @ctx: uci context
+ * @stream: file stream to import from
+ * @name: (optional) assume the config has the given name
+ * @cfg: (optional) store the last parsed config package in this variable
+ *
+ * the name parameter is for config files that don't explicitly use the 'package <...>' keyword
+ */
+extern int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_config **cfg);
+
+/**

  * uci_load: Parse an uci config file and store it in the uci context
  *
  * @ctx: uci context
  * uci_load: Parse an uci config file and store it in the uci context
  *
  * @ctx: uci context


@@ -89,7 +100,7 @@ extern int uci_cleanup(struct uci_context *ctx);
  *
  * @ctx: uci context
  */
  *
  * @ctx: uci context
  */

-extern char **uci_list_configs(struct uci_context *ctx);
+extern char **uci_list_configs();

 
 /* UCI data structures */
 
 
 /* UCI data structures */
 


@@ -107,14 +118,16 @@ struct uci_context
 
 struct uci_parse_context
 {
 
 struct uci_parse_context
 {

+       const char *reason;

        int line;
        int byte;
 
        /* private: */
        struct uci_config *cfg;
        int line;
        int byte;
 
        /* private: */
        struct uci_config *cfg;

+       struct uci_section *section;

        FILE *file;
        FILE *file;

+       const char *name;

        char *buf;
        char *buf;

-       char *reason;

        int bufsz;
 };
 
        int bufsz;
 };
 


@@ -124,6 +137,8 @@ struct uci_config
        struct uci_list sections;
        struct uci_context *ctx;
        char *name;
        struct uci_list sections;
        struct uci_context *ctx;
        char *name;

+       /* private: */
+       int n_section;

 };
 
 struct uci_section
 };
 
 struct uci_section


@@ -148,7 +163,7 @@ struct uci_option
 #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 #endif
 
 #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 #endif
 

-#define uci_list_empty(list) (list->next == ptr)
+#define uci_list_empty(list) ((list)->next == (list))

 #define uci_list_entry(_type, _ptr) \
        ((struct uci_ ## _type *) ((char *)(_ptr) - offsetof(struct uci_ ## _type,list)))
 
 #define uci_list_entry(_type, _ptr) \
        ((struct uci_ ## _type *) ((char *)(_ptr) - offsetof(struct uci_ ## _type,list)))