Sorter: Ah, fixed wrong include of time.h.

[libucw.git] / ucw / getopt.h

diff --git a/ucw/getopt.h b/ucw/getopt.h
index c9daf24d4820a2f080875fa1045c027086e8b4e5..6263d47fb6df6acd8e19968216cab5cd9614efbf 100644 (file)
--- a/ucw/getopt.h
+++ b/ucw/getopt.h
@@ -11,8 +11,8 @@
 #ifndef        _UCW_GETOPT_H
 #define        _UCW_GETOPT_H
 
 #ifndef        _UCW_GETOPT_H
 #define        _UCW_GETOPT_H
 

-#ifdef CONFIG_OWN_GETOPT
-#include "ucw/getopt/getopt-sh.h"
+#ifdef CONFIG_UCW_OWN_GETOPT
+#include <ucw/getopt/getopt-sh.h>

 #else
 #include <getopt.h>
 #endif
 #else
 #include <getopt.h>
 #endif


@@ -28,13 +28,13 @@ void reset_getopt(void);    /** If you want to start parsing of the arguments from
  */
 
 /**
  */
 
 /**

- * The default config (DEFAULT_CONFIG config option) or NULL if already loaded.
+ * The default config (as set by `CONFIG_UCW_DEFAULT_CONFIG`) or NULL if already loaded.

  * You can set it to something else manually.
  */
 extern char *cf_def_file;
 /**
  * You can set it to something else manually.
  */
 extern char *cf_def_file;
 /**

- * Name of environment variable that can override what configuration
- * is loaded.
+ * Name of environment variable that can override what configuration is loaded.
+ * Defaults to `CONFIG_UCW_ENV_VAR_CONFIG`.

  **/
 extern char *cf_env_file;
 int cf_reload(const char *file);       /** Reload configuration from @file, replace the old one. **/
  **/
 extern char *cf_env_file;
 int cf_reload(const char *file);       /** Reload configuration from @file, replace the old one. **/


@@ -63,7 +63,7 @@ int cf_set(const char *string);
  * described in <<config:operations,configuration syntax>>.
  **/
 #define CF_OPERATIONS T(CLOSE) T(SET) T(CLEAR) T(ALL) \
  * described in <<config:operations,configuration syntax>>.
  **/
 #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)
+  T(APPEND) T(PREPEND) T(REMOVE) T(EDIT) T(AFTER) T(BEFORE) T(COPY) T(RESET)

   /* Closing brace finishes previous block.
    * Basic attributes (static, dynamic, parsed) can be used with SET.
    * Dynamic arrays can be used with SET, APPEND, PREPEND.
   /* Closing brace finishes previous block.
    * Basic attributes (static, dynamic, parsed) can be used with SET.
    * Dynamic arrays can be used with SET, APPEND, PREPEND.


@@ -167,7 +167,7 @@ void cf_journal_rollback_transaction(uns new_pool, struct cf_journal_item *oldj)
 "-C, --config filename\t" CF_USAGE_TAB "Override the default configuration file\n\
 -S, --set sec.item=val\t" CF_USAGE_TAB "Manual setting of a configuration item\n" CF_USAGE_DEBUG
 
 "-C, --config filename\t" CF_USAGE_TAB "Override the default configuration file\n\
 -S, --set sec.item=val\t" CF_USAGE_TAB "Manual setting of a configuration item\n" CF_USAGE_DEBUG
 

-#ifdef CONFIG_DEBUG
+#ifdef CONFIG_UCW_DEBUG

 #define CF_LONG_OPTS_DEBUG { "dumpconfig", 0, 0, 0x64436667 } ,
 #define CF_USAGE_DEBUG "    --dumpconfig\t" CF_USAGE_TAB "Dump program configuration\n"
 #else
 #define CF_LONG_OPTS_DEBUG { "dumpconfig", 0, 0, 0x64436667 } ,
 #define CF_USAGE_DEBUG "    --dumpconfig\t" CF_USAGE_TAB "Dump program configuration\n"
 #else