date: accept 'yyyy-mm-dd HH' and 'yyyy-mm-dd' date formats

[oweals/busybox.git] / modutils / modutils.h

diff --git a/modutils/modutils.h b/modutils/modutils.h
index 086bb3977fd5c3c930e87c7f93b04706da13dac6..5f059c716d8933d2f1cb1f31bc4d53d9ec5e3355 100644 (file)
--- a/modutils/modutils.h
+++ b/modutils/modutils.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2008 by Timo Teras <timo.teras@iki.fi>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #ifndef MODUTILS_H
@@ -17,44 +17,54 @@ PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
  * internally for the maximum alias name length, which can be quite long */
 #define MODULE_NAME_LEN 256
 
-const char *moderror(int err) FAST_FUNC;
-llist_t *llist_find(llist_t *first, const char *str) FAST_FUNC;
 void replace(char *s, char what, char with) FAST_FUNC;
 char *replace_underscores(char *s) FAST_FUNC;
 int string_to_llist(char *string, llist_t **llist, const char *delim) FAST_FUNC;
 char *filename2modname(const char *filename, char *modname) FAST_FUNC;
-char *parse_cmdline_module_options(char **argv) FAST_FUNC;
+char *parse_cmdline_module_options(char **argv, int quote_spaces) FAST_FUNC;
 
+/* insmod for 2.4 and modprobe's options (insmod 2.6 has no options at all): */
 #define INSMOD_OPTS \
-       "vq" \
-       USE_FEATURE_2_4_MODULES("sLo:fkx") \
-       USE_FEATURE_INSMOD_LOAD_MAP("m")
-
-#define INSMOD_ARGS USE_FEATURE_2_4_MODULES(, NULL)
+       "vqs" \
+       IF_FEATURE_2_4_MODULES("Lfkx" IF_FEATURE_INSMOD_LOAD_MAP("m"))
+#define INSMOD_ARGS /* (was meant to support -o NAME) , NULL */
 
 enum {
-       INSMOD_OPT_VERBOSE      = 0x0001,
-       INSMOD_OPT_SILENT       = 0x0002,
-       INSMOD_OPT_SYSLOG       = 0x0004 * ENABLE_FEATURE_2_4_MODULES,
-       INSMOD_OPT_LOCK         = 0x0008 * ENABLE_FEATURE_2_4_MODULES,
-       INSMOD_OPT_OUTPUTNAME   = 0x0010 * ENABLE_FEATURE_2_4_MODULES,
-       INSMOD_OPT_FORCE        = 0x0020 * ENABLE_FEATURE_2_4_MODULES,
-       INSMOD_OPT_KERNELD      = 0x0040 * ENABLE_FEATURE_2_4_MODULES,
-       INSMOD_OPT_NO_EXPORT    = 0x0080 * ENABLE_FEATURE_2_4_MODULES,
-       INSMOD_OPT_PRINT_MAP    = 0x0100 * ENABLE_FEATURE_INSMOD_LOAD_MAP,
-#if ENABLE_FEATURE_2_4_MODULES
-# if ENABLE_FEATURE_INSMOD_LOAD_MAP
-       INSMOD_OPT_UNUSED       = 0x0200,
-# else
-       INSMOD_OPT_UNUSED       = 0x0100,
-# endif
+       INSMOD_OPT_VERBOSE      = (1 << 0),
+       INSMOD_OPT_SILENT       = (1 << 1),
+       INSMOD_OPT_SYSLOG       = (1 << 2),
+       //INSMOD_OPT_OUTPUTNAME = (1 << x) - not supported yet
+       INSMOD_OPT_LOCK         = (1 << 3) * ENABLE_FEATURE_2_4_MODULES,
+       INSMOD_OPT_FORCE        = (1 << 4) * ENABLE_FEATURE_2_4_MODULES,
+       INSMOD_OPT_KERNELD      = (1 << 5) * ENABLE_FEATURE_2_4_MODULES,
+       INSMOD_OPT_NO_EXPORT    = (1 << 6) * ENABLE_FEATURE_2_4_MODULES,
+       INSMOD_OPT_PRINT_MAP    = (1 << 7) * ENABLE_FEATURE_INSMOD_LOAD_MAP,
+       INSMOD_OPT_UNUSED       =
+               (INSMOD_OPT_PRINT_MAP ? INSMOD_OPT_PRINT_MAP
+               : INSMOD_OPT_NO_EXPORT ? INSMOD_OPT_NO_EXPORT
+               : INSMOD_OPT_SYSLOG
+               ) << 1
+};
+
+#if ENABLE_FEATURE_INSMOD_TRY_MMAP
+void* FAST_FUNC try_to_mmap_module(const char *filename, size_t *image_size_p);
 #else
-       INSMOD_OPT_UNUSED       = 0x0004,
+# define try_to_mmap_module(filename, image_size) NULL
 #endif
-};
 
+/* Return:
+ * 0 on success,
+ * -errno on open/read error,
+ * errno on init_module() error
+ */
 int FAST_FUNC bb_init_module(const char *module, const char *options);
+/* Return:
+ * 0 on success,
+ * errno on init_module() error
+ */
 int FAST_FUNC bb_delete_module(const char *module, unsigned int flags);
+/* Translates error return to a string */
+const char *moderror(int err) FAST_FUNC;
 
 #if ENABLE_FEATURE_2_4_MODULES
 int FAST_FUNC bb_init_module_24(const char *module, const char *options);