From 39925026f6857979cbe603efd42073eb63f8d9de Mon Sep 17 00:00:00 2001 From: Christian Eggers Date: Mon, 29 Jun 2020 17:57:24 +0200 Subject: shell: Fix "read -d ''" behavior With bash's read builtin it is possible to read from a file (e.g. device-tree) until the first '\0' character: IFS= read -r -d '' VARIABLE < file In busybox ash the -d extension is also implemented, but checking the read character for '\0' has to be performed after comparing with the delimiter. Signed-off-by: Christian Eggers Signed-off-by: Denys Vlasenko --- shell/shell_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'shell/shell_common.c') diff --git a/shell/shell_common.c b/shell/shell_common.c index 12c4a073c..42c4c9c97 100644 --- a/shell/shell_common.c +++ b/shell/shell_common.c @@ -209,8 +209,6 @@ shell_builtin_read(struct builtin_read_params *params) } c = buffer[bufpos]; - if (c == '\0') - continue; if (!(read_flags & BUILTIN_READ_RAW)) { if (backslash) { backslash = 0; @@ -225,6 +223,8 @@ shell_builtin_read(struct builtin_read_params *params) } if (c == delim) /* '\n' or -d CHAR */ break; + if (c == '\0') + continue; /* $IFS splitting. NOT done if we run "read" * without variable names (bash compat). -- cgit v1.2.3