[PATCH] add install and uninstall the etc/dev.d/net/hotplug.dev file to the Makefile

[elogind.git] / namedev.h

diff --git a/namedev.h b/namedev.h
index f5b63a8805ee728986dcf609eb203beafaf5e06d..fa924b14d96dd12e4076a0ddb8e518d6c863d5e8 100644 (file)
--- a/namedev.h
+++ b/namedev.h
@@ -3,7 +3,7 @@
  *
  * Userspace devfs
  *
- * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
  *
  *     This program is free software; you can redistribute it and/or modify it
  *     under the terms of the GNU General Public License as published by the
@@ -28,25 +28,41 @@
 
 struct sysfs_class_device;
 
-#define BUS_SIZE       30
-#define FILE_SIZE      50
-#define VALUE_SIZE     100
-#define ID_SIZE                50
-#define PLACE_SIZE     50
-#define PROGRAM_SIZE   100
-
-#define FIELD_BUS      "BUS"
-#define FIELD_SYSFS    "SYSFS_"
-#define FIELD_ID       "ID"
-#define FIELD_PLACE    "PLACE"
-#define FIELD_PROGRAM  "PROGRAM"
-#define FIELD_RESULT   "RESULT"
-#define FIELD_KERNEL   "KERNEL"
-#define FIELD_NAME     "NAME"
-#define FIELD_SYMLINK  "SYMLINK"
-
-#define PROGRAM_MAXARG 10
-#define MAX_SYSFS_PAIRS        5
+#define BUS_SIZE               30
+#define FILE_SIZE              50
+#define VALUE_SIZE             100
+#define ID_SIZE                        50
+#define PLACE_SIZE             50
+#define PROGRAM_SIZE           100
+
+#define FIELD_BUS              "BUS"
+#define FIELD_SYSFS            "SYSFS"
+#define FIELD_ID               "ID"
+#define FIELD_PLACE            "PLACE"
+#define FIELD_PROGRAM          "PROGRAM"
+#define FIELD_RESULT           "RESULT"
+#define FIELD_KERNEL           "KERNEL"
+#define FIELD_NAME             "NAME"
+#define FIELD_SYMLINK          "SYMLINK"
+#define FIELD_OWNER            "OWNER"
+#define FIELD_GROUP            "GROUP"
+#define FIELD_MODE             "MODE"
+
+#define ATTR_PARTITIONS                "all_partitions"
+#define PARTITIONS_COUNT       15
+
+#define MAX_SYSFS_PAIRS                5
+
+#define RULEFILE_SUFFIX                ".rules"
+#define PERMFILE_SUFFIX                ".permissions"
+
+#define set_empty_perms(dev, m, o, g)          \
+       if (dev->mode == 0)                     \
+               dev->mode = m;                  \
+       if (dev->owner[0] == '\0')              \
+               strfieldcpy(dev->owner, o);     \
+       if (dev->group[0] == '\0')              \
+               strfieldcpy(dev->group, g);
 
 struct sysfs_pair {
        char file[FILE_SIZE];
@@ -65,6 +81,12 @@ struct config_device {
        char name[NAME_SIZE];
        char symlink[NAME_SIZE];
        struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
+       char owner[OWNER_SIZE];
+       char group[GROUP_SIZE];
+       unsigned int mode;
+       int partitions;
+       char config_file[NAME_SIZE];
+       int config_line;
 };
 
 struct perm_device {
@@ -73,7 +95,7 @@ struct perm_device {
        char name[NAME_SIZE];
        char owner[OWNER_SIZE];
        char group[GROUP_SIZE];
-       mode_t mode;
+       unsigned int mode;
 };
 
 extern struct list_head config_device_list;
@@ -84,12 +106,9 @@ extern int namedev_name_device(struct sysfs_class_device *class_dev, struct udev
 extern int namedev_init_permissions(void);
 extern int namedev_init_rules(void);
 
-extern int add_perm_dev(struct perm_device *new_dev);
 extern void dump_config_dev(struct config_device *dev);
 extern void dump_config_dev_list(void);
 extern void dump_perm_dev(struct perm_device *dev);
 extern void dump_perm_dev_list(void);
 
-extern int get_pair(char **orig_string, char **left, char **right);
-
 #endif