chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
handle devtmpfs nodes
[elogind.git]
/
udev
/
udev-node.c
diff --git
a/udev/udev-node.c
b/udev/udev-node.c
index 322e0b88de3624b5c60746d6fab97cf85303a9fe..2f9cf4d7ac3e0dd90f1e93abbf7a5f3bba281c05 100644
(file)
--- a/
udev/udev-node.c
+++ b/
udev/udev-node.c
@@
-68,7
+68,6
@@
static int name_index(struct udev *udev, const char *devpath, const char *name,
int udev_node_mknod(struct udev_device *dev, const char *file, dev_t devnum, mode_t mode, uid_t uid, gid_t gid)
{
struct udev *udev = udev_device_get_udev(dev);
int udev_node_mknod(struct udev_device *dev, const char *file, dev_t devnum, mode_t mode, uid_t uid, gid_t gid)
{
struct udev *udev = udev_device_get_udev(dev);
- char filename[UTIL_PATH_SIZE];
struct stat stats;
int preserve = 0;
int err = 0;
struct stat stats;
int preserve = 0;
int err = 0;
@@
-81,14
+80,8
@@
int udev_node_mknod(struct udev_device *dev, const char *file, dev_t devnum, mod
else
mode |= S_IFCHR;
else
mode |= S_IFCHR;
- if (file == NULL)
{
+ if (file == NULL)
file = udev_device_get_devnode(dev);
file = udev_device_get_devnode(dev);
- } else if (file[0] != '/') {
- util_strlcpy(filename, udev_get_dev_path(udev), sizeof(filename));
- util_strlcat(filename, "/", sizeof(filename));
- util_strlcat(filename, file, sizeof(filename));
- file = filename;
- }
if (lstat(file, &stats) == 0) {
if (((stats.st_mode & S_IFMT) == (mode & S_IFMT)) && (stats.st_rdev == devnum)) {
if (lstat(file, &stats) == 0) {
if (((stats.st_mode & S_IFMT) == (mode & S_IFMT)) && (stats.st_rdev == devnum)) {