hashtables: fixed combination of HASH_GIVE_ALLOC and HASH_TABLE_ALLOC

[libucw.git] / lib / getopt.h

diff --git a/lib/getopt.h b/lib/getopt.h
index 7aaa99fabdb320ad60391a7cd10f52fabe775b09..6f29af8a182607990bf41d59275a074d7fdcf2b4 100644 (file)
--- a/lib/getopt.h
+++ b/lib/getopt.h
@@ -11,7 +11,13 @@
 #ifndef        _UCW_GETOPT_H
 #define        _UCW_GETOPT_H
 
+#ifdef CONFIG_OWN_GETOPT
+#include "lib/getopt/getopt-sh.h"
+#else
 #include <getopt.h>
+#endif
+
+void reset_getopt(void);
 
 /* Safe loading and reloading of configuration files: conf-input.c */
 
@@ -22,8 +28,8 @@ int cf_set(byte *string);
 
 /* Direct access to configuration items: conf-intr.c */
 
-#define CF_OPERATIONS T(CLOSE) T(SET) T(CLEAR) T(APPEND) T(PREPEND) \
-  T(REMOVE) T(EDIT) T(AFTER) T(BEFORE) T(COPY)
+#define CF_OPERATIONS T(CLOSE) T(SET) T(CLEAR) T(ALL) \
+  T(APPEND) T(PREPEND) T(REMOVE) T(EDIT) T(AFTER) T(BEFORE) T(COPY)
   /* Closing brace finishes previous block.
    * Basic attributes (static, dynamic, parsed) can be used with SET.
    * Dynamic arrays can be used with SET, APPEND, PREPEND.
@@ -34,12 +40,12 @@ enum cf_operation { CF_OPERATIONS };
 #undef T
 
 struct cf_item;
-struct fastbuf;
 byte *cf_find_item(byte *name, struct cf_item *item);
 byte *cf_write_item(struct cf_item *item, enum cf_operation op, int number, byte **pars);
 
 /* Debug dumping: conf-dump.c */
 
+struct fastbuf;
 void cf_dump_sections(struct fastbuf *fb);
 
 /* Journaling control: conf-journal.c */