chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
extras/keymap/findkeyboards: Filter out non-event devices
[elogind.git]
/
udev
/
udevd.c
diff --git
a/udev/udevd.c
b/udev/udevd.c
index fdb3e420024f60fbba39fda60dd5179cbdc55414..05d4b2d66bd8a047bc467cb5c69353e0503519b8 100644
(file)
--- a/
udev/udevd.c
+++ b/
udev/udevd.c
@@
-1420,7
+1420,7
@@
int main(int argc, char *argv[])
goto exit;
default:
rc = EXIT_SUCCESS;
goto exit;
default:
rc = EXIT_SUCCESS;
- goto exit_
keep_queu
e;
+ goto exit_
daemoniz
e;
}
setsid();
}
setsid();
@@
-1648,10
+1648,11
@@
int main(int argc, char *argv[])
struct udev_device *dev;
dev = udev_monitor_receive_device(monitor);
struct udev_device *dev;
dev = udev_monitor_receive_device(monitor);
- if (dev != NULL)
+ if (dev != NULL)
{
udev_device_set_usec_initialized(dev, now_usec());
if (event_queue_insert(dev) < 0)
udev_device_unref(dev);
udev_device_set_usec_initialized(dev, now_usec());
if (event_queue_insert(dev) < 0)
udev_device_unref(dev);
+ }
}
/* start new events */
}
/* start new events */
@@
-1704,7
+1705,8
@@
int main(int argc, char *argv[])
rc = EXIT_SUCCESS;
exit:
udev_queue_export_cleanup(udev_queue_export);
rc = EXIT_SUCCESS;
exit:
udev_queue_export_cleanup(udev_queue_export);
-exit_keep_queue:
+ udev_ctrl_cleanup(udev_ctrl);
+exit_daemonize:
if (fd_ep >= 0)
close(fd_ep);
worker_list_cleanup(udev);
if (fd_ep >= 0)
close(fd_ep);
worker_list_cleanup(udev);