aboutsummaryrefslogtreecommitdiffstats
path: root/builtin.c
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2015-01-07 22:32:43 +0200
committerArnold D. Robbins <arnold@skeeve.com>2015-01-07 22:32:43 +0200
commit128a3e884d9541ec5b96c02a19db38ac3c404bf1 (patch)
tree58d8abcaafcb4f1e036e29c24bcd87ea5c0685e8 /builtin.c
parentdaf063f72bb0b889149dea00794e8e889fdefa55 (diff)
parent2ff844d50c0ecbc4dc660cf7e8989476f56fb3e7 (diff)
downloadegawk-128a3e884d9541ec5b96c02a19db38ac3c404bf1.tar.gz
egawk-128a3e884d9541ec5b96c02a19db38ac3c404bf1.tar.bz2
egawk-128a3e884d9541ec5b96c02a19db38ac3c404bf1.zip
Merge branch 'master' into wasted-byte
Diffstat (limited to 'builtin.c')
-rw-r--r--builtin.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/builtin.c b/builtin.c
index 42058ec6..befe471b 100644
--- a/builtin.c
+++ b/builtin.c
@@ -3,7 +3,7 @@
*/
/*
- * Copyright (C) 1986, 1988, 1989, 1991-2014 the Free Software Foundation, Inc.
+ * Copyright (C) 1986, 1988, 1989, 1991-2015 the Free Software Foundation, Inc.
*
* This file is part of GAWK, the GNU implementation of the
* AWK Programming Language.
@@ -904,7 +904,10 @@ check_pos:
case '*':
if (cur == NULL)
break;
- if (! do_traditional && isdigit((unsigned char) *s1)) {
+ if (! do_traditional && used_dollar && ! isdigit((unsigned char) *s1)) {
+ fatal(_("fatal: must use `count$' on all formats or none"));
+ break; /* silence warnings */
+ } else if (! do_traditional && isdigit((unsigned char) *s1)) {
int val = 0;
for (; n0 > 0 && *s1 && isdigit((unsigned char) *s1); s1++, n0--) {