chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Trivial man page typo fixes to udev
[elogind.git]
/
namedev.h
diff --git
a/namedev.h
b/namedev.h
index ffdde83ca4843058d08f3f7b172b360a4426944e..68100d4f62e81271aeb0234d5cac10c990221e85 100644
(file)
--- a/
namedev.h
+++ b/
namedev.h
@@
-44,16
+44,26
@@
struct sysfs_class_device;
#define FIELD_KERNEL "KERNEL"
#define FIELD_NAME "NAME"
#define FIELD_SYMLINK "SYMLINK"
#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 ATTR_PARTITIONS "all_partitions"
#define PARTITIONS_COUNT 15
-#define PROGRAM_MAXARG 10
#define MAX_SYSFS_PAIRS 5
#define RULEFILE_EXT ".rules"
#define PERMFILE_EXT ".permissions"
#define MAX_SYSFS_PAIRS 5
#define RULEFILE_EXT ".rules"
#define PERMFILE_EXT ".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];
char value[VALUE_SIZE];
struct sysfs_pair {
char file[FILE_SIZE];
char value[VALUE_SIZE];
@@
-71,7
+81,11
@@
struct config_device {
char name[NAME_SIZE];
char symlink[NAME_SIZE];
struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
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;
int partitions;
+ char config_file[NAME_SIZE];
int config_line;
};
int config_line;
};
@@
-92,7
+106,6
@@
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 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_config_dev(struct config_device *dev);
extern void dump_config_dev_list(void);
extern void dump_perm_dev(struct perm_device *dev);