[PATCH] udev - safer string handling - part two

[elogind.git] / udev.h

diff --git a/udev.h b/udev.h
index e5c983a212c1eb84c6ef6c3e778c29e1dc44bc1b..0ce010f3c49071131795f70a0873c02fba3d9428 100644 (file)
--- a/udev.h
+++ b/udev.h
@@ -23,7 +23,8 @@
 #ifndef UDEV_H
 #define UDEV_H
 
-#include "libsysfs/libsysfs.h"
+#include <sysfs/libsysfs.h>
+#include <stddef.h>
 #include <sys/param.h>
 
 #define COMMENT_CHARACTER              '#'
@@ -33,6 +34,9 @@
 #define GROUP_SIZE     30
 #define MODE_SIZE      8
 
+/* length of public data */
+#define UDEVICE_LEN (offsetof(struct udevice, bus_id))
+
 struct udevice {
        char name[NAME_SIZE];
        char owner[OWNER_SIZE];
@@ -40,14 +44,15 @@ struct udevice {
        char type;
        int major;
        int minor;
-       mode_t mode;
+       unsigned int mode;      /* not mode_t due to conflicting definitions in different libcs */
        char symlink[NAME_SIZE];
+       int partitions;
 
-       /* 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];
+       /* 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) \
@@ -56,9 +61,28 @@ do { \
        strncpy(to, from, sizeof(to)-1); \
 } while (0)
 
-extern int udev_add_device(char *path, char *subsystem);
+#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)
+
+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 char **main_argv;
 extern char **main_envp;
@@ -71,5 +95,7 @@ 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;
 
 #endif