[PATCH] make the udev object available to more processing stages

[elogind.git] / udev.h

diff --git a/udev.h b/udev.h
index 32fda379e54e467965bce37735580ab2540c6f92..d031b9699c99f6beac79fe897d3924a634a02518 100644 (file)
--- a/udev.h
+++ b/udev.h
@@ -20,138 +20,62 @@
  *
  */
 
-#ifndef UDEV_H
-#define UDEV_H
+#ifndef _UDEV_H_
+#define _UDEV_H_
 
-#include <stdlib.h>
-#include <string.h>
-#include <sysfs/libsysfs.h>
-#include <stddef.h>
 #include <sys/param.h>
+#include "libsysfs/sysfs/libsysfs.h"
 
+#define ALARM_TIMEOUT                  120
 #define COMMENT_CHARACTER              '#'
 
-#define NAME_SIZE      100
-#define OWNER_SIZE     30
-#define GROUP_SIZE     30
-#define MODE_SIZE      8
+#define NAME_SIZE                      256
+#define OWNER_SIZE                     32
+#define GROUP_SIZE                     32
+#define MODE_SIZE                      8
 
-#define ACTION_SIZE    30
-#define DEVPATH_SIZE   255
-#define SUBSYSTEM_SIZE 30
+#define ACTION_SIZE                    32
+#define DEVPATH_SIZE                   256
+#define SUBSYSTEM_SIZE                 32
+#define SEQNUM_SIZE                    32
 
-/* length of public data */
-#define UDEVICE_LEN (offsetof(struct udevice, bus_id))
+#define LINE_SIZE                      256
 
 struct udevice {
+       char devpath[DEVPATH_SIZE];
+       char subsystem[SUBSYSTEM_SIZE];
+       char action[ACTION_SIZE];
        char name[NAME_SIZE];
        char owner[OWNER_SIZE];
        char group[GROUP_SIZE];
        char type;
        int major;
        int minor;
-       unsigned int mode;      /* not mode_t due to conflicting definitions in different libcs */
+       mode_t mode;
        char symlink[NAME_SIZE];
        int partitions;
-
-       /* private data that help us in building strings */
+       int config_line;
+       char config_file[NAME_SIZE];
+       long config_uptime;
        char bus_id[SYSFS_NAME_LEN];
+       char bus[SYSFS_NAME_LEN];
        char program_result[NAME_SIZE];
        char kernel_number[NAME_SIZE];
        char kernel_name[NAME_SIZE];
+       char devname[NAME_SIZE];
+       int test_run;
 };
 
-#define strfieldcpy(to, from) \
-do { \
-       to[sizeof(to)-1] = '\0'; \
-       strncpy(to, from, sizeof(to)-1); \
-} while (0)
-
-#define strfieldcat(to, from) \
-do { \
-       to[sizeof(to)-1] = '\0'; \
-       strncat(to, from, sizeof(to) - strlen(to)-1); \
-} while (0)
-
-#define strnfieldcpy(to, from, maxsize) \
-do { \
-       to[maxsize-1] = '\0'; \
-       strncpy(to, from, maxsize-1); \
-} while (0)
-
-#define strnfieldcat(to, from, maxsize) \
-do { \
-       to[maxsize-1] = '\0'; \
-       strncat(to, from, maxsize - strlen(to)-1); \
-} while (0)
-
-#define strintcat(to, i) \
-do { \
-       to[sizeof(to)-1] = '\0'; \
-       snprintf((to) + strlen(to), sizeof(to) - strlen(to)-1, "%u", i); \
-} while (0)
-
-#define strnintcat(to, i, maxsize) \
-do { \
-       to[maxsize-1] = '\0'; \
-       snprintf((to) + strlen(to), maxsize - strlen(to)-1, "%u", i); \
-} while (0)
-
-#define foreach_strpart(str, separator, pos, len) \
-       for(pos = str, len = 0; \
-           (pos) < ((str) + strlen(str)); \
-           pos = pos + len + strspn(pos, separator), len = strcspn(pos, separator)) \
-               if (len > 0)
-
-static inline char *get_action(void)
-{
-       char *action;
-
-       action = getenv("ACTION");
-       if (action != NULL && strlen(action) > ACTION_SIZE)
-               action[ACTION_SIZE-1] = '\0';
-
-       return action;
-}
-
-static inline char *get_devpath(void)
-{
-       char *devpath;
-
-       devpath = getenv("DEVPATH");
-       if (devpath != NULL && strlen(devpath) > DEVPATH_SIZE)
-               devpath[DEVPATH_SIZE-1] = '\0';
-
-       return devpath;
-}
-
-static inline char *get_seqnum(void)
-{
-       char *seqnum;
-
-       seqnum = getenv("SEQNUM");
-
-       return seqnum;
-}
-
-static inline char *get_subsystem(char *subsystem)
-{
-       if (subsystem != NULL && strlen(subsystem) > SUBSYSTEM_SIZE)
-               subsystem[SUBSYSTEM_SIZE-1] = '\0';
-
-       return subsystem;
-}
-
-extern int udev_add_device(char *path, char *subsystem, int fake);
-extern int udev_remove_device(char *path, char *subsystem);
+extern int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev);
+extern int udev_remove_device(struct udevice *udev);
 extern void udev_init_config(void);
+extern int udev_start(void);
 extern int parse_get_pair(char **orig_string, char **left, char **right);
+extern void dev_d_execute(struct udevice *udev);
 
-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_db_path[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];
@@ -159,6 +83,6 @@ 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