X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udevmonitor.c;h=6f2844ff150b46265cd506184a4c06a64ed47d61;hb=34bb5d057c99fa433392e0d5c17f604c8c111381;hp=61901accad38f38bc95896c157b38fb01846d815;hpb=733f070dddc096175fb74ba44a95538cf09411ba;p=elogind.git

diff --git a/udevmonitor.c b/udevmonitor.c
index 61901acca..6f2844ff1 100644
--- a/udevmonitor.c
+++ b/udevmonitor.c
@@ -1,7 +1,7 @@
 /*
  * 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
@@ -36,8 +36,8 @@
 #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)
@@ -118,22 +118,21 @@ int main(int argc, char *argv[])
 
 	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);
 	}
 
@@ -148,6 +147,7 @@ int main(int argc, char *argv[])
 	retval = init_udev_monitor_socket();
 	if (retval)
 		goto out;
+
 	retval = init_uevent_netlink_sock();
 	if (retval)
 		goto out;
@@ -156,7 +156,7 @@ int main(int argc, char *argv[])
 	       "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;
@@ -165,9 +165,9 @@ int main(int argc, char *argv[])
 
 		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);
@@ -183,7 +183,7 @@ int main(int argc, char *argv[])
 		} 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));
@@ -192,7 +192,7 @@ int main(int argc, char *argv[])
 			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));
@@ -227,9 +227,9 @@ int main(int argc, char *argv[])
 	}
 
 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)