/*
- * udevmonitor.c
- *
- * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#include "udev.h"
#include "udevd.h"
-static int uevent_netlink_sock;
-static int udev_monitor_sock;
+static int uevent_netlink_sock = -1;
+static int udev_monitor_sock = -1;
static volatile int udev_exit;
static int init_udev_monitor_socket(void)
for (i = 1 ; i < argc; i++) {
char *arg = argv[i];
- if (strcmp(arg, "--env") == 0 || strcmp(arg, "-e") == 0) {
+ if (strcmp(arg, "--env") == 0 || strcmp(arg, "-e") == 0)
env = 1;
- }
else if (strcmp(arg, "--help") == 0 || strcmp(arg, "-h") == 0){
- printf("Usage: udevmonitor [--env]\n"
+ printf("Usage: udevmonitor [--help] [--env]\n"
" --env print the whole event environment\n"
" --help print this help text\n\n");
exit(0);
} else {
- fprintf(stderr, "unknown option\n\n");
+ fprintf(stderr, "unrecognized option '%s'\n", arg);
exit(1);
}
}
if (getuid() != 0) {
- fprintf(stderr, "need to be root, exit\n\n");
+ fprintf(stderr, "root privileges required\n");
exit(2);
}
retval = init_udev_monitor_socket();
if (retval)
goto out;
+
retval = init_uevent_netlink_sock();
if (retval)
goto out;
"and the event which udev sends out after rule processing [UDEV]\n\n");
while (!udev_exit) {
- static char buf[UEVENT_BUFFER_SIZE*2];
+ char buf[UEVENT_BUFFER_SIZE*2];
ssize_t buflen;
int fdcount;
struct timeval tv;
buflen = 0;
FD_ZERO(&readfds);
- if (uevent_netlink_sock > 0)
+ if (uevent_netlink_sock >= 0)
FD_SET(uevent_netlink_sock, &readfds);
- if (udev_monitor_sock > 0)
+ if (udev_monitor_sock >= 0)
FD_SET(udev_monitor_sock, &readfds);
fdcount = select(UDEV_MAX(uevent_netlink_sock, udev_monitor_sock)+1, &readfds, NULL, NULL, NULL);
} else
timestr[0] = '\0';
- if ((uevent_netlink_sock > 0) && FD_ISSET(uevent_netlink_sock, &readfds)) {
+ if ((uevent_netlink_sock >= 0) && FD_ISSET(uevent_netlink_sock, &readfds)) {
buflen = recv(uevent_netlink_sock, &buf, sizeof(buf), 0);
if (buflen <= 0) {
fprintf(stderr, "error receiving uevent message: %s\n", strerror(errno));
printf("UEVENT[%s] %s\n", timestr, buf);
}
- if ((udev_monitor_sock > 0) && FD_ISSET(udev_monitor_sock, &readfds)) {
+ if ((udev_monitor_sock >= 0) && FD_ISSET(udev_monitor_sock, &readfds)) {
buflen = recv(udev_monitor_sock, &buf, sizeof(buf), 0);
if (buflen <= 0) {
fprintf(stderr, "error receiving udev message: %s\n", strerror(errno));
}
out:
- if (uevent_netlink_sock > 0)
+ if (uevent_netlink_sock >= 0)
close(uevent_netlink_sock);
- if (udev_monitor_sock > 0)
+ if (udev_monitor_sock >= 0)
close(udev_monitor_sock);
if (retval)