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] no error on enoent
[elogind.git]
/
udev-remove.c
diff --git
a/udev-remove.c
b/udev-remove.c
index e62d1fb1223bcbcd3a27e2ae5f31aa02b54ce8b1..dcd460bedcee56c3dc5aefa272d6ef94705c49d6 100644
(file)
--- a/
udev-remove.c
+++ b/
udev-remove.c
@@
-51,6
+51,8
@@
static int delete_path(char *path)
/* remove if empty */
retval = rmdir(path);
/* remove if empty */
retval = rmdir(path);
+ if (errno == ENOENT)
+ retval = 0;
if (retval) {
if (errno == ENOTEMPTY)
return 0;
if (retval) {
if (errno == ENOTEMPTY)
return 0;
@@
-77,6
+79,8
@@
static int delete_node(struct udevice *dev)
info("removing device node '%s'", filename);
retval = unlink(filename);
info("removing device node '%s'", filename);
retval = unlink(filename);
+ if (errno == ENOENT)
+ retval = 0;
if (retval) {
dbg("unlink(%s) failed with error '%s'",
filename, strerror(errno));
if (retval) {
dbg("unlink(%s) failed with error '%s'",
filename, strerror(errno));
@@
-109,6
+113,8
@@
static int delete_node(struct udevice *dev)
dbg("unlinking symlink '%s'", filename);
retval = unlink(filename);
dbg("unlinking symlink '%s'", filename);
retval = unlink(filename);
+ if (errno == ENOENT)
+ retval = 0;
if (retval) {
dbg("unlink(%s) failed with error '%s'",
filename, strerror(errno));
if (retval) {
dbg("unlink(%s) failed with error '%s'",
filename, strerror(errno));