diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2014-06-15 22:55:19 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2014-06-15 22:55:19 +0300 |
| commit | 10552910dbf1b61736ac1869e4c5a9f347039918 (patch) | |
| tree | 911cee7a8931399f8eebe45614b1f55d95176d96 /awklib/eg/lib | |
| parent | bc63f89e6cc42d55c6f98cd506d9cf0336f94196 (diff) | |
| parent | ec27289f558e73b40c3d90f599cf392a9d03e864 (diff) | |
| download | egawk-10552910dbf1b61736ac1869e4c5a9f347039918.tar.gz egawk-10552910dbf1b61736ac1869e4c5a9f347039918.tar.bz2 egawk-10552910dbf1b61736ac1869e4c5a9f347039918.zip | |
Merge branch 'gawk-4.1-stable'
Diffstat (limited to 'awklib/eg/lib')
| -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 } |