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] remove unneeded keyboard rule.
[elogind.git]
/
udev.h
diff --git
a/udev.h
b/udev.h
index 904948d67ac92d7df4fa80e27ae7eea6e44fb64d..678731c7d194a0843dfceedf7368b0857262b19f 100644
(file)
--- a/
udev.h
+++ b/
udev.h
@@
-24,7
+24,7
@@
#define UDEV_H
#include "libsysfs/libsysfs.h"
#define UDEV_H
#include "libsysfs/libsysfs.h"
-#include <
limits
.h>
+#include <
sys/param
.h>
#ifdef DEBUG
#include <syslog.h>
#ifdef DEBUG
#include <syslog.h>
@@
-50,11
+50,7
@@
extern int log_message (int level, const char *format, ...)
__attribute__ ((format (printf, 2, 3)));
extern int log_message (int level, const char *format, ...)
__attribute__ ((format (printf, 2, 3)));
-
-/* filenames for the config and database files */
-#define UDEV_DB "udev.tdb"
-#define UDEV_CONFIG_PERMISSION_FILE "udev.permissions"
-#define UDEV_CONFIG_FILE "udev.config"
+#define COMMENT_CHARACTER '#'
#define NAME_SIZE 100
#define OWNER_SIZE 30
#define NAME_SIZE 100
#define OWNER_SIZE 30
@@
-68,6
+64,14
@@
struct udevice {
int major;
int minor;
mode_t mode;
int major;
int minor;
mode_t mode;
+ char symlink[NAME_SIZE];
+
+ /* fields that help us in building strings */
+ unsigned char bus_id[SYSFS_NAME_LEN];
+ unsigned char program_result[NAME_SIZE];
+ unsigned char kernel_number[NAME_SIZE];
+ unsigned char kernel_name[NAME_SIZE];
+
};
#define strfieldcpy(to, from) \
};
#define strfieldcpy(to, from) \
@@
-78,15
+82,16
@@
do { \
extern int udev_add_device(char *path, char *subsystem);
extern int udev_remove_device(char *path, char *subsystem);
extern int udev_add_device(char *path, char *subsystem);
extern int udev_remove_device(char *path, char *subsystem);
+extern void udev_init_config(void);
extern char **main_argv;
extern char **main_envp;
extern char sysfs_path[SYSFS_PATH_MAX];
extern char **main_argv;
extern char **main_envp;
extern char sysfs_path[SYSFS_PATH_MAX];
-extern char *udev_config_dir;
-extern char *udev_root;
+extern char udev_root[PATH_MAX];
extern char udev_db_filename[PATH_MAX+NAME_MAX];
extern char udev_db_filename[PATH_MAX+NAME_MAX];
-extern char udev_
config_permission
_filename[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_config_filename[PATH_MAX+NAME_MAX];
+extern char udev_rules_filename[PATH_MAX+NAME_MAX];
+extern char default_mode_str[NAME_MAX];
#endif
#endif
-