X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fconf2.h;h=0f49ec9ca321990841ad2ea0f1f822cbbde30235;hb=1ab52b1a51cb828a5868bfcca555d6752136fb52;hp=22431f26d2ff96aaa6403fe0e43e54f09e4617c1;hpb=46b57cdfc5b71ce76378f7472e99a0f52fdce08d;p=libucw.git

diff --git a/lib/conf2.h b/lib/conf2.h
index 22431f26..0f49ec9c 100644
--- a/lib/conf2.h
+++ b/lib/conf2.h
@@ -113,7 +113,7 @@ extern uns cf_need_journal;
 void cf_journal_block(void *ptr, uns len);
 
 /* Declaration */
-void cf_declare_section(byte *name, struct cf_section *sec);
+void cf_declare_section(byte *name, struct cf_section *sec, uns allow_unknown);
 void cf_init_section(byte *name, struct cf_section *sec, void *ptr);
 
 /* Safe reloading and loading of configuration files */
@@ -128,4 +128,30 @@ byte *cf_parse_u64(byte *str, u64 *ptr);
 byte *cf_parse_double(byte *str, double *ptr);
 byte *cf_parse_ip(byte *p, u32 *varp);
 
+/*
+ * When using cf_get_opt(), you must prefix your own short/long options by the
+ * CF_(SHORT|LONG)_OPTS.
+ *
+ * cf_def_file contains the name of a configuration file that will be
+ * automatically loaded before the first --set option is executed.  If no --set
+ * option occurs, it will be loaded after getopt() returns -1 (i.e. at the end
+ * of the configuration options).  cf_def_file will be ignored if another
+ * configuration file has already been loaded using the --config option.  The
+ * initial value of cf_def_file is DEFAULT_CONFIG from config.h, but you can
+ * override it manually before calling cf_get_opt().
+ */
+
+#define	CF_SHORT_OPTS	"S:C:"
+#define	CF_LONG_OPTS	{"set",		1, 0, 'S'}, {"config",	1, 0, 'C'},
+#define CF_NO_LONG_OPTS (const struct option []) { CF_LONG_OPTS { NULL, 0, 0, 0 } }
+#ifndef CF_USAGE_TAB
+#define CF_USAGE_TAB ""
+#endif
+#define	CF_USAGE	\
+"-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 configuration file\n"
+
+struct option;
+int cf_get_opt(int argc, char * const argv[], const char *short_opts, const struct option *long_opts, int *long_index);
+
 #endif