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] added my name to the .spec file.
[elogind.git]
/
udev-add.c
diff --git
a/udev-add.c
b/udev-add.c
index adbeb92425f5247a0497c61aac548f24c58f01e3..586815e2c794386b0c720528f3d94b6a92b775b6 100644
(file)
--- a/
udev-add.c
+++ b/
udev-add.c
@@
-34,8
+34,6
@@
#include "libsysfs/libsysfs.h"
#include "libsysfs/libsysfs.h"
-static char sysfs_path[SYSFS_PATH_MAX];
-
/*
* Right now the major/minor of a device is stored in a file called
* "dev" in sysfs.
/*
* Right now the major/minor of a device is stored in a file called
* "dev" in sysfs.
@@
-78,26
+76,43
@@
static int create_node(char *name, char type, int major, int minor, int mode)
int retval = 0;
strncpy(filename, UDEV_ROOT, sizeof(filename));
strncat(filename, name, sizeof(filename));
int retval = 0;
strncpy(filename, UDEV_ROOT, sizeof(filename));
strncat(filename, name, sizeof(filename));
- if (type == 'b') {
- mode |= S_IFBLK;
- } else if ((type == 'c') || (type == 'u')){
- mode |= S_IFCHR;
- } else if ( type == 'p') {
- mode |= S_IFIFO;
- } else {
- dbg("unknown node type %c\n", type);
- return -1;
- }
+ switch (type) {
+ case 'b':
+ mode |= S_IFBLK;
+ break;
+ case 'c':
+ case 'u':
+ mode |= S_IFCHR;
+ break;
+ case 'p':
+ mode |= S_IFIFO;
+ break;
+ default:
+ dbg("unknown node type %c\n", type);
+ return -EINVAL;
+ }
retval = mknod(filename,mode,makedev(major,minor));
retval = mknod(filename,mode,makedev(major,minor));
+ if (retval)
+ dbg("mknod(%s, %#o, %u, %u) failed with error '%s'",
+ filename, mode, major, minor, strerror(errno));
return retval;
return retval;
-
}
struct sysfs_class_device *get_class_dev(char *device_name)
{
}
struct sysfs_class_device *get_class_dev(char *device_name)
{
+ char sysfs_path[SYSFS_PATH_MAX];
char dev_path[SYSFS_PATH_MAX];
char dev_path[SYSFS_PATH_MAX];
- struct sysfs_class_device *class_dev;
+ int retval;
+ struct sysfs_class_device *class_dev = NULL;
+
+
+ retval = sysfs_get_mnt_path(sysfs_path, SYSFS_PATH_MAX);
+ dbg("sysfs_path = %s", sysfs_path);
+ if (retval) {
+ dbg("sysfs_get_mnt_path failed");
+ goto exit;
+ }
strcpy(dev_path, sysfs_path);
strcat(dev_path, device_name);
strcpy(dev_path, sysfs_path);
strcat(dev_path, device_name);
@@
-108,46
+123,34
@@
struct sysfs_class_device *get_class_dev(char *device_name)
class_dev = sysfs_open_class_device(dev_path);
if (class_dev == NULL) {
dbg ("sysfs_open_class_device failed");
class_dev = sysfs_open_class_device(dev_path);
if (class_dev == NULL) {
dbg ("sysfs_open_class_device failed");
-
return NULL
;
+
goto exit
;
}
dbg("class_dev->name = %s", class_dev->name);
}
dbg("class_dev->name = %s", class_dev->name);
+exit:
return class_dev;
}
return class_dev;
}
-static int udev_init(void)
-{
- int retval;
-
- retval = sysfs_get_mnt_path(sysfs_path, SYSFS_PATH_MAX);
- dbg("sysfs_path = %s", sysfs_path);
- return retval;
-}
-
int udev_add_device(char *device, char *subsystem)
{
struct sysfs_class_device *class_dev;
struct device_attr attr;
int udev_add_device(char *device, char *subsystem)
{
struct sysfs_class_device *class_dev;
struct device_attr attr;
- //char *name;
int major;
int minor;
char type;
int major;
int minor;
char type;
- //int mode;
int retval = -EINVAL;
int retval = -EINVAL;
- /* sleep for a second or two to give the kernel a chance to
- * create the dev file
- */
- sleep(1);
-
- udev_init();
-
/* for now, the block layer is the only place where block devices are */
if (strcmp(subsystem, "block") == 0)
type = 'b';
else
type = 'c';
/* for now, the block layer is the only place where block devices are */
if (strcmp(subsystem, "block") == 0)
type = 'b';
else
type = 'c';
+ /* sleep for a second or two to give the kernel a chance to
+ * create the dev file
+ */
+ sleep(1);
+
class_dev = get_class_dev(device);
if (class_dev == NULL)
goto exit;
class_dev = get_class_dev(device);
if (class_dev == NULL)
goto exit;