diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-18 11:31:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-18 11:31:37 -0400 |
| commit | 0de815356474912ef5bef9a69f0327a5a93bb2c2 (patch) | |
| tree | 92db8fda09396081f58a0c5fb182e72fbc3fdd50 /common | |
| parent | 9a06eb800c1bdc68aa81fcad6d4f404e12dfff33 (diff) | |
| parent | bf88d2b023063a0c46d7617a4f6897d5d561662d (diff) | |
Merge branch '2019-07-17-master-imports'
- Various FS/disk related fixes with security implications.
- Proper fix for the pci_ep test.
- Assorted bugfixes
- Some MediaTek updates.
- 'env erase' support.
Diffstat (limited to 'common')
| -rw-r--r-- | common/command.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/common/command.c b/common/command.c index e192bb2a61..db25bf54e0 100644 --- a/common/command.c +++ b/common/command.c @@ -356,8 +356,13 @@ int cmd_auto_complete(const char *const prompt, char *buf, int *np, int *colp) int i, j, k, len, seplen, argc; int cnt; char last_char; +#ifdef CONFIG_CMDLINE_PS_SUPPORT + const char *ps_prompt = env_get("PS1"); +#else + const char *ps_prompt = CONFIG_SYS_PROMPT; +#endif - if (strcmp(prompt, CONFIG_SYS_PROMPT) != 0) + if (strcmp(prompt, ps_prompt) != 0) return 0; /* not in normal console */ cnt = strlen(buf); |