summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2013-10-12 02:51:54 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2013-10-12 02:51:54 (GMT)
commit7985bc109e0d738644094f391d08d9848a2f2b50 (patch)
tree7bc6aa3e04ebd86bbd8516bffe9e3c8b894534b9
parent1d30b3f1f66a0cd179f47082245079ef357b6a66 (diff)
downloadbusybox-7985bc109e0d738644094f391d08d9848a2f2b50.tar.gz
busybox-7985bc109e0d738644094f391d08d9848a2f2b50.tar.bz2
awk: fix length(array)
function old new delta evaluate 3526 3548 +22 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--editors/awk.c10
-rwxr-xr-xtestsuite/awk.tests5
2 files changed, 14 insertions, 1 deletions
diff --git a/editors/awk.c b/editors/awk.c
index 77784df..8848d94 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -2784,8 +2784,16 @@ static var *evaluate(node *op, var *res)
break;
case F_le:
- if (!op1)
+ debug_printf_eval("length: L.s:'%s'\n", L.s);
+ if (!op1) {
L.s = getvar_s(intvar[F0]);
+ debug_printf_eval("length: L.s='%s'\n", L.s);
+ }
+ else if (L.v->type & VF_ARRAY) {
+ R_d = L.v->x.array->nel;
+ debug_printf_eval("length: array_len:%d\n", L.v->x.array->nel);
+ break;
+ }
R_d = strlen(L.s);
break;
diff --git a/testsuite/awk.tests b/testsuite/awk.tests
index 6af6072..a023024 100755
--- a/testsuite/awk.tests
+++ b/testsuite/awk.tests
@@ -274,6 +274,11 @@ testing "awk large integer" \
"2147483647 2147483647 0 2147483648 2147483648 0\n" \
"" ""
+testing "awk length(array)" \
+ "awk 'BEGIN{ A[1]=2; A["qwe"]="asd"; print length(A)}'" \
+ "2\n" \
+ "" ""
+
# testing "description" "command" "result" "infile" "stdin"
exit $FAILCOUNT