aboutsummaryrefslogtreecommitdiff
path: root/bpkg/bpkg.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-11-25 12:51:49 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-11-25 12:51:49 +0200
commit9ecfa10db4a4856d445910d440aa38ee5b2b3d26 (patch)
tree2cbcfbc06adce166bf0ce2376d4c7300b9fdcb4e /bpkg/bpkg.cxx
parent87e476cf192b70c133a1bf00efa8586348326092 (diff)
Implement help pager
Diffstat (limited to 'bpkg/bpkg.cxx')
-rw-r--r--bpkg/bpkg.cxx19
1 files changed, 5 insertions, 14 deletions
diff --git a/bpkg/bpkg.cxx b/bpkg/bpkg.cxx
index 386d284..e1cdce2 100644
--- a/bpkg/bpkg.cxx
+++ b/bpkg/bpkg.cxx
@@ -85,10 +85,7 @@ try
}
if (o.help ())
- {
- help (help_options (), "", nullptr);
- return 0;
- }
+ return help (help_options (), "", nullptr);
const common_options& co (o);
@@ -131,16 +128,10 @@ try
// If not, then it got to be a help topic.
//
if (cmd_argc != 1)
- {
- help (ho, cmd_argv[1], nullptr);
- return 0;
- }
+ return help (ho, cmd_argv[1], nullptr);
}
else
- {
- help (ho, "", nullptr);
- return 0;
- }
+ return help (ho, "", nullptr);
}
// Handle commands.
@@ -162,7 +153,7 @@ try
// if (cmd.pkg_verify ())
// {
// if (h)
- // help (ho, "pkg-verify", pkg_verify_options::print_usage);
+ // r = help (ho, "pkg-verify", pkg_verify_options::print_usage);
// else
// r = pkg_verify (parse<pkg_verify_options> (co, args), args);
//
@@ -173,7 +164,7 @@ try
if (cmd.NP##CMD ()) \
{ \
if (h) \
- help (ho, SP#CMD, print_bpkg_##NP##CMD##_usage); \
+ r = help (ho, SP#CMD, print_bpkg_##NP##CMD##_usage); \
else \
r = NP##CMD (parse<NP##CMD##_options> (co, args), args); \
\