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] turn debugging messages off by default.
[elogind.git]
/
udev.h
diff --git
a/udev.h
b/udev.h
index 4c8914f1e2b4727d32d7976d743f94b6609f76bd..0c1951ad7875dee47c8461ca3d00bc863c2b2d87 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>
@@
-52,21
+52,14
@@
extern int log_message (int level, const char *format, ...)
/* filenames for the config and database files */
/* filenames for the config and database files */
-#define UDEV_DB "
udevdb
.tdb"
-#define
NAMEDEV_CONFIG_PERMISSION_FILE "name
dev.permissions"
-#define
NAMEDEV_CONFIG_FILE "name
dev.config"
+#define UDEV_DB "
.udev
.tdb"
+#define
UDEV_CONFIG_PERMISSION_FILE "u
dev.permissions"
+#define
UDEV_CONFIG_FILE "u
dev.config"
#define NAME_SIZE 100
#define OWNER_SIZE 30
#define GROUP_SIZE 30
#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];
struct udevice {
char name[NAME_SIZE];
char owner[OWNER_SIZE];
@@
-75,8
+68,20
@@
struct udevice {
int major;
int minor;
mode_t mode;
int major;
int minor;
mode_t mode;
+
+ /* fields that help us in building strings */
+ unsigned char bus_id[SYSFS_NAME_LEN];
+ unsigned char callout_value[NAME_SIZE];
+ unsigned char kernel_number[NAME_SIZE];
+
};
};
+#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);
extern int udev_add_device(char *path, char *subsystem);
extern int udev_remove_device(char *path, char *subsystem);
@@
-90,4
+95,3
@@
extern char udev_config_permission_filename[PATH_MAX+NAME_MAX];
extern char udev_config_filename[PATH_MAX+NAME_MAX];
#endif
extern char udev_config_filename[PATH_MAX+NAME_MAX];
#endif
-