X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=uci.h;h=7cd7eb9fe6256398a9776cc301ec434e740d57d2;hp=c5594d8c1aebe4f9b2e9868054c743f807b99232;hb=a453ffddff2ce0c0c7fd21826bb4ae1544829553;hpb=508525c69e08a96031ed24f2d09e3bc2d1d33fca

diff --git a/uci.h b/uci.h
index c5594d8..7cd7eb9 100644
--- 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);
 
 /**
+ * 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
@@ -107,6 +118,7 @@ struct uci_context
 
 struct uci_parse_context
 {
+	const char *reason;
 	int line;
 	int byte;
 
@@ -114,8 +126,8 @@ struct uci_parse_context
 	struct uci_config *cfg;
 	struct uci_section *section;
 	FILE *file;
+	const char *name;
 	char *buf;
-	char *reason;
 	int bufsz;
 };