From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 24 Jun 2010 02:55:57 +0000 (+0200)
Subject: utils: show help blurb when run without any arguments
X-Git-Tag: v1~105
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=2f02ce4005075ac76742ed6a2189cc2e5fc6a192

utils: show help blurb when run without any arguments
---

diff --git a/src/install.c b/src/install.c
index 0c9f08666..f56c0728b 100644
--- a/src/install.c
+++ b/src/install.c
@@ -132,7 +132,7 @@ static int parse_argv(int argc, char *argv[]) {
         }
 
         if (optind >= argc) {
-                log_error("Missing verb.");
+                help();
                 return -EINVAL;
         }
 
@@ -143,7 +143,7 @@ static int parse_argv(int argc, char *argv[]) {
         else if (streq(argv[optind], "test"))
                 arg_action = ACTION_TEST;
         else {
-                log_error("Unknown verb %s", argv[optind]);
+                log_error("Unknown verb %s.", argv[optind]);
                 return -EINVAL;
         }
 
diff --git a/src/notify.c b/src/notify.c
index 6dd708a90..514636e47 100644
--- a/src/notify.c
+++ b/src/notify.c
@@ -115,6 +115,15 @@ static int parse_argv(int argc, char *argv[]) {
                 }
         }
 
+        if (optind >= argc &&
+            !arg_ready &&
+            !arg_status &&
+            !arg_pid &&
+            !arg_booted) {
+                help();
+                return -EINVAL;
+        }
+
         return 1;
 }
 
diff --git a/src/systemctl.c b/src/systemctl.c
index 9eb72f974..78310aa27 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -1839,7 +1839,7 @@ static int telinit_parse_argv(int argc, char *argv[]) {
         }
 
         if (optind >= argc) {
-                log_error("Argument missing.");
+                telinit_help();
                 return -EINVAL;
         }