dmalloc and efence work again (ported from rel-2.1 branch).

[libucw.git] / lib / conf.h

diff --git a/lib/conf.h b/lib/conf.h
index 81c10ce24ae7a2c864ecb17cc2a828fea5522d09..b58224d34bb97ba4afe5d8afa5af6763014d3191 100644 (file)
--- 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;
@@ -61,6 +67,9 @@ 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;
 
@@ -68,3 +77,4 @@ int cf_getopt(int argc,char * const argv[],
                const char *shortopts,const struct option *longopts,
                int *longindex);
 
+#endif