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] reduce syslog noise of udevsend if multiple instances try to start udevd
[elogind.git]
/
udev_remove.c
diff --git
a/udev_remove.c
b/udev_remove.c
index d97a2411f4d7fe587d8a330e4b5a8e656be9f93e..cd9d27f8dce2836f5576be021f732f0880e66b13 100644
(file)
--- a/
udev_remove.c
+++ b/
udev_remove.c
@@
-28,6
+28,7
@@
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
+#include <sys/stat.h>
#include "udev.h"
#include "udev_lib.h"
#include "udev.h"
#include "udev_lib.h"
@@
-36,7
+37,7
@@
#include "namedev.h"
#include "udevdb.h"
#include "namedev.h"
#include "udevdb.h"
-static int delete_path(char *path)
+static int delete_path(c
onst c
har *path)
{
char *pos;
int retval;
{
char *pos;
int retval;
@@
-168,14
+169,15
@@
static int delete_node(struct udevice *dev)
int udev_remove_device(struct udevice *udev)
{
struct udevice db_dev;
int udev_remove_device(struct udevice *udev)
{
struct udevice db_dev;
- char *temp;
+ c
onst c
har *temp;
int retval;
int retval;
- memset(&db_dev, 0x00, sizeof(struct udevice));
+ if (udev->type != 'b' && udev->type != 'c')
+ return 0;
retval = udevdb_get_dev(udev->devpath, &db_dev);
if (retval == 0) {
retval = udevdb_get_dev(udev->devpath, &db_dev);
if (retval == 0) {
- /*
get stored values in
our device */
+ /*
copy over the stored values to
our device */
memcpy(udev, &db_dev, UDEVICE_DB_LEN);
} else {
/* fall back to kernel name */
memcpy(udev, &db_dev, UDEVICE_DB_LEN);
} else {
/* fall back to kernel name */
@@
-185,15
+187,12
@@
int udev_remove_device(struct udevice *udev)
strfieldcpy(udev->name, &temp[1]);
dbg("'%s' not found in database, falling back on default name", udev->name);
}
strfieldcpy(udev->name, &temp[1]);
dbg("'%s' not found in database, falling back on default name", udev->name);
}
- dbg("remove name='%s'", udev->name);
- d
ev_d_send(udev
);
+ d
bg("remove name='%s'", udev->name
);
udevdb_delete_dev(udev->devpath);
udevdb_delete_dev(udev->devpath);
- if (udev->type == 'b' || udev->type == 'c')
- retval = delete_node(udev);
- else
- retval = 0;
+ /* use full path to the environment */
+ snprintf(udev->devname, NAME_SIZE-1, "%s%s", udev_root, udev->name);
- return
retval
;
+ return
delete_node(udev)
;
}
}