diff options
| author | Ron Yorston <rmy@pobox.com> | 2021-06-07 11:34:06 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2021-06-07 11:34:06 +0100 |
| commit | abe872e2a0342357a5608342cb2892e94027b3e7 (patch) | |
| tree | 297cdccf332fbb5e4eb31b1eac643180059f9b5f /shell/shell_common.c | |
| parent | 1f33f42d7bcb019b268d938df643a7a785dc19ab (diff) | |
| parent | 4d983dcddeee94892d3072e84c7c9a01d4696055 (diff) | |
| download | busybox-w32-abe872e2a0342357a5608342cb2892e94027b3e7.tar.gz busybox-w32-abe872e2a0342357a5608342cb2892e94027b3e7.tar.bz2 busybox-w32-abe872e2a0342357a5608342cb2892e94027b3e7.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'shell/shell_common.c')
| -rw-r--r-- | shell/shell_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shell/shell_common.c b/shell/shell_common.c index 1897fee3b..fff356c04 100644 --- a/shell/shell_common.c +++ b/shell/shell_common.c | |||
| @@ -65,7 +65,7 @@ shell_builtin_read(struct builtin_read_params *params) | |||
| 65 | while (*pp) { | 65 | while (*pp) { |
| 66 | if (endofname(*pp)[0] != '\0') { | 66 | if (endofname(*pp)[0] != '\0') { |
| 67 | /* Mimic bash message */ | 67 | /* Mimic bash message */ |
| 68 | bb_error_msg("read: '%s': not a valid identifier", *pp); | 68 | bb_error_msg("read: '%s': bad variable name", *pp); |
| 69 | return (const char *)(uintptr_t)1; | 69 | return (const char *)(uintptr_t)1; |
| 70 | } | 70 | } |
| 71 | pp++; | 71 | pp++; |
| @@ -296,7 +296,7 @@ shell_builtin_read(struct builtin_read_params *params) | |||
| 296 | * without variable names (bash compat). | 296 | * without variable names (bash compat). |
| 297 | * Thus, "read" and "read REPLY" are not the same. | 297 | * Thus, "read" and "read REPLY" are not the same. |
| 298 | */ | 298 | */ |
| 299 | if (!params->opt_d && argv[0]) { | 299 | if (argv[0]) { |
| 300 | /* http://www.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_06_05 */ | 300 | /* http://www.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_06_05 */ |
| 301 | const char *is_ifs = strchr(ifs, c); | 301 | const char *is_ifs = strchr(ifs, c); |
| 302 | if (startword && is_ifs) { | 302 | if (startword && is_ifs) { |