X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=uci.h;h=cfcdf3ea8abf6f1bee81584f3088225bd8503117;hp=8e73bfe6c33924003e550d7c36556b087700246e;hb=031b620e1f3a16078da45ce00352508764902786;hpb=65e2c3559b451315935f9483c5f4e59d63441e54

diff --git a/uci.h b/uci.h
index 8e73bfe..cfcdf3e 100644
--- a/uci.h
+++ b/uci.h
@@ -260,6 +260,15 @@ extern int uci_add_history_path(struct uci_context *ctx, const char *dir);
  */
 extern int uci_revert(struct uci_context *ctx, struct uci_package **p, char *section, char *option);
 
+/**
+ * uci_parse_argument: parse a shell-style argument, with an arbitrary quoting style
+ * @ctx: uci context
+ * @stream: input stream
+ * @str: pointer to the current line (use NULL for parsing the next line)
+ * @result: pointer for the result
+ */
+extern int uci_parse_argument(struct uci_context *ctx, FILE *stream, char **str, char **result);
+
 /* UCI data structures */
 enum uci_type {
 	UCI_TYPE_HISTORY = 0,
@@ -270,9 +279,10 @@ enum uci_type {
 };
 
 enum uci_flags {
-	UCI_FLAG_STRICT =      (1 << 0), /* strict mode for the parser */
-	UCI_FLAG_PERROR =      (1 << 1), /* print parser error messages */
-	UCI_FLAG_EXPORT_NAME = (1 << 2), /* when exporting, name unnamed sections */
+	UCI_FLAG_STRICT =        (1 << 0), /* strict mode for the parser */
+	UCI_FLAG_PERROR =        (1 << 1), /* print parser error messages */
+	UCI_FLAG_EXPORT_NAME =   (1 << 2), /* when exporting, name unnamed sections */
+	UCI_FLAG_SAVED_HISTORY = (1 << 3), /* store the saved history in memory as well */
 };
 
 struct uci_element
@@ -308,23 +318,6 @@ struct uci_context
 	int bufsz;
 };
 
-struct uci_parse_context
-{
-	/* error context */
-	const char *reason;
-	int line;
-	int byte;
-
-	/* private: */
-	struct uci_package *package;
-	struct uci_section *section;
-	bool merge;
-	FILE *file;
-	const char *name;
-	char *buf;
-	int bufsz;
-};
-
 struct uci_package
 {
 	struct uci_element e;
@@ -336,6 +329,7 @@ struct uci_package
 	/* private: */
 	int n_section;
 	struct uci_list history;
+	struct uci_list saved_history;
 };
 
 struct uci_section