[git commit master] hush: remove extra comparison from prev commit
Denys Vlasenko
vda.linux at googlemail.com
Thu May 20 23:25:16 UTC 2010
commit: http://git.busybox.net/busybox/commit/?id=4f2c59b267a4840986c95e22bd302b4216bfb8cf
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
shell/hush.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/shell/hush.c b/shell/hush.c
index 0333395..945077d 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -2647,14 +2647,12 @@ static NOINLINE int expand_vars_to_list(o_string *output, int n, char *arg, char
end = --exp_word;
if (*exp_word != ':') /* not ${var::...} */
beg = bb_strtou(exp_word, &end, 0);
- //bb_error_msg("beg:'%s'=%u end:'%s'", exp_word, beg, end);
+ //bb_error_msg("beg:'%s'=%u end:'%s'", exp_word, beg, end);
if (*end == ':') {
len = bb_strtou(end + 1, &end, 0);
//bb_error_msg("len:%u end:'%s'", len, end);
}
- if (*end == '\0'
- && end != exp_word /* not "${var:}" */
- ) {
+ if (*end == '\0') {
//bb_error_msg("from val:'%s'", val);
if (!val || beg >= strlen(val))
val = "";
--
1.6.3.3
More information about the busybox-cvs
mailing list