diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2014-07-12 23:20:39 -0700 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2014-07-12 23:20:39 -0700 |
| commit | de3372f0d98c7137823e7d5630d03429bb77d1f2 (patch) | |
| tree | 389fa3f5f107b3ca1178e6d7a65e66ff3644e29c /awklib/eg/lib/strtonum.awk | |
| parent | ebb6772e9eabeb81e3cc9305a6bec7adf7aad450 (diff) | |
| parent | df2eaea6a92c7d89d604d0a4e885d064678ce3ed (diff) | |
| download | egawk-de3372f0d98c7137823e7d5630d03429bb77d1f2.tar.gz egawk-de3372f0d98c7137823e7d5630d03429bb77d1f2.tar.bz2 egawk-de3372f0d98c7137823e7d5630d03429bb77d1f2.zip | |
Merge branch 'master' into comment
Diffstat (limited to 'awklib/eg/lib/strtonum.awk')
| -rw-r--r-- | awklib/eg/lib/strtonum.awk | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/awklib/eg/lib/strtonum.awk b/awklib/eg/lib/strtonum.awk index a56ab50c..9342e789 100644 --- a/awklib/eg/lib/strtonum.awk +++ b/awklib/eg/lib/strtonum.awk @@ -3,8 +3,9 @@ # # Arnold Robbins, arnold@skeeve.com, Public Domain # February, 2004 +# Revised June, 2014 -function mystrtonum(str, ret, chars, n, i, k, c) +function mystrtonum(str, ret, n, i, k, c) { if (str ~ /^0[0-7]*$/) { # octal @@ -17,7 +18,7 @@ function mystrtonum(str, ret, chars, n, i, k, c) ret = ret * 8 + k } - } else if (str ~ /^0[xX][[:xdigit:]]+/) { + } else if (str ~ /^0[xX][[:xdigit:]]+$/) { # hexadecimal str = substr(str, 3) # lop off leading 0x n = length(str) @@ -25,10 +26,7 @@ function mystrtonum(str, ret, chars, n, i, k, c) for (i = 1; i <= n; i++) { c = substr(str, i, 1) c = tolower(c) - if ((k = index("0123456789", c)) > 0) - k-- # adjust for 1-basing in awk - else if ((k = index("abcdef", c)) > 0) - k += 9 + k = index("123456789abcdef", c) ret = ret * 16 + k } |