X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fconf.h;h=b58224d34bb97ba4afe5d8afa5af6763014d3191;hb=34289767d57bb8845699c819362d286bd51c8952;hp=0e08ac84fbc2e022ff0bf605ea1b45c969b67998;hpb=05945b74fb145f8eb22312cbd52fa9e5c660e5b6;p=libucw.git

diff --git a/lib/conf.h b/lib/conf.h
index 0e08ac84..b58224d3 100644
--- a/lib/conf.h
+++ b/lib/conf.h
@@ -4,6 +4,9 @@
  *	(c) 2001 Robert Spalek <robert@ucw.cz>
  */
 
+#ifndef	_LIB_CONF_H
+#define	_LIB_CONF_H
+
 #include <getopt.h>
 
 /*
@@ -19,11 +22,14 @@ byte *cfg_stralloc(byte *s);
  * the name of the section.  The configuration sections are registered by
  * calling cf_register().
  *
+ * CT_INCOMPLETE_SECTION is identical to CT_SECTION, but when an unknown variable
+ * is spotted, we ignore it instead of bailing out with an error message.
+ *
  * item->var is a pointer to the destination variable or to the special parsing
  * function.
  */
 
-enum cftype { CT_STOP, CT_SECTION, CT_INT, CT_STRING, CT_FUNCTION };
+enum cftype { CT_STOP, CT_SECTION, CT_INCOMPLETE_SECTION, CT_INT, CT_STRING, CT_FUNCTION };
 
 struct cfitem {
 	byte *name;
@@ -48,9 +54,12 @@ void cf_read(byte *filename);
  * When using cf_getopt, you must prefix your own short/long options by the
  * CF_(SHORT|LONG)_OPTS.
  *
- * If you want to automatically load default config file before first option is
- * overriden, register it by cf_default_init and call cf_default_done after
- * parsing is done.  It will not be loaded if another config file is specified.
+ * cfdeffile contains filename of config file automatically loaded before a
+ * first --set option is executed.  If none --set option occures, it will be
+ * loaded after getopt returns -1 (at the end of configuration options).  It
+ * will be ignored, if another config file is set by --config option at first.
+ * Its initial value is DEFAULT_CONFIG from config.h, but you can override it
+ * manually.
  */
 
 #define	CF_SHORT_OPTS	"S:C:"
@@ -58,10 +67,14 @@ void cf_read(byte *filename);
 	{"set",		1, 0, 'S'},\
 	{"config",	1, 0, 'C'},
 #define CF_NO_LONG_OPTS (const struct option []){ CF_LONG_OPTS { NULL, 0, 0, 0 } }
+#define	CF_USAGE	\
+"-S, --set sec.item=val\tManual setting of a configuration item\n\
+-C, --config filename\tOverwrite default config filename\n"
+
+extern byte *cfdeffile;
 
-void cf_default_init(byte *filename);
-void cf_default_done(void);
 int cf_getopt(int argc,char * const argv[],
 		const char *shortopts,const struct option *longopts,
 		int *longindex);
 
+#endif