[PATCH] fix klibc with printf() and gcc

[elogind.git] / udev.h

diff --git a/udev.h b/udev.h
index 590a8ed039dc7411f25c66e4bf9948d1fcfd51c4..678731c7d194a0843dfceedf7368b0857262b19f 100644 (file)
--- a/udev.h
+++ b/udev.h
@@ -23,6 +23,8 @@
 #ifndef UDEV_H
 #define UDEV_H
 
+#include "libsysfs/libsysfs.h"
+#include <sys/param.h>
 
 #ifdef DEBUG
 #include <syslog.h>
@@ -34,28 +36,62 @@
        #define dbg(format, arg...) do { } while (0)
 #endif
 
+/* Parser needs it's own debugging statement, we usually don't care about this at all */
+#ifdef DEBUG_PARSER
+#define dbg_parse(format, arg...)                                                      \
+       do {                                                                            \
+               log_message (LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg);        \
+       } while (0)
+#else
+       #define dbg_parse(format, arg...) do { } while (0)
+#endif
 
-/* Lots of constants that should be in a config file sometime */
-
-/* Where udev should create its device nodes, trailing / needed */
-#define UDEV_ROOT      "/udev/"
 
 extern int log_message (int level, const char *format, ...)
        __attribute__ ((format (printf, 2, 3)));
 
+#define COMMENT_CHARACTER              '#'
+
 #define NAME_SIZE      100
 #define OWNER_SIZE     30
 #define GROUP_SIZE     30
 
-struct device_attr {
+struct udevice {
        char name[NAME_SIZE];
        char owner[OWNER_SIZE];
        char group[GROUP_SIZE];
-       int mode;
+       char type;
+       int major;
+       int minor;
+       mode_t mode;
+       char symlink[NAME_SIZE];
+
+       /* fields that help us in building strings */
+       unsigned char bus_id[SYSFS_NAME_LEN];
+       unsigned char program_result[NAME_SIZE];
+       unsigned char kernel_number[NAME_SIZE];
+       unsigned char kernel_name[NAME_SIZE];
+
 };
 
-extern int udev_add_device(char *device, char *subsystem);
-extern int udev_remove_device(char *device, char *subsystem);
+#define strfieldcpy(to, from) \
+do { \
+       to[sizeof(to)-1] = '\0'; \
+       strncpy(to, from, sizeof(to)-1); \
+} while (0)
 
-#endif
+extern int udev_add_device(char *path, char *subsystem);
+extern int udev_remove_device(char *path, char *subsystem);
+extern void udev_init_config(void);
+
+extern char **main_argv;
+extern char **main_envp;
+extern char sysfs_path[SYSFS_PATH_MAX];
+extern char udev_root[PATH_MAX];
+extern char udev_db_filename[PATH_MAX+NAME_MAX];
+extern char udev_permissions_filename[PATH_MAX+NAME_MAX];
+extern char udev_config_filename[PATH_MAX+NAME_MAX];
+extern char udev_rules_filename[PATH_MAX+NAME_MAX];
+extern char default_mode_str[NAME_MAX];
 
+#endif