X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fgetopt.h;h=b4ff823ffb4f43bb9087535d79a5f658dc330a53;hb=e42cd882d7970eb0b01bc9b058e0446996212cb4;hp=7aaa99fabdb320ad60391a7cd10f52fabe775b09;hpb=02e471ba458a1158204be876bec93da73c8a2909;p=libucw.git

diff --git a/lib/getopt.h b/lib/getopt.h
index 7aaa99fa..b4ff823f 100644
--- a/lib/getopt.h
+++ b/lib/getopt.h
@@ -11,19 +11,26 @@
 #ifndef	_UCW_GETOPT_H
 #define	_UCW_GETOPT_H
 
+#ifdef CONFIG_OWN_GETOPT
+#include "lib/getopt/getopt-sh.h"
+#else
 #include <getopt.h>
+#endif
+
+void reset_getopt(void);
 
 /* Safe loading and reloading of configuration files: conf-input.c */
 
-extern byte *cf_def_file;		/* DEFAULT_CONFIG; NULL if already loaded */
-int cf_reload(byte *file);
-int cf_load(byte *file);
-int cf_set(byte *string);
+extern char *cf_def_file;		/* DEFAULT_CONFIG; NULL if already loaded */
+extern char *cf_env_file;		/* ENV_VAR_CONFIG */
+int cf_reload(const char *file);
+int cf_load(const char *file);
+int cf_set(const char *string);
 
 /* Direct access to configuration items: conf-intr.c */
 
-#define CF_OPERATIONS T(CLOSE) T(SET) T(CLEAR) T(APPEND) T(PREPEND) \
-  T(REMOVE) T(EDIT) T(AFTER) T(BEFORE) T(COPY)
+#define CF_OPERATIONS T(CLOSE) T(SET) T(CLEAR) T(ALL) \
+  T(APPEND) T(PREPEND) T(REMOVE) T(EDIT) T(AFTER) T(BEFORE) T(COPY)
   /* Closing brace finishes previous block.
    * Basic attributes (static, dynamic, parsed) can be used with SET.
    * Dynamic arrays can be used with SET, APPEND, PREPEND.
@@ -34,12 +41,12 @@ enum cf_operation { CF_OPERATIONS };
 #undef T
 
 struct cf_item;
-struct fastbuf;
-byte *cf_find_item(byte *name, struct cf_item *item);
-byte *cf_write_item(struct cf_item *item, enum cf_operation op, int number, byte **pars);
+char *cf_find_item(const char *name, struct cf_item *item);
+char *cf_write_item(struct cf_item *item, enum cf_operation op, int number, char **pars);
 
 /* Debug dumping: conf-dump.c */
 
+struct fastbuf;
 void cf_dump_sections(struct fastbuf *fb);
 
 /* Journaling control: conf-journal.c */