diff options
| author | Eric Blake <eblake@redhat.com> | 2010-02-25 08:36:39 -0700 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2010-02-25 08:54:49 -0700 |
| commit | 9a6c97eb2965adf868b26acf0ace0094dfe4cada (patch) | |
| tree | 05352c9513557ef84b38c674f0d906b57ae1ff95 | |
| parent | 0b5bd805bda0346dd6ed777826da39d5571115a0 (diff) | |
| download | coreutils-9a6c97eb2965adf868b26acf0ace0094dfe4cada.tar.xz | |
expr: clarify error message
* src/expr.c (eval4, eval3): Clarify that expr expects integers,
and not the broader category of numbers.
* tests/misc/expr: Update test accordingly.
Suggested by Dan Jacobson.
| -rw-r--r-- | src/expr.c | 4 | ||||
| -rwxr-xr-x | tests/misc/expr | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/expr.c b/src/expr.c index 048c59679..1ebb4b9d9 100644 --- a/src/expr.c +++ b/src/expr.c @@ -787,7 +787,7 @@ eval4 (bool evaluate) if (evaluate) { if (!toarith (l) || !toarith (r)) - error (EXPR_INVALID, 0, _("non-numeric argument")); + error (EXPR_INVALID, 0, _("non-integer argument")); if (fxn != multiply && mpz_sgn (r->u.i) == 0) error (EXPR_INVALID, 0, _("division by zero")); ((fxn == multiply ? mpz_mul @@ -824,7 +824,7 @@ eval3 (bool evaluate) if (evaluate) { if (!toarith (l) || !toarith (r)) - error (EXPR_INVALID, 0, _("non-numeric argument")); + error (EXPR_INVALID, 0, _("non-integer argument")); (fxn == plus ? mpz_add : mpz_sub) (l->u.i, l->u.i, r->u.i); } freev (r); diff --git a/tests/misc/expr b/tests/misc/expr index 10dd1c5e5..6c4280f31 100755 --- a/tests/misc/expr +++ b/tests/misc/expr @@ -70,7 +70,7 @@ my @Tests = # This erroneously succeeded and output `3' before 2.0.12. - ['fail-a', '3 + -', {ERR => "$prog: non-numeric argument\n"}, + ['fail-a', '3 + -', {ERR => "$prog: non-integer argument\n"}, {EXIT => 2}], # This erroneously succeeded before 5.3.1. |