[PATCH] add dumb test for all of the different modifiers.

[elogind.git] / udev.h

diff --git a/udev.h b/udev.h
index 4c8914f1e2b4727d32d7976d743f94b6609f76bd..904948d67ac92d7df4fa80e27ae7eea6e44fb64d 100644 (file)
--- a/udev.h
+++ b/udev.h
@@ -52,21 +52,14 @@ extern int log_message (int level, const char *format, ...)
 
 
 /* filenames for the config and database files */
-#define UDEV_DB                                "udevdb.tdb"
-#define NAMEDEV_CONFIG_PERMISSION_FILE "namedev.permissions"
-#define NAMEDEV_CONFIG_FILE            "namedev.config"
+#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
 
-struct device_attr {
-       char name[NAME_SIZE];
-       char owner[OWNER_SIZE];
-       char group[GROUP_SIZE];
-       mode_t mode;
-};
-
 struct udevice {
        char name[NAME_SIZE];
        char owner[OWNER_SIZE];
@@ -77,6 +70,12 @@ struct udevice {
        mode_t mode;
 };
 
+#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_remove_device(char *path, char *subsystem);