From 622f87134be4d14aefac13f3c3013d08ebe7c5d0 Mon Sep 17 00:00:00 2001
From: Kaz Kylheku <kaz@kylheku.com>
Date: Fri, 20 Mar 2015 07:15:34 -0700
Subject: * lib.c (int_str): Workaround for wcstol recognizing the 0x prefix
 when radix is 16. Also, thrown an error if radix is not in the range 0 to 36.

* txr.1: Document int-str's radix range restriction.
---
 ChangeLog |  8 ++++++++
 lib.c     | 28 +++++++++++++++++++++++++++-
 txr.1     |  1 +
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5576dced..ab113ca3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-03-20  Kaz Kylheku  <kaz@kylheku.com>
+
+	* lib.c (int_str): Workaround for wcstol recognizing the 0x prefix when
+	radix is 16. Also, thrown an error if radix is not in the range
+	0 to 36.
+
+	* txr.1: Document int-str's radix range restriction.
+
 2015-03-17  Kaz Kylheku  <kaz@kylheku.com>
 
 	* txr.c (help): Added missing documentation for -e and -p.
diff --git a/lib.c b/lib.c
index 8fd4034d..9be90ea6 100644
--- a/lib.c
+++ b/lib.c
@@ -3036,10 +3036,36 @@ val int_str(val str, val base)
 {
   const wchar_t *wcs = c_str(str);
   wchar_t *ptr;
+  long value;
   cnum b = c_num(default_arg(base, num_fast(10)));
 
+  /* Standard C idiocy: if base is 16, strtoul and its siblings
+     still recognize the 0x prefix. */
+  if (b == 16) {
+    switch (wcs[0]) {
+    case '+':
+    case '-':
+      switch (wcs[1]) {
+      case '0':
+        switch (wcs[2]) {
+        case 'x': case 'X':
+          return zero;
+        }
+      }
+      break;
+    case '0':
+      switch (wcs[1]) {
+      case 'x': case 'X':
+        return zero;
+      }
+      break;
+    }
+  } else if (b < 2 || b > 36) {
+     uw_throwf(error_s, lit("int-str: invalid base ~s"), base, nao);
+  }
+
   /* TODO: detect if we have wcstoll */
-  long value = wcstol(wcs, &ptr, b ? b : 10);
+  value = wcstol(wcs, &ptr, b ? b : 10);
 
   if (value == 0 && ptr == wcs)
     return nil;
diff --git a/txr.1 b/txr.1
index bb8efb4a..6aef1dcd 100644
--- a/txr.1
+++ b/txr.1
@@ -19063,6 +19063,7 @@ The
 .code int-str
 function converts a string of digits in the specified
 radix to an integer value. If the radix isn't specified, it defaults to 10.
+Otherwise it must be an integer in the range 2 to 36.
 For radices above 10, letters of the alphabet
 are used for digits:
 .code A
-- 
cgit v1.2.3