X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevcontrol.c;h=a983f22835ffaf7d2d7738b9326e7d11876c47f9;hp=9231f2e08474d50a3f9cb78bf48caaaa0b39e6a5;hb=27283c2fdaefd9c7fd557fd4663566eacccca33a;hpb=f051e340699286831b90b242d843eb1a38c2b19f

diff --git a/udevcontrol.c b/udevcontrol.c
index 9231f2e08..a983f2283 100644
--- a/udevcontrol.c
+++ b/udevcontrol.c
@@ -1,7 +1,5 @@
 /*
- * udevcontrol.c
- *
- * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2005-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
@@ -14,7 +12,7 @@
  * 
  *	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.
  *
  */
 
@@ -50,18 +48,6 @@ 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\n"
-		"  max_childs_running=<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[])
 {
 	static struct udevd_ctrl_msg ctrl_msg;
@@ -82,7 +68,6 @@ int main(int argc, char *argv[], char *envp[])
 
 	if (argc < 2) {
 		fprintf(stderr, "missing command\n\n");
-		usage();
 		goto exit;
 	}
 
@@ -133,17 +118,23 @@ int main(int argc, char *argv[], char *envp[])
 			*intval = count;
 			info("send max_childs_running=%i", *intval);
 		} else if (strcmp(arg, "help") == 0  || strcmp(arg, "--help") == 0  || strcmp(arg, "-h") == 0) {
-			usage();
+			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\n"
+				"  max_childs_running=<N> maximum number of childs running at the same time\n"
+				"  --help                 print this help text\n\n");
 			goto exit;
 		} else {
-			fprintf(stderr, "unknown option\n\n");
-			usage();
+			fprintf(stderr, "unrecognized command '%s'\n", arg);
 			goto exit;
 		}
 	}
 
 	if (getuid() != 0) {
-		fprintf(stderr, "need to be root, exit\n\n");
+		fprintf(stderr, "root privileges required\n");
 		goto exit;
 	}