Mercurial > hg > toybox
diff main.c @ 1022:71f64e2f24a9
Fix --help option to multiplexer.
author | Rob Landley <rob@landley.net> |
---|---|
date | Wed, 21 Aug 2013 03:03:47 -0500 |
parents | caa05719070f |
children | 40d0c96a8e89 |
line wrap: on
line diff
--- a/main.c Tue Aug 20 23:15:48 2013 +0200 +++ b/main.c Wed Aug 21 03:03:47 2013 -0500 @@ -67,6 +67,8 @@ toys.argv = argv; if (CFG_TOYBOX_HELP_DASHDASH && argv[1] && !strcmp(argv[1], "--help")) { + if (toys.which == toy_list && toys.argv[2]) + if (!(toys.which = toy_find(toys.argv[2]))) return; show_help(); xexit(); } @@ -114,7 +116,7 @@ if (!(which = toy_find(argv[0]))) return; toy_init(which, argv); - toys.which->toy_main(); + if (toys.which) toys.which->toy_main(); if (fflush(NULL) || ferror(stdout)) perror_exit("write"); xexit(); } @@ -129,16 +131,8 @@ toys.which = toy_list; if (toys.argv[1]) { - if (CFG_TOYBOX_HELP_DASHDASH && !strcmp(toys.argv[1], "--help")) { - if (toys.argv[2]) toys.which = toy_find(toys.argv[2]); - if (toys.which) { - show_help(); - return; - } - } else { - toy_exec(toys.argv+1); - if (toys.argv[1][0] == '-') goto list; - } + toy_exec(toys.argv+1); + if (toys.argv[1][0] == '-') goto list; error_exit("Unknown command %s",toys.argv[1]); }