X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udevcontrol.c;h=2d93f65ce8c33c4af6c8c8c42532b2e6a62826cc;hb=989e081131f25b24da26ca94f0494ca756389867;hp=00b435edc4364187bba20d2c0768a4843f074d90;hpb=c895fd002763d6ae808e820020dc54e74c347fc2;p=elogind.git

diff --git a/udevcontrol.c b/udevcontrol.c
index 00b435edc..2d93f65ce 100644
--- a/udevcontrol.c
+++ b/udevcontrol.c
@@ -18,10 +18,6 @@
  *
  */
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/wait.h>
-#include <sys/un.h>
 #include <time.h>
 #include <errno.h>
 #include <stdio.h>
@@ -29,15 +25,14 @@
 #include <stddef.h>
 #include <string.h>
 #include <unistd.h>
-#include <linux/stddef.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/wait.h>
+#include <sys/un.h>
 
 #include "udev.h"
-#include "udev_version.h"
 #include "udevd.h"
-#include "udev_utils.h"
-#include "logging.h"
 
-/* global variables */
 static int sock = -1;
 static int udev_log = 0;
 
@@ -55,6 +50,16 @@ void log_message (int priority, const char *format, ...)
 }
 #endif
 
+static void usage(void)
+{
+	printf("Usage: udevcontrol COMMAND\n"
+		"  log_priority=<level> set the udev log level for the daemon\n"
+		"  stop_exec_queue      keep udevd from executing events, queue only\n"
+		"  start_exec_queue     execute events, flush queue\n"
+		"  reload_rules         reloads the rules files\n"
+		"  max_childs=<N>       maximum number of childs running at the same time\n"
+		"  --help               print this help text\n\n");
+}
 
 int main(int argc, char *argv[], char *envp[])
 {
@@ -76,6 +81,7 @@ int main(int argc, char *argv[], char *envp[])
 
 	if (argc < 2) {
 		fprintf(stderr, "missing command\n\n");
+		usage();
 		goto exit;
 	}
 
@@ -104,28 +110,23 @@ int main(int argc, char *argv[], char *envp[])
 			*intval = atoi(val);
 			info("send max_childs=%i", *intval);
 		} else if (strcmp(arg, "help") == 0  || strcmp(arg, "--help") == 0  || strcmp(arg, "-h") == 0) {
-			printf("Usage: udevcontrol COMMAND\n"
-				"  log_priority=<level> set the udev log level for the daemon\n"
-				"  stop_exec_queue      keep udevd from executing events, queue only\n"
-				"  start_exec_queue     execute events, flush queue\n"
-				"  reload_rules         reloads the rules files\n"
-				"  max_childs=<N>       maximum number of childs running at the same time\n"
-				"  --help               print this help text\n\n");
-			exit(0);
+			usage();
+			goto exit;
 		} else {
 			fprintf(stderr, "unknown option\n\n");
-			exit(1);
+			usage();
+			goto exit;
 		}
 	}
 
 	if (getuid() != 0) {
 		fprintf(stderr, "need to be root, exit\n\n");
-		exit(1);
+		goto exit;
 	}
 
 	sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
 	if (sock == -1) {
-		err("error getting socket");
+		err("error getting socket: %s", strerror(errno));
 		goto exit;
 	}
 
@@ -135,10 +136,9 @@ int main(int argc, char *argv[], char *envp[])
 	strcpy(&saddr.sun_path[1], UDEVD_SOCK_PATH);
 	addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(saddr.sun_path+1) + 1;
 
-
 	retval = sendto(sock, &usend_msg, sizeof(usend_msg), 0, (struct sockaddr *)&saddr, addrlen);
 	if (retval == -1) {
-		info("error sending message (%s)", strerror(errno));
+		err("error sending message: %s", strerror(errno));
 		retval = 1;
 	} else {
 		dbg("sent message type=0x%02x, %u bytes sent", usend_msg.type, retval);
@@ -146,9 +146,7 @@ int main(int argc, char *argv[], char *envp[])
 	}
 
 	close(sock);
-
 exit:
 	logging_close();
-
 	return retval;
 }