From defcd5e75eec72aa31e9bdbd9ac854832318f82f Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Fri, 5 Jan 2001 02:53:11 +0000 Subject: [PATCH] Fix a segfault by only constructing the prompt when we need to. If we don't do this we will segfault processing /etc/.profile since cwd isn't yet set. --- lash.c | 4 ++-- sh.c | 4 ++-- shell/lash.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lash.c b/lash.c index dd1d3aa5c..3d54b439e 100644 --- a/lash.c +++ b/lash.c @@ -774,9 +774,9 @@ static int get_command(FILE * source, char *command) return 1; } - prompt_str = setup_prompt_string(shell_context); - if (source == stdin) { + prompt_str = setup_prompt_string(shell_context); + #ifdef BB_FEATURE_SH_COMMAND_EDITING /* ** enable command line editing only while a command line diff --git a/sh.c b/sh.c index dd1d3aa5c..3d54b439e 100644 --- a/sh.c +++ b/sh.c @@ -774,9 +774,9 @@ static int get_command(FILE * source, char *command) return 1; } - prompt_str = setup_prompt_string(shell_context); - if (source == stdin) { + prompt_str = setup_prompt_string(shell_context); + #ifdef BB_FEATURE_SH_COMMAND_EDITING /* ** enable command line editing only while a command line diff --git a/shell/lash.c b/shell/lash.c index dd1d3aa5c..3d54b439e 100644 --- a/shell/lash.c +++ b/shell/lash.c @@ -774,9 +774,9 @@ static int get_command(FILE * source, char *command) return 1; } - prompt_str = setup_prompt_string(shell_context); - if (source == stdin) { + prompt_str = setup_prompt_string(shell_context); + #ifdef BB_FEATURE_SH_COMMAND_EDITING /* ** enable command line editing only while a command line -- 2.25.1