X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.h;h=16a212cd2c24282f739fa8fb1546fb35ea21de10;hb=615ba3e82b2e49e06bbf9ad3e6a8ab6f0446ee26;hp=0ce010f3c49071131795f70a0873c02fba3d9428;hpb=831f800da34ddb449aecae925cd1f154f20b1eed;p=elogind.git

diff --git a/udev.h b/udev.h
index 0ce010f3c..16a212cd2 100644
--- a/udev.h
+++ b/udev.h
@@ -20,19 +20,22 @@
  *
  */
 
-#ifndef UDEV_H
-#define UDEV_H
+#ifndef _UDEV_H_
+#define _UDEV_H_
 
-#include <sysfs/libsysfs.h>
-#include <stddef.h>
 #include <sys/param.h>
+#include "libsysfs/sysfs/libsysfs.h"
 
 #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			30
+#define GROUP_SIZE			30
+#define MODE_SIZE			8
+
+#define ACTION_SIZE			30
+#define DEVPATH_SIZE			255
+#define SUBSYSTEM_SIZE			30
 
 /* length of public data */
 #define UDEVICE_LEN (offsetof(struct udevice, bus_id))
@@ -47,6 +50,9 @@ struct udevice {
 	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];
+	time_t config_time;
 
 	/* private data that help us in building strings */
 	char bus_id[SYSFS_NAME_LEN];
@@ -55,30 +61,6 @@ struct udevice {
 	char kernel_name[NAME_SIZE];
 };
 
-#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)
-
 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);