[PATCH] netdev - udevdb+dev.d changes

[elogind.git] / udev.h

diff --git a/udev.h b/udev.h
index 8e35cb708fcd952677025a60c65ac699cf17a96e..8d13fb5bc34178cbeffaefe918d63a2fdecb00d0 100644 (file)
--- a/udev.h
+++ b/udev.h
@@ -20,45 +20,25 @@
  *
  */
 
-#ifndef UDEV_H
-#define UDEV_H
+#ifndef _UDEV_H_
+#define _UDEV_H_
 
-#include "libsysfs/libsysfs.h"
-#include <limits.h>
-
-#ifdef DEBUG
-#include <syslog.h>
-#define dbg(format, arg...)                                                            \
-       do {                                                                            \
-               log_message (LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg);        \
-       } while (0)
-#else
-       #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
+#include <sys/param.h>
+#include "libsysfs/sysfs/libsysfs.h"
 
+#define COMMENT_CHARACTER              '#'
 
-extern int log_message (int level, const char *format, ...)
-       __attribute__ ((format (printf, 2, 3)));
+#define NAME_SIZE                      256
+#define OWNER_SIZE                     30
+#define GROUP_SIZE                     30
+#define MODE_SIZE                      8
 
+#define ACTION_SIZE                    30
+#define DEVPATH_SIZE                   255
+#define SUBSYSTEM_SIZE                 30
 
-/* filenames for the config and database files */
-#define UDEV_DB                                "udev.tdb"
-#define UDEV_CONFIG_PERMISSION_FILE    "udev.permissions"
-#define UDEV_CONFIG_FILE               "udev.config"
-
-#define NAME_SIZE      100
-#define OWNER_SIZE     30
-#define GROUP_SIZE     30
+/* length of public data */
+#define UDEVICE_LEN (offsetof(struct udevice, bus_id))
 
 struct udevice {
        char name[NAME_SIZE];
@@ -67,31 +47,39 @@ struct udevice {
        char type;
        int major;
        int minor;
-       mode_t mode;
-
-       /* fields that help us in building strings */
-       unsigned char bus_id[SYSFS_NAME_LEN];
-       unsigned char callout_value[NAME_SIZE];
-       unsigned char kernel_number[NAME_SIZE];
-
+       unsigned int mode;      /* not mode_t due to conflicting definitions in different libcs */
+       char symlink[NAME_SIZE];
+       int partitions;
+       int config_line;
+       char config_file[NAME_SIZE];
+       long config_uptime;
+
+       /* private data that help us in building strings */
+       char bus_id[SYSFS_NAME_LEN];
+       char program_result[NAME_SIZE];
+       char kernel_number[NAME_SIZE];
+       char kernel_name[NAME_SIZE];
 };
 
-#define strfieldcpy(to, from) \
-do { \
-       to[sizeof(to)-1] = '\0'; \
-       strncpy(to, from, sizeof(to)-1); \
-} while (0)
-
-extern int udev_add_device(char *path, char *subsystem);
+extern int udev_add_device(char *path, char *subsystem, int fake);
 extern int udev_remove_device(char *path, char *subsystem);
+extern void udev_init_config(void);
+extern int parse_get_pair(char **orig_string, char **left, char **right);
+extern void dev_d_send(struct udevice *dev, char *subsystem);
 
 extern char **main_argv;
 extern char **main_envp;
 extern char sysfs_path[SYSFS_PATH_MAX];
-extern char *udev_config_dir;
-extern char *udev_root;
+extern char udev_root[PATH_MAX];
 extern char udev_db_filename[PATH_MAX+NAME_MAX];
-extern char udev_config_permission_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[MODE_SIZE];
+extern char default_owner_str[OWNER_SIZE];
+extern char default_group_str[GROUP_SIZE];
+extern int udev_log;
+extern int udev_sleep;
+extern int udev_dev_d;
 
 #endif