Try to merge recent changes in v3.9 to image branch...

[libucw.git] / lib / conf.h

diff --git a/lib/conf.h b/lib/conf.h
index b58224d34bb97ba4afe5d8afa5af6763014d3191..7b86dc24f4c7a93e4a0e775de68ce4a0a2047828 100644 (file)
--- a/lib/conf.h
+++ b/lib/conf.h
@@ -1,7 +1,11 @@
 /*
- *     Sherlock Library -- Reading configuration files
+ *     UCW Library -- Reading of configuration files
  *
  *     (c) 2001 Robert Spalek <robert@ucw.cz>
+ *     (c) 2003--2005 Martin Mares <mj@ucw.cz>
+ *
+ *     This software may be freely distributed and used according to the terms
+ *     of the GNU Lesser General Public License.
  */
 
 #ifndef        _LIB_CONF_H
@@ -13,8 +17,11 @@
  * Allocation in configuration memory pool.
  */
 
+extern struct mempool *cfpool;
 void *cfg_malloc(uns size);
-byte *cfg_stralloc(byte *s);
+void *cfg_malloc_zero(uns size);
+byte *cfg_strdup(byte *s);
+byte *cfg_printf(char *fmt, ...) FORMAT_CHECK(printf,1,2);
 
 /*
  * Every module places its configuration setting into some section.  Section is
@@ -29,7 +36,7 @@ byte *cfg_stralloc(byte *s);
  * function.
  */
 
-enum cftype { CT_STOP, CT_SECTION, CT_INCOMPLETE_SECTION, CT_INT, CT_STRING, CT_FUNCTION };
+enum cftype { CT_STOP, CT_SECTION, CT_INCOMPLETE_SECTION, CT_INT, CT_STRING, CT_FUNCTION, CT_DOUBLE, CT_U64 };
 
 struct cfitem {
        byte *name;
@@ -50,6 +57,20 @@ struct cfitem *cf_get_item(byte *sect, byte *name);
 byte *cf_set_item(byte *sect, byte *name, byte *value);
 void cf_read(byte *filename);
 
+/*
+ * Number parsing functions which could be useful in CT_FUNCTION callbacks.
+ */
+
+byte *cf_parse_int(byte *value, uns *varp);
+byte *cf_parse_u64(byte *value, u64 *varp);
+byte *cf_parse_double(byte *value, double *varp);
+
+/* 
+ * Some useful parsing functions.
+ */
+
+byte *cf_parse_ip(byte **value, u32 *varp);
+
 /*
  * When using cf_getopt, you must prefix your own short/long options by the
  * CF_(SHORT|LONG)_OPTS.
@@ -67,9 +88,10 @@ 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_TAB ""
 #define        CF_USAGE        \
-"-S, --set sec.item=val\tManual setting of a configuration item\n\
--C, --config filename\tOverwrite default config filename\n"
+"-S, --set sec.item=val\t" CF_USAGE_TAB "Manual setting of a configuration item\n\
+-C, --config filename\t" CF_USAGE_TAB "Overwrite default config filename\n"
 
 extern byte *cfdeffile;