cleanup commandline argument handling

Print and log failure, but don't fail for tools which are
usually not used iteractively. Add '--help' to all tools.

1 files changed, 4 insertions, 5 deletions

diff --git a/udevmonitor.c b/udevmonitor.c
index 4c59a495db..6f2844ff15 100644
--- a/udevmonitor.c
+++ b/udevmonitor.c
@@ -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);
 	}