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] udev_volume_id: remove temporary node creation and parent handling
[elogind.git]
/
udev.h
diff --git
a/udev.h
b/udev.h
index ace843f0ad2f33166fe565da84129ff3a0d077e1..c2f9859c5a38141607f13e3cfc9cfb6c5669171f 100644
(file)
--- a/
udev.h
+++ b/
udev.h
@@
-23,6
+23,7
@@
#ifndef _UDEV_H_
#define _UDEV_H_
#ifndef _UDEV_H_
#define _UDEV_H_
+#include <sys/types.h>
#include <sys/param.h>
#include "libsysfs/sysfs/libsysfs.h"
#include <sys/param.h>
#include "libsysfs/sysfs/libsysfs.h"
@@
-30,16
+31,14
@@
#define COMMENT_CHARACTER '#'
#define NAME_SIZE 256
#define COMMENT_CHARACTER '#'
#define NAME_SIZE 256
-#define OWNER_SIZE 32
-#define GROUP_SIZE 32
-#define MODE_SIZE 8
+#define USER_SIZE 32
#define ACTION_SIZE 32
#define DEVPATH_SIZE 256
#define SUBSYSTEM_SIZE 32
#define SEQNUM_SIZE 32
#define ACTION_SIZE 32
#define DEVPATH_SIZE 256
#define SUBSYSTEM_SIZE 32
#define SEQNUM_SIZE 32
-#define LINE_SIZE
256
+#define LINE_SIZE
512
#define DEVD_DIR "/etc/dev.d"
#define DEVD_SUFFIX ".dev"
#define DEVD_DIR "/etc/dev.d"
#define DEVD_SUFFIX ".dev"
@@
-47,29
+46,31
@@
#define HOTPLUGD_DIR "/etc/hotplug.d"
#define HOTPLUG_SUFFIX ".hotplug"
#define HOTPLUGD_DIR "/etc/hotplug.d"
#define HOTPLUG_SUFFIX ".hotplug"
+#define DEFAULT_PARTITIONS_COUNT 15
+
struct udevice {
char devpath[DEVPATH_SIZE];
char subsystem[SUBSYSTEM_SIZE];
struct udevice {
char devpath[DEVPATH_SIZE];
char subsystem[SUBSYSTEM_SIZE];
- char action[ACTION_SIZE];
+
char name[NAME_SIZE];
char name[NAME_SIZE];
- char owner[OWNER_SIZE];
- char group[GROUP_SIZE];
+ char symlink[NAME_SIZE];
+ char owner[USER_SIZE];
+ char group[USER_SIZE];
+ mode_t mode;
char type;
int major;
int minor;
char type;
int major;
int minor;
- mode_t mode;
- char symlink[NAME_SIZE];
+
+ char devname[NAME_SIZE];
+ char tmp_node[NAME_SIZE];
int partitions;
int ignore_remove;
int config_line;
char config_file[NAME_SIZE];
int partitions;
int ignore_remove;
int config_line;
char config_file[NAME_SIZE];
- long config_uptime;
char bus_id[SYSFS_NAME_LEN];
char bus_id[SYSFS_NAME_LEN];
- char bus[SYSFS_NAME_LEN];
char program_result[NAME_SIZE];
char kernel_number[NAME_SIZE];
char kernel_name[NAME_SIZE];
char program_result[NAME_SIZE];
char kernel_number[NAME_SIZE];
char kernel_name[NAME_SIZE];
- char devname[NAME_SIZE];
int test_run;
};
int test_run;
};
@@
-77,18
+78,14
@@
extern int udev_add_device(struct udevice *udev, struct sysfs_class_device *clas
extern int udev_remove_device(struct udevice *udev);
extern void udev_init_config(void);
extern int udev_start(void);
extern int udev_remove_device(struct udevice *udev);
extern void udev_init_config(void);
extern int udev_start(void);
-extern int parse_get_pair(char **orig_string, char **left, char **right);
extern void udev_multiplex_directory(struct udevice *udev, const char *basedir, const char *suffix);
extern void udev_multiplex_directory(struct udevice *udev, const char *basedir, const char *suffix);
+extern int udev_make_node(struct udevice *udev, const char *file, int major, int minor, mode_t mode, uid_t uid, gid_t gid);
extern char sysfs_path[SYSFS_PATH_MAX];
extern char udev_root[PATH_MAX];
extern char udev_db_path[PATH_MAX+NAME_MAX];
extern char sysfs_path[SYSFS_PATH_MAX];
extern char udev_root[PATH_MAX];
extern char udev_db_path[PATH_MAX+NAME_MAX];
-extern char udev_permissions_filename[PATH_MAX+NAME_MAX];
extern char udev_config_filename[PATH_MAX+NAME_MAX];
extern char udev_rules_filename[PATH_MAX+NAME_MAX];
extern char udev_config_filename[PATH_MAX+NAME_MAX];
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_dev_d;
extern int udev_hotplug_d;
extern int udev_log;
extern int udev_dev_d;
extern int udev_hotplug_d;