-
-__plugin void *uci_malloc(struct uci_context *ctx, size_t size);
-__plugin void *uci_realloc(struct uci_context *ctx, void *ptr, size_t size);
-__plugin char *uci_strdup(struct uci_context *ctx, const char *str);
-__plugin bool uci_validate_str(const char *str, bool name);
-__plugin void uci_add_history(struct uci_context *ctx, struct uci_list *list, int cmd, const char *section, const char *option, const char *value);
-__plugin void uci_free_history(struct uci_history *h);
-__plugin struct uci_package *uci_alloc_package(struct uci_context *ctx, const char *name);
-
-__private FILE *uci_open_stream(struct uci_context *ctx, const char *filename, int pos, bool write, bool create);
+#define pctx_pos(pctx) ((pctx)->pos)
+#define pctx_str(pctx, i) (&(pctx)->buf[(i)])
+#define pctx_cur_str(pctx) pctx_str(pctx, pctx_pos(pctx))
+#define pctx_char(pctx, i) ((pctx)->buf[(i)])
+#define pctx_cur_char(pctx) pctx_char(pctx, pctx_pos(pctx))
+
+extern const char *uci_confdir;
+extern const char *uci_savedir;
+
+__private void *uci_malloc(struct uci_context *ctx, size_t size);
+__private void *uci_realloc(struct uci_context *ctx, void *ptr, size_t size);
+__private char *uci_strdup(struct uci_context *ctx, const char *str);
+__private bool uci_validate_str(const char *str, bool name, bool package);
+__private void uci_add_delta(struct uci_context *ctx, struct uci_list *list, int cmd, const char *section, const char *option, const char *value);
+__private void uci_free_delta(struct uci_delta *h);
+__private struct uci_package *uci_alloc_package(struct uci_context *ctx, const char *name);
+
+__private FILE *uci_open_stream(struct uci_context *ctx, const char *filename, const char *origfilename, int pos, bool write, bool create);