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] trivial: remove _all_ trailing slashes with no_trailing_slash()
[elogind.git]
/
udev_remove.c
diff --git
a/udev_remove.c
b/udev_remove.c
index d97a2411f4d7fe587d8a330e4b5a8e656be9f93e..142503589a6f90a42f0da4cb392cba12f9f75525 100644
(file)
--- a/
udev_remove.c
+++ b/
udev_remove.c
@@
-28,15
+28,16
@@
#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.h"
-#include "udev_
lib
.h"
+#include "udev_
utils
.h"
#include "udev_version.h"
#include "udev_version.h"
-#include "logging.h"
#include "namedev.h"
#include "namedev.h"
-#include "udevdb.h"
+#include "udev_db.h"
+#include "logging.h"
-static int delete_path(char *path)
+static int delete_path(c
onst c
har *path)
{
char *pos;
int retval;
{
char *pos;
int retval;
@@
-101,10
+102,9
@@
static int secure_unlink(const char *filename)
return retval;
}
return retval;
}
-static int delete_node(struct udevice *dev)
+static int delete_node(struct udevice *
u
dev)
{
char filename[NAME_SIZE];
{
char filename[NAME_SIZE];
- char linkname[NAME_SIZE];
char partitionname[NAME_SIZE];
int retval;
int i;
char partitionname[NAME_SIZE];
int retval;
int i;
@@
-112,8
+112,8
@@
static int delete_node(struct udevice *dev)
int len;
int num;
int len;
int num;
- s
trfieldcpy(filename, udev_root
);
-
strfieldcat(filename, dev->name)
;
+ s
nprintf(filename, NAME_SIZE, "%s/%s", udev_root, udev->name
);
+
filename[NAME_SIZE-1] = '\0'
;
info("removing device node '%s'", filename);
retval = secure_unlink(filename);
info("removing device node '%s'", filename);
retval = secure_unlink(filename);
@@
-121,7
+121,7
@@
static int delete_node(struct udevice *dev)
return retval;
/* remove all_partitions nodes */
return retval;
/* remove all_partitions nodes */
- num = dev->partitions;
+ num =
u
dev->partitions;
if (num > 0) {
info("removing all_partitions '%s[1-%i]'", filename, num);
if (num > PARTITIONS_COUNT) {
if (num > 0) {
info("removing all_partitions '%s[1-%i]'", filename, num);
if (num > PARTITIONS_COUNT) {
@@
-136,13
+136,15
@@
static int delete_node(struct udevice *dev)
}
/* remove subdirectories */
}
/* remove subdirectories */
- if (strchr(dev->name, '/'))
+ if (strchr(
u
dev->name, '/'))
delete_path(filename);
delete_path(filename);
- foreach_strpart(dev->symlink, " ", pos, len) {
+ foreach_strpart(udev->symlink, " ", pos, len) {
+ char linkname[NAME_SIZE];
+
strfieldcpymax(linkname, pos, len+1);
strfieldcpymax(linkname, pos, len+1);
- s
trfieldcpy(filename, udev_root
);
-
strfieldcat(filename, linkname)
;
+ s
nprintf(filename, NAME_SIZE, "%s/%s", udev_root, linkname
);
+
filename[NAME_SIZE-1] = '\0'
;
dbg("unlinking symlink '%s'", filename);
retval = unlink(filename);
dbg("unlinking symlink '%s'", filename);
retval = unlink(filename);
@@
-153,7
+155,7
@@
static int delete_node(struct udevice *dev)
filename, strerror(errno));
return retval;
}
filename, strerror(errno));
return retval;
}
- if (strchr(dev->symlink, '/')) {
+ if (strchr(
u
dev->symlink, '/')) {
delete_path(filename);
}
}
delete_path(filename);
}
}
@@
-167,17
+169,14
@@
static int delete_node(struct udevice *dev)
*/
int udev_remove_device(struct udevice *udev)
{
*/
int udev_remove_device(struct udevice *udev)
{
- struct udevice db_dev;
- char *temp;
+ const char *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) {
- /* get stored values in our device */
- memcpy(udev, &db_dev, UDEVICE_DB_LEN);
- } else {
+ retval = udev_db_get_device(udev);
+ if (retval) {
/* fall back to kernel name */
temp = strrchr(udev->devpath, '/');
if (temp == NULL)
/* fall back to kernel name */
temp = strrchr(udev->devpath, '/');
if (temp == NULL)
@@
-185,15
+184,17
@@
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);
- dev_d_send(udev);
- udevdb_delete_dev(udev->devpath);
+ if (udev->ignore_remove) {
+ dbg("remove event for '%s' requested to be ignored by rule", udev->name);
+ return 0;
+ }
- if (udev->type == 'b' || udev->type == 'c')
- retval = delete_node(udev);
- else
- retval = 0;
+ dbg("remove name='%s'", udev->name);
+ udev_db_delete_device(udev);
- return retval;
+ /* use full path to the environment */
+ snprintf(udev->devname, NAME_SIZE, "%s/%s", udev_root, udev->name);
+
+ return delete_node(udev);
}
}