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] more config file parsing robustness
[elogind.git]
/
udev-add.c
diff --git
a/udev-add.c
b/udev-add.c
index d20e96ee72e7faeb3ebf9c2799b5035646e679e3..a71d435e327db824616935020e878faed987336f 100644
(file)
--- a/
udev-add.c
+++ b/
udev-add.c
@@
-28,12
+28,18
@@
#include <unistd.h>
#include <errno.h>
#include <sys/stat.h>
#include <unistd.h>
#include <errno.h>
#include <sys/stat.h>
+#include <sys/types.h>
+#include <grp.h>
+#ifndef __KLIBC__
+#include <pwd.h>
+#endif
#include "udev.h"
#include "udev_version.h"
#include "namedev.h"
#include "udevdb.h"
#include "libsysfs/libsysfs.h"
#include "udev.h"
#include "udev_version.h"
#include "namedev.h"
#include "udevdb.h"
#include "libsysfs/libsysfs.h"
+#include "klibc_fixups.h"
/*
* Right now the major/minor of a device is stored in a file called
/*
* Right now the major/minor of a device is stored in a file called
@@
-44,7
+50,7
@@
* mm is the minor
* The value is in decimal.
*/
* mm is the minor
* The value is in decimal.
*/
-static int get_major_minor(struct sysfs_class_device *class_dev,
int *major, int *minor
)
+static int get_major_minor(struct sysfs_class_device *class_dev,
struct udevice *udev
)
{
int retval = -ENODEV;
{
int retval = -ENODEV;
@@
-54,12
+60,12
@@
static int get_major_minor(struct sysfs_class_device *class_dev, int *major, int
if (dev == NULL)
goto exit;
if (dev == NULL)
goto exit;
- dbg("dev
= %s
", dev);
+ dbg("dev
='%s'
", dev);
- if (sscanf(dev, "%u:%u",
major,
minor) != 2)
+ if (sscanf(dev, "%u:%u",
&udev->major, &udev->
minor) != 2)
goto exit;
goto exit;
- dbg("found major
= %d, minor = %d", *major, *
minor);
+ dbg("found major
=%d, minor=%d", udev->major, udev->
minor);
retval = 0;
exit:
retval = 0;
exit:
@@
-123,7
+129,7
@@
static int create_node(struct udevice *dev)
path, strerror(errno));
return retval;
}
path, strerror(errno));
return retval;
}
- dbg("created
%s
", path);
+ dbg("created
'%s'
", path);
}
*pos = '/';
}
}
*pos = '/';
}
@@
-135,13
+141,24
@@
static int create_node(struct udevice *dev)
dbg("mknod(%s, %#o, %u, %u) failed with error '%s'",
filename, dev->mode, dev->major, dev->minor, strerror(errno));
dbg("mknod(%s, %#o, %u, %u) failed with error '%s'",
filename, dev->mode, dev->major, dev->minor, strerror(errno));
+ dbg("chmod(%s, %#o)", filename, dev->mode);
+ retval = chmod(filename, dev->mode);
+ if (retval)
+ dbg("chmod(%s, %#o) failed with error '%s'",
+ filename, dev->mode, strerror(errno));
+
if (*dev->owner) {
char *endptr;
unsigned long id = strtoul(dev->owner, &endptr, 10);
if (*endptr == 0x00)
uid = (uid_t) id;
if (*dev->owner) {
char *endptr;
unsigned long id = strtoul(dev->owner, &endptr, 10);
if (*endptr == 0x00)
uid = (uid_t) id;
- else
- dbg("only numeric owner id supported: %s", dev->owner);
+ else {
+ struct passwd *pw = getpwnam(dev->owner);
+ if (!pw)
+ dbg("user unknown '%s'", dev->owner);
+ else
+ uid = pw->pw_uid;
+ }
}
if (*dev->group) {
}
if (*dev->group) {
@@
-149,8
+166,13
@@
static int create_node(struct udevice *dev)
unsigned long id = strtoul(dev->group, &endptr, 10);
if (*endptr == 0x00)
gid = (gid_t) id;
unsigned long id = strtoul(dev->group, &endptr, 10);
if (*endptr == 0x00)
gid = (gid_t) id;
- else
- dbg("only numeric group id supported: %s", dev->group);
+ else {
+ struct group *gr = getgrnam(dev->group);
+ if (!gr)
+ dbg("group unknown '%s'", dev->group);
+ else
+ gid = gr->gr_gid;
+ }
}
if (uid || gid) {
}
if (uid || gid) {
@@
-172,7
+194,7
@@
static struct sysfs_class_device *get_class_dev(char *device_name)
strcpy(dev_path, sysfs_path);
strcat(dev_path, device_name);
strcpy(dev_path, sysfs_path);
strcat(dev_path, device_name);
- dbg("looking at
%s
", dev_path);
+ dbg("looking at
'%s'
", dev_path);
/* open up the sysfs class device for this thing... */
class_dev = sysfs_open_class_device(dev_path);
/* open up the sysfs class device for this thing... */
class_dev = sysfs_open_class_device(dev_path);
@@
-180,7
+202,7
@@
static struct sysfs_class_device *get_class_dev(char *device_name)
dbg ("sysfs_open_class_device failed");
goto exit;
}
dbg ("sysfs_open_class_device failed");
goto exit;
}
- dbg("class_dev->name
= %s
", class_dev->name);
+ dbg("class_dev->name
='%s'
", class_dev->name);
exit:
return class_dev;
exit:
return class_dev;
@@
-203,13
+225,12
@@
static int sleep_for_dev(char *path)
while (loop--) {
struct stat buf;
while (loop--) {
struct stat buf;
- dbg("looking for
%s
", filename);
+ dbg("looking for
'%s'
", filename);
retval = stat(filename, &buf);
if (!retval)
goto exit;
retval = stat(filename, &buf);
if (!retval)
goto exit;
- /* sleep for a second or two to give the kernel a chance to
- * create the dev file */
+ /* sleep to give the kernel a chance to create the dev file */
sleep(1);
}
retval = -ENODEV;
sleep(1);
}
retval = -ENODEV;
@@
-219,10
+240,12
@@
exit:
int udev_add_device(char *path, char *subsystem)
{
int udev_add_device(char *path, char *subsystem)
{
- struct sysfs_class_device *class_dev;
+ struct sysfs_class_device *class_dev
= NULL
;
struct udevice dev;
int retval = -EINVAL;
struct udevice dev;
int retval = -EINVAL;
+ memset(&dev, 0x00, sizeof(dev));
+
/* for now, the block layer is the only place where block devices are */
if (strcmp(subsystem, "block") == 0)
dev.type = 'b';
/* for now, the block layer is the only place where block devices are */
if (strcmp(subsystem, "block") == 0)
dev.type = 'b';
@@
-237,32
+260,27
@@
int udev_add_device(char *path, char *subsystem)
if (class_dev == NULL)
goto exit;
if (class_dev == NULL)
goto exit;
- retval = namedev_name_device(class_dev, &dev);
- if (retval)
- return retval;
-
- retval = get_major_minor(class_dev, &dev.major, &dev.minor);
+ retval = get_major_minor(class_dev, &dev);
if (retval) {
dbg("get_major_minor failed");
goto exit;
}
if (retval) {
dbg("get_major_minor failed");
goto exit;
}
-// strcpy(dev.name, attr.name);
-// strcpy(dev.owner, attr.owner);
-// strcpy(dev.group, attr.group);
-// dev.mode = attr.mode;
-
+ retval = namedev_name_device(class_dev, &dev);
+ if (retval)
+ goto exit;
+
retval = udevdb_add_dev(path, &dev);
if (retval != 0)
dbg("udevdb_add_dev failed, but we are going to try to create the node anyway. "
"But remove might not work properly for this device.");
retval = udevdb_add_dev(path, &dev);
if (retval != 0)
dbg("udevdb_add_dev failed, but we are going to try to create the node anyway. "
"But remove might not work properly for this device.");
- sysfs_close_class_device(class_dev);
-
- dbg("name = %s", dev.name);
+ dbg("name='%s'", dev.name);
retval = create_node(&dev);
exit:
retval = create_node(&dev);
exit:
+ if (class_dev)
+ sysfs_close_class_device(class_dev);
+
return retval;
}
return retval;
}
-