summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorDenys Vlasenko2018-01-12 16:17:59 +0100
committerDenys Vlasenko2018-01-12 16:17:59 +0100
commitafb73a25ea9b046f0fb2fa83a6d75b15bd952716 (patch)
treee971e9663f91aeaee334ed3ffbab71da3e2ee076 /shell
parent5700029c65f2218b5fceca77a9140aff6d882aab (diff)
downloadbusybox-afb73a25ea9b046f0fb2fa83a6d75b15bd952716.zip
busybox-afb73a25ea9b046f0fb2fa83a6d75b15bd952716.tar.gz
hush: tweak command -vV printing code, no logic changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell')
-rw-r--r--shell/hush.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/shell/hush.c b/shell/hush.c
index 196bdbe..fc8940d 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -7336,6 +7336,7 @@ static void dump_cmd_in_x_mode(char **argv)
static void if_command_vV_print_and_exit(char opt_vV, char *cmd, const char *explanation)
{
char *to_free;
+
if (!opt_vV)
return;
@@ -7343,14 +7344,15 @@ static void if_command_vV_print_and_exit(char opt_vV, char *cmd, const char *exp
if (!explanation) {
char *path = getenv("PATH");
explanation = to_free = find_executable(cmd, &path); /* path == NULL is ok */
+ if (!explanation)
+ _exit(1); /* PROG was not found */
if (opt_vV != 'V')
cmd = to_free; /* -v PROG prints "/path/to/PROG" */
}
- if (explanation)
- printf((opt_vV == 'V') ? "%s is %s\n" : "%s\n", cmd, explanation);
+ printf((opt_vV == 'V') ? "%s is %s\n" : "%s\n", cmd, explanation);
free(to_free);
fflush_all();
- _exit(explanation == NULL); /* exit 1 if PROG was not found */
+ _exit(0);
}
#else
# define if_command_vV_print_and_exit(a,b,c) ((void)0)