enum cf_type {
CT_INT, CT_U64, CT_DOUBLE, // number types
+ CT_IP, // IP address
CT_STRING // string type
};
cf_hook *init; // fills in default values (otherwise 0's are used)
cf_hook *commit; // verifies parsed data (optional)
struct cf_item *cfg; // CC_END-terminated array of items
+ uns flags; // for internal use only
};
/* Declaration of cf_section */
#define CF_INT(n,p) CF_STATIC(n,p,INT,int,1)
#define CF_INT_ARY(n,p,c) CF_STATIC(n,p,INT,int,c)
#define CF_INT_DYN(n,p,c) CF_DYNAMIC(n,p,INT,int,c)
+#define CF_UNS(n,p) CF_STATIC(n,p,INT,uns,1)
+#define CF_UNS_ARY(n,p,c) CF_STATIC(n,p,INT,uns,c)
+#define CF_UNS_DYN(n,p,c) CF_DYNAMIC(n,p,INT,uns,c)
#define CF_U64(n,p) CF_STATIC(n,p,U64,u64,1)
#define CF_U64_ARY(n,p,c) CF_STATIC(n,p,U64,u64,c)
#define CF_U64_DYN(n,p,c) CF_DYNAMIC(n,p,U64,u64,c)
#define CF_DOUBLE(n,p) CF_STATIC(n,p,DOUBLE,double,1)
#define CF_DOUBLE_ARY(n,p,c) CF_STATIC(n,p,DOUBLE,double,c)
#define CF_DOUBLE_DYN(n,p,c) CF_DYNAMIC(n,p,DOUBLE,double,c)
+#define CF_IP(n,p) CF_STATIC(n,p,IP,u32,1)
+#define CF_IP_ARY(n,p,c) CF_STATIC(n,p,IP,u32,c)
+#define CF_IP_DYN(n,p,c) CF_DYNAMIC(n,p,IP,u32,c)
#define CF_STRING(n,p) CF_STATIC(n,p,STRING,byte*,1)
#define CF_STRING_ARY(n,p,c) CF_STATIC(n,p,STRING,byte*,c)
#define CF_STRING_DYN(n,p,c) CF_DYNAMIC(n,p,STRING,byte*,c)
void *cf_malloc(uns size);
void *cf_malloc_zero(uns size);
byte *cf_strdup(byte *s);
-byte *cf_printf(char *fmt, ...);
+byte *cf_printf(char *fmt, ...) FORMAT_CHECK(printf,1,2);
/* Undo journal for error recovery */
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 */
extern byte *cf_def_file;
-byte *cf_reload(byte *file);
-byte *cf_load(byte *file);
-byte *cf_set(byte *string);
+int cf_reload(byte *file);
+int cf_load(byte *file);
+int cf_set(byte *string);
/* Parsers for basic types */
-byte *cf_parse_int(uns number, byte **pars, int *ptr);
-byte *cf_parse_u64(uns number, byte **pars, u64 *ptr);
-byte *cf_parse_double(uns number, byte **pars, double *ptr);
+byte *cf_parse_int(byte *str, int *ptr);
+byte *cf_parse_u64(byte *str, u64 *ptr);
+byte *cf_parse_double(byte *str, double *ptr);
+byte *cf_parse_ip(byte *p, u32 *varp);
+
+/* Direct access to configuration items */
+
+#define CF_OPERATIONS T(CLOSE) T(SET) T(CLEAR) T(APPEND) T(PREPEND) \
+ T(REMOVE) T(EDIT) T(AFTER) T(BEFORE)
+ /* Closing brace finishes previous block.
+ * Basic attributes (static, dynamic, parsed) can be used with SET.
+ * Dynamic arrays can be used with SET, APPEND, PREPEND.
+ * Sections can be used with SET.
+ * Lists can be used with everything. */
+#define T(x) OP_##x,
+enum operation { CF_OPERATIONS };
+#undef T
+
+byte *cf_find_item(byte *name, struct cf_item *item);
+byte *cf_write_item(struct cf_item *item, enum operation op, int number, byte **pars);
+
+/*
+ * 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