From 0c8608f81bec2028d2f752f44ae37ef05d02271b Mon Sep 17 00:00:00 2001
From: hyung-hwan <hyunghwan.chung@gmail.com>
Date: Mon, 18 Dec 2017 07:20:02 +0000
Subject: [PATCH] added the endptr parameter to various string to number
 conversion functions

---
 qse/cmd/awk/awk.c          |   4 +-
 qse/cmd/http/httpd.c       |   6 +-
 qse/cmd/http/ursd.c        |   2 +-
 qse/cmd/sed/sed.c          |   4 +-
 qse/cmd/xli/xli.c          |   4 +-
 qse/include/qse/cmn/str.h  | 374 ++++++++++++++++++++++++-------------
 qse/lib/cmn/str-cnv.c      | 200 +++++++++++++-------
 qse/lib/http/httpd-cgi.c   |   3 +-
 qse/lib/http/httpd-proxy.c |   2 +-
 qse/lib/rad/raddic.c       |  31 +--
 qse/lib/si/nwif-cfg.c      |   4 +-
 qse/lib/si/sinfo.c         |   6 +-
 12 files changed, 415 insertions(+), 225 deletions(-)

diff --git a/qse/cmd/awk/awk.c b/qse/cmd/awk/awk.c
index ce09fc47..1a08162d 100644
--- a/qse/cmd/awk/awk.c
+++ b/qse/cmd/awk/awk.c
@@ -637,7 +637,7 @@ static int comparg (int argc, qse_char_t* argv[], struct arg_t* arg)
 
 			case QSE_T('m'):
 			{
-				arg->memlimit = qse_strtoulong (opt.arg, 10);
+				arg->memlimit = qse_strtoulong (opt.arg, 10, QSE_NULL);
 				break;
 			}
 
@@ -650,7 +650,7 @@ static int comparg (int argc, qse_char_t* argv[], struct arg_t* arg)
 #if defined(QSE_BUILD_DEBUG)
 			case QSE_T('X'):
 			{
-				arg->failmalloc = qse_strtoulong (opt.arg, 10);
+				arg->failmalloc = qse_strtoulong (opt.arg, 10, QSE_NULL);
 				break;
 			}
 #endif
diff --git a/qse/cmd/http/httpd.c b/qse/cmd/http/httpd.c
index 15a34e8f..42c84415 100644
--- a/qse/cmd/http/httpd.c
+++ b/qse/cmd/http/httpd.c
@@ -1188,7 +1188,7 @@ static int get_intercept (const qse_xli_str_t* v)
 static int get_integer (const qse_xli_str_t* v)
 {
 /* TODO: be more strict */
-	return qse_strxtoi (v->ptr, v->len, 10);
+	return qse_strxtoi (v->ptr, v->len, 10, QSE_NULL);
 }
 
 static int parse_dns_query_types (qse_httpd_t* httpd, const qse_xli_str_t* str)
@@ -2046,7 +2046,7 @@ static qse_httpd_server_t* attach_server (qse_httpd_t* httpd, int num, qse_xli_l
 	else
 	{
 		unsigned int v;
-		v = qse_strtoui (((qse_xli_str_t*)pair->val)->ptr, 10);
+		v = qse_strtoui (((qse_xli_str_t*)pair->val)->ptr, 10, QSE_NULL);
 		if (v <= 0) v = 256;
 		dope.backlog_size = v;
 	}
@@ -2409,7 +2409,7 @@ static void set_limit (qse_httpd_t* httpd, const qse_char_t* name, int what)
 				if (qse_strxcmp (str, len, QSE_T("unlimited")) == 0)
 					lim.rlim_cur = RLIM_INFINITY;
 				else
-					lim.rlim_cur = qse_strtoui (((qse_xli_str_t*)pair->val)->ptr, 10);
+					lim.rlim_cur = qse_strtoui (((qse_xli_str_t*)pair->val)->ptr, 10, QSE_NULL);
 				if (setrlimit (what, &lim) <= -1)
 				{
 					/* TODO: warning */
diff --git a/qse/cmd/http/ursd.c b/qse/cmd/http/ursd.c
index e08d4183..0104cb96 100644
--- a/qse/cmd/http/ursd.c
+++ b/qse/cmd/http/ursd.c
@@ -963,7 +963,7 @@ static int httpd_main (int argc, qse_char_t* argv[])
 	signal (SIGPIPE, SIG_IGN);
 #endif
 
-	if (init_ursd (&ursd, qse_strtoi(argv[2], 10), argv[1], argv[3]) <= -1) goto oops;
+	if (init_ursd (&ursd, qse_strtoi(argv[2], 10, QSE_NULL), argv[1], argv[3]) <= -1) goto oops;
 	ursd_inited = 1;
 
 	while (!g_stop_requested)
diff --git a/qse/cmd/sed/sed.c b/qse/cmd/sed/sed.c
index 96300fde..96a7bcd1 100644
--- a/qse/cmd/sed/sed.c
+++ b/qse/cmd/sed/sed.c
@@ -362,7 +362,7 @@ static int handle_args (int argc, qse_char_t* argv[])
 #endif
  
 			case QSE_T('m'):
-				g_memlimit = qse_strtoulong (opt.arg, 10);
+				g_memlimit = qse_strtoulong (opt.arg, 10, QSE_NULL);
 				break;
 
 			case QSE_T('w'):
@@ -371,7 +371,7 @@ static int handle_args (int argc, qse_char_t* argv[])
 
 #if defined(QSE_BUILD_DEBUG)
 			case QSE_T('X'):
-				g_failmalloc = qse_strtoulong (opt.arg, 10);
+				g_failmalloc = qse_strtoulong (opt.arg, 10, QSE_NULL);
 				break;
 #endif
 
diff --git a/qse/cmd/xli/xli.c b/qse/cmd/xli/xli.c
index 1df658a7..bbb77d8f 100644
--- a/qse/cmd/xli/xli.c
+++ b/qse/cmd/xli/xli.c
@@ -296,12 +296,12 @@ static int handle_args (int argc, qse_char_t* argv[])
 				break;
 
 			case QSE_T('m'):
-				g_memlimit = qse_strtoulong (opt.arg, 10);
+				g_memlimit = qse_strtoulong (opt.arg, 10, QSE_NULL);
 				break;
 
 #if defined(QSE_BUILD_DEBUG)
 			case QSE_T('X'):
-				g_failmalloc = qse_strtoulong (opt.arg, 10);
+				g_failmalloc = qse_strtoulong (opt.arg, 10, QSE_NULL);
 				break;
 #endif
 
diff --git a/qse/include/qse/cmn/str.h b/qse/include/qse/cmn/str.h
index 85e46f1b..f543e405 100644
--- a/qse/include/qse/cmn/str.h
+++ b/qse/include/qse/cmn/str.h
@@ -167,7 +167,7 @@ typedef qse_wchar_t* (*qse_wcssubst_t) (
 	 (c>=QSE_T('a') && c<=QSE_T('z'))? ((c-QSE_T('a')+10<base)? (c-QSE_T('a')+10): base): base)
 
 /* qse_strtonum (const qse_char_t* nptr, qse_char_t** endptr, int base) */
-#define QSE_STRTONUM(value,nptr,endptr,base) do {\
+#define QSE_STRTONUM(value,nptr,endptr,base,allowneg) do {\
 	int __ston_f = 0, __ston_v; \
 	const qse_char_t* __ston_ptr = nptr; \
 	int __ston_base = base; \
@@ -175,7 +175,7 @@ typedef qse_wchar_t* (*qse_wcssubst_t) (
 		qse_char_t __ston_c = *__ston_ptr; \
 		if (__ston_c == QSE_T(' ') || \
 		    __ston_c == QSE_T('\t')) { __ston_ptr++; continue; } \
-		else if (__ston_c == QSE_T('-')) { __ston_f++; __ston_ptr++; } \
+		else if ((allowneg) && __ston_c == QSE_T('-')) { __ston_f++; __ston_ptr++; } \
 		else if (__ston_c == QSE_T('+')) { __ston_ptr++; } \
 		break; \
 	} \
@@ -194,7 +194,7 @@ typedef qse_wchar_t* (*qse_wcssubst_t) (
 } while(0)
 
 /* qse_strxtonum (const qse_char_t* nptr, qse_size_t len, qse_char_char** endptr, int base) */
-#define QSE_STRXTONUM(value,nptr,len,endptr,base) do {\
+#define QSE_STRXTONUM(value,nptr,len,endptr,base,allowneg) do {\
 	int __ston_f = 0, __ston_v; \
 	const qse_char_t* __ston_ptr = nptr; \
 	const qse_char_t* __ston_end = __ston_ptr + len; \
@@ -204,7 +204,7 @@ typedef qse_wchar_t* (*qse_wcssubst_t) (
 		if (__ston_c == QSE_T(' ') || __ston_c == QSE_T('\t')) { \
 			__ston_ptr++; continue; \
 		} \
-		else if (__ston_c == QSE_T('-')) { __ston_f++; __ston_ptr++; } \
+		else if (allowneg && __ston_c == QSE_T('-')) { __ston_f++; __ston_ptr++; } \
 		else if (__ston_c == QSE_T('+')) { __ston_ptr++; } \
 		break; \
 	} \
@@ -229,7 +229,7 @@ typedef qse_wchar_t* (*qse_wcssubst_t) (
 	 (c>=QSE_MT('a') && c<=QSE_MT('z'))? ((c-QSE_MT('a')+10<base)? (c-QSE_MT('a')+10): base): base)
 
 /* qse_strtonum (const qse_mchar_t* nptr, qse_mchar_t** endptr, int base) */
-#define QSE_MBSTONUM(value,nptr,endptr,base) do {\
+#define QSE_MBSTONUM(value,nptr,endptr,base,allowneg) do {\
 	int __ston_f = 0, __ston_v; \
 	const qse_mchar_t* __ston_ptr = nptr; \
 	int __ston_base = base; \
@@ -237,7 +237,7 @@ typedef qse_wchar_t* (*qse_wcssubst_t) (
 		qse_mchar_t __ston_c = *__ston_ptr; \
 		if (__ston_c == QSE_MT(' ') || \
 		    __ston_c == QSE_MT('\t')) { __ston_ptr++; continue; } \
-		else if (__ston_c == QSE_MT('-')) { __ston_f++; __ston_ptr++; } \
+		else if ((allowneg) && __ston_c == QSE_MT('-')) { __ston_f++; __ston_ptr++; } \
 		else if (__ston_c == QSE_MT('+')) { __ston_ptr++; } \
 		break; \
 	} \
@@ -256,7 +256,7 @@ typedef qse_wchar_t* (*qse_wcssubst_t) (
 } while(0)
 
 /* qse_strxtonum (const qse_mchar_t* nptr, qse_size_t len, qse_mchar_t** endptr, int base) */
-#define QSE_MBSXTONUM(value,nptr,len,endptr,base) do {\
+#define QSE_MBSXTONUM(value,nptr,len,endptr,base,allowneg) do {\
 	int __ston_f = 0, __ston_v; \
 	const qse_mchar_t* __ston_ptr = nptr; \
 	const qse_mchar_t* __ston_end = __ston_ptr + len; \
@@ -266,7 +266,7 @@ typedef qse_wchar_t* (*qse_wcssubst_t) (
 		if (__ston_c == QSE_MT(' ') || __ston_c == QSE_MT('\t')) { \
 			__ston_ptr++; continue; \
 		} \
-		else if (__ston_c == QSE_MT('-')) { __ston_f++; __ston_ptr++; } \
+		else if ((allowneg) && __ston_c == QSE_MT('-')) { __ston_f++; __ston_ptr++; } \
 		else if (__ston_c == QSE_MT('+')) { __ston_ptr++; } \
 		break; \
 	} \
@@ -291,7 +291,7 @@ typedef qse_wchar_t* (*qse_wcssubst_t) (
 	 (c>=QSE_WT('a') && c<=QSE_WT('z'))? ((c-QSE_WT('a')+10<base)? (c-QSE_WT('a')+10): base): base)
 
 /* qse_strtonum (const qse_wchar_t* nptr, qse_wchar_t** endptr, int base) */
-#define QSE_WCSTONUM(value,nptr,endptr,base) do {\
+#define QSE_WCSTONUM(value,nptr,endptr,base,allowneg) do {\
 	int __ston_f = 0, __ston_v; \
 	const qse_wchar_t* __ston_ptr = nptr; \
 	int __ston_base = base; \
@@ -299,7 +299,7 @@ typedef qse_wchar_t* (*qse_wcssubst_t) (
 		qse_wchar_t __ston_c = *__ston_ptr; \
 		if (__ston_c == QSE_WT(' ') || \
 		    __ston_c == QSE_WT('\t')) { __ston_ptr++; continue; } \
-		else if (__ston_c == QSE_WT('-')) { __ston_f++; __ston_ptr++; } \
+		else if ((allowneg) && __ston_c == QSE_WT('-')) { __ston_f++; __ston_ptr++; } \
 		else if (__ston_c == QSE_WT('+')) { __ston_ptr++; } \
 		break; \
 	} \
@@ -318,7 +318,7 @@ typedef qse_wchar_t* (*qse_wcssubst_t) (
 } while(0)
 
 /* qse_strxtonum (const qse_wchar_t* nptr, qse_size_t len, qse_wchar_t** endptr, int base) */
-#define QSE_WCSXTONUM(value,nptr,len,endptr,base) do {\
+#define QSE_WCSXTONUM(value,nptr,len,endptr,base,allowneg) do {\
 	int __ston_f = 0, __ston_v; \
 	const qse_wchar_t* __ston_ptr = nptr; \
 	const qse_wchar_t* __ston_end = __ston_ptr + len; \
@@ -328,7 +328,7 @@ typedef qse_wchar_t* (*qse_wcssubst_t) (
 		if (__ston_c == QSE_WT(' ') || __ston_c == QSE_WT('\t')) { \
 			__ston_ptr++; continue; \
 		} \
-		else if (__ston_c == QSE_WT('-')) { __ston_f++; __ston_ptr++; } \
+		else if ((allowneg) && __ston_c == QSE_WT('-')) { __ston_f++; __ston_ptr++; } \
 		else if (__ston_c == QSE_WT('+')) { __ston_ptr++; } \
 		break; \
 	} \
@@ -2052,226 +2052,332 @@ QSE_EXPORT qse_wchar_t* qse_wcsxrpbrk (
  * string conversion
  */
 QSE_EXPORT int qse_mbstoi (
-	const qse_mchar_t* str,
-	int               base
+	const qse_mchar_t*  str,
+	int                 base,
+	const qse_mchar_t** end
 );
 
 QSE_EXPORT long qse_mbstol (
-	const qse_mchar_t* str,
-	int               base
+	const qse_mchar_t*  str,
+	int                 base,
+	const qse_mchar_t** end
 );
 
 QSE_EXPORT unsigned int qse_mbstoui (
-	const qse_mchar_t* str,
-	int               base
+	const qse_mchar_t*  str,
+	int                 base,
+	const qse_mchar_t** end
 );
 
 QSE_EXPORT unsigned long qse_mbstoul (
-	const qse_mchar_t* str,
-	int               base
+	const qse_mchar_t*  str,
+	int                 base,
+	const qse_mchar_t** end
 );
+/* ----- */
 
 QSE_EXPORT int qse_mbsxtoi (
-	const qse_mchar_t* str,
-	qse_size_t        len,
-	int               base
+	const qse_mchar_t*  str,
+	qse_size_t          len,
+	int                 base,
+	const qse_mchar_t** end
 );
 
 QSE_EXPORT long qse_mbsxtol (
-	const qse_mchar_t* str,
-	qse_size_t        len,
-	int               base
+	const qse_mchar_t*  str,
+	qse_size_t          len,
+	int                 base,
+	const qse_mchar_t** end
 );
 
 QSE_EXPORT unsigned int qse_mbsxtoui (
-	const qse_mchar_t* str,
-	qse_size_t        len,
-	int               base
+	const qse_mchar_t*  str,
+	qse_size_t          len,
+	int                 base,
+	const qse_mchar_t** end
 );
 
 QSE_EXPORT unsigned long qse_mbsxtoul (
-	const qse_mchar_t* str,
-	qse_size_t        len,
-	int               base
+	const qse_mchar_t*  str,
+	qse_size_t          len,
+	int                 base,
+	const qse_mchar_t** end
 );
 
+/* ----- */
+
 QSE_EXPORT qse_int_t qse_mbstoint (
-	const qse_mchar_t* str,
-	int               base
+	const qse_mchar_t*  str,
+	int                 base,
+	const qse_mchar_t** end
 );
 
 QSE_EXPORT qse_long_t qse_mbstolong (
-	const qse_mchar_t* str,
-	int               base
+	const qse_mchar_t*  str,
+	int                 base,
+	const qse_mchar_t** end
 );
 
+QSE_EXPORT qse_intmax_t qse_mbstointmax (
+	const qse_mchar_t*  str,
+	int                 base,
+	const qse_mchar_t** end
+);
+
+/* ----- */
+
 QSE_EXPORT qse_uint_t qse_mbstouint (
-	const qse_mchar_t* str,
-	int               base
+	const qse_mchar_t*  str,
+	int                 base,
+	const qse_mchar_t** end
 );
 
 QSE_EXPORT qse_ulong_t qse_mbstoulong (
-	const qse_mchar_t* str,
-	int               base
+	const qse_mchar_t*  str,
+	int                 base,
+	const qse_mchar_t** end
 );
 
+QSE_EXPORT qse_uintmax_t qse_mbstouintmax (
+	const qse_mchar_t*  str,
+	int                 base,
+	const qse_mchar_t** end
+);
+
+/* ----- */
+
 QSE_EXPORT qse_int_t qse_mbsxtoint (
-	const qse_mchar_t* str, 
-	qse_size_t        len,
-	int               base
+	const qse_mchar_t*  str, 
+	qse_size_t          len,
+	int                 base,
+	const qse_mchar_t** end
 );
 
 QSE_EXPORT qse_long_t qse_mbsxtolong (
-	const qse_mchar_t* str,
-	qse_size_t        len,
-	int               base
+	const qse_mchar_t*  str,
+	qse_size_t          len,
+	int                 base,
+	const qse_mchar_t** end
 );
 
+QSE_EXPORT qse_intmax_t qse_mbsxtointmax (
+	const qse_mchar_t*  str,
+	qse_size_t          len,
+	int                 base,
+	const qse_mchar_t** end
+);
+
+/* ----- */
+
 QSE_EXPORT qse_uint_t qse_mbsxtouint (
-	const qse_mchar_t* str,
-	qse_size_t        len,
-	int               base
+	const qse_mchar_t*  str,
+	qse_size_t          len,
+	int                 base,
+	const qse_mchar_t** end
 );
 
 QSE_EXPORT qse_ulong_t qse_mbsxtoulong (
-	const qse_mchar_t* str,
-	qse_size_t        len,
-	int               base
+	const qse_mchar_t*  str,
+	qse_size_t          len,
+	int                 base,
+	const qse_mchar_t** end
 );
 
-
+QSE_EXPORT qse_uintmax_t qse_mbsxtouintmax (
+	const qse_mchar_t*  str,
+	qse_size_t          len,
+	int                 base,
+	const qse_mchar_t** end
+);
+/* ------------------------------------------------------ */
 
 QSE_EXPORT int qse_wcstoi (
-	const qse_wchar_t* str,
-	int               base
+	const qse_wchar_t*  str,
+	int                 base,
+	const qse_wchar_t** end
 );
 
 QSE_EXPORT long qse_wcstol (
-	const qse_wchar_t* str,
-	int               base
+	const qse_wchar_t*  str,
+	int                 base,
+	const qse_wchar_t** end
 );
 
 QSE_EXPORT unsigned int qse_wcstoui (
-	const qse_wchar_t* str,
-	int               base
+	const qse_wchar_t*  str,
+	int                 base,
+	const qse_wchar_t** end
 );
 
 QSE_EXPORT unsigned long qse_wcstoul (
-	const qse_wchar_t* str,
-	int               base
+	const qse_wchar_t*  str,
+	int                 base,
+	const qse_wchar_t** end
 );
+/* ----- */
 
 QSE_EXPORT int qse_wcsxtoi (
-	const qse_wchar_t* str,
-	qse_size_t        len,
-	int               base
+	const qse_wchar_t*  str,
+	qse_size_t          len,
+	int                 base,
+	const qse_wchar_t** end
 );
 
 QSE_EXPORT long qse_wcsxtol (
-	const qse_wchar_t* str,
-	qse_size_t        len,
-	int               base
+	const qse_wchar_t*  str,
+	qse_size_t          len,
+	int                 base,
+	const qse_wchar_t** end
 );
 
 QSE_EXPORT unsigned int qse_wcsxtoui (
-	const qse_wchar_t* str,
-	qse_size_t        len,
-	int               base
+	const qse_wchar_t*  str,
+	qse_size_t          len,
+	int                 base,
+	const qse_wchar_t** end
 );
 
 QSE_EXPORT unsigned long qse_wcsxtoul (
-	const qse_wchar_t* str,
-	qse_size_t        len,
-	int               base
+	const qse_wchar_t*  str,
+	qse_size_t          len,
+	int                 base,
+	const qse_wchar_t** end
 );
-
+/* ----- */
 QSE_EXPORT qse_int_t qse_wcstoint (
-	const qse_wchar_t* str,
-	int               base
+	const qse_wchar_t*  str,
+	int                 base,
+	const qse_wchar_t** end
 );
 
 QSE_EXPORT qse_long_t qse_wcstolong (
-	const qse_wchar_t* str,
-	int               base
+	const qse_wchar_t*  str,
+	int                 base,
+	const qse_wchar_t** end
 );
 
+QSE_EXPORT qse_intmax_t qse_wcstointmax (
+	const qse_wchar_t*  str,
+	int                 base,
+	const qse_wchar_t** end
+);
+/* ----- */
 QSE_EXPORT qse_uint_t qse_wcstouint (
-	const qse_wchar_t* str,
-	int               base
+	const qse_wchar_t*  str,
+	int                 base,
+	const qse_wchar_t** end
 );
 
 QSE_EXPORT qse_ulong_t qse_wcstoulong (
-	const qse_wchar_t* str,
-	int               base
+	const qse_wchar_t*  str,
+	int                 base,
+	const qse_wchar_t** end
 );
 
+QSE_EXPORT qse_uintmax_t qse_wcstouintmax (
+	const qse_wchar_t*  str,
+	int                 base,
+	const qse_wchar_t** end
+);
+/* ----- */
 QSE_EXPORT qse_int_t qse_wcsxtoint (
-	const qse_wchar_t* str, 
-	qse_size_t        len,
-	int               base
+	const qse_wchar_t*  str, 
+	qse_size_t          len,
+	int                 base,
+	const qse_wchar_t** end
 );
 
 QSE_EXPORT qse_long_t qse_wcsxtolong (
-	const qse_wchar_t* str,
-	qse_size_t        len,
-	int               base
+	const qse_wchar_t*  str,
+	qse_size_t          len,
+	int                 base,
+	const qse_wchar_t** end
 );
 
+QSE_EXPORT qse_intmax_t qse_wcsxtointmax (
+	const qse_wchar_t*  str,
+	qse_size_t          len,
+	int                 base,
+	const qse_wchar_t** end
+);
+
+/* ----- */
 QSE_EXPORT qse_uint_t qse_wcsxtouint (
-	const qse_wchar_t* str,
-	qse_size_t         len,
-	int                base
+	const qse_wchar_t*  str,
+	qse_size_t          len,
+	int                 base,
+	const qse_wchar_t** end
 );
 
 QSE_EXPORT qse_ulong_t qse_wcsxtoulong (
-	const qse_wchar_t* str,
-	qse_size_t         len,
-	int                base
+	const qse_wchar_t*  str,
+	qse_size_t          len,
+	int                 base,
+	const qse_wchar_t** end
+);
+
+QSE_EXPORT qse_uintmax_t qse_wcsxtouintmax (
+	const qse_wchar_t*  str,
+	qse_size_t          len,
+	int                 base,
+	const qse_wchar_t** end
 );
 
 #if defined(QSE_CHAR_IS_MCHAR)
 
-#	define qse_strtoi(str,base) qse_mbstoi(str,base)
-#	define qse_strtol(str,base) qse_mbstol(str,base)
-#	define qse_strtoui(str,base) qse_mbstoui(str,base)
-#	define qse_strtoul(str,base) qse_mbstoul(str,base)
-
-#	define qse_strxtoi(str,len,base) qse_mbsxtoi(str,len,base)
-#	define qse_strxtol(str,len,base) qse_mbsxtol(str,len,base)
-#	define qse_strxtoui(str,len,base) qse_mbsxtoui(str,len,base)
-#	define qse_strxtoul(str,len,base) qse_mbsxtoul(str,len,base)
-
-#	define qse_strtoint(str,base) qse_mbstoint(str,base)
-#	define qse_strtolong(str,base) qse_mbstolong(str,base)
-#	define qse_strtouint(str,base) qse_mbstouint(str,base)
-#	define qse_strtoulong(str,base) qse_mbstoulong(str,base)
-
-#	define qse_strxtoint(str,len,base) qse_mbsxtoint(str,len,base)
-#	define qse_strxtolong(str,len,base) qse_mbsxtolong(str,len,base)
-#	define qse_strxtouint(str,len,base) qse_mbsxtouint(str,len,base)
-#	define qse_strxtoulong(str,len,base) qse_mbsxtoulong(str,len,base)
+#	define qse_strtoi(str,base,end) qse_mbstoi(str,base,end)
+#	define qse_strtol(str,base,end) qse_mbstol(str,base,end)
+#	define qse_strtoui(str,base,end) qse_mbstoui(str,base,end)
+#	define qse_strtoul(str,base,end) qse_mbstoul(str,base,end)
+/* ----- */
+#	define qse_strxtoi(str,len,base,end) qse_mbsxtoi(str,len,base,end)
+#	define qse_strxtol(str,len,base,end) qse_mbsxtol(str,len,base,end)
+#	define qse_strxtoui(str,len,base,end) qse_mbsxtoui(str,len,base,end)
+#	define qse_strxtoul(str,len,base,end) qse_mbsxtoul(str,len,base,end)
+/* ----- */
+#	define qse_strtoint(str,base,end) qse_mbstoint(str,base,end)
+#	define qse_strtolong(str,base,end) qse_mbstolong(str,base,end)
+#	define qse_strtointmax(str,base,end) qse_mbstointmax(str,base,end)
+/* ----- */
+#	define qse_strtouint(str,base,end) qse_mbstouint(str,base,end)
+#	define qse_strtoulong(str,base,end) qse_mbstoulong(str,base,end)
+#	define qse_strtouintmax(str,base,end) qse_mbstouintmax(str,base,end)
+/* ----- */
+#	define qse_strxtoint(str,len,base,end) qse_mbsxtoint(str,len,base,end)
+#	define qse_strxtolong(str,len,base,end) qse_mbsxtolong(str,len,base,end)
+#	define qse_strxtointmax(str,len,base,end) qse_mbsxtointmax(str,len,base,end)
+/* ----- */
+#	define qse_strxtouint(str,len,base,end) qse_mbsxtouint(str,len,base,end)
+#	define qse_strxtoulong(str,len,base,end) qse_mbsxtoulong(str,len,base,end)
+#	define qse_strxtouintmax(str,len,base,end) qse_mbsxtouintmax(str,len,base,end)
 
 #else
 
-#	define qse_strtoi(str,base) qse_wcstoi(str,base)
-#	define qse_strtol(str,base) qse_wcstol(str,base)
-#	define qse_strtoui(str,base) qse_wcstoui(str,base)
-#	define qse_strtoul(str,base) qse_wcstoul(str,base)
-
-#	define qse_strxtoi(str,len,base) qse_wcsxtoi(str,len,base)
-#	define qse_strxtol(str,len,base) qse_wcsxtol(str,len,base)
-#	define qse_strxtoui(str,len,base) qse_wcsxtoui(str,len,base)
-#	define qse_strxtoul(str,len,base) qse_wcsxtoul(str,len,base)
-
-#	define qse_strtoint(str,base) qse_wcstoint(str,base)
-#	define qse_strtolong(str,base) qse_wcstolong(str,base)
-#	define qse_strtouint(str,base) qse_wcstouint(str,base)
-#	define qse_strtoulong(str,base) qse_wcstoulong(str,base)
-
-#	define qse_strxtoint(str,len,base) qse_wcsxtoint(str,len,base)
-#	define qse_strxtolong(str,len,base) qse_wcsxtolong(str,len,base)
-#	define qse_strxtouint(str,len,base) qse_wcsxtouint(str,len,base)
-#	define qse_strxtoulong(str,len,base) qse_wcsxtoulong(str,len,base)
+#	define qse_strtoi(str,base,end) qse_wcstoi(str,base,end)
+#	define qse_strtol(str,base,end) qse_wcstol(str,base,end)
+#	define qse_strtoui(str,base,end) qse_wcstoui(str,base,end)
+#	define qse_strtoul(str,base,end) qse_wcstoul(str,base,end)
+/* ----- */
+#	define qse_strxtoi(str,len,base,end) qse_wcsxtoi(str,len,base,end)
+#	define qse_strxtol(str,len,base,end) qse_wcsxtol(str,len,base,end)
+#	define qse_strxtoui(str,len,base,end) qse_wcsxtoui(str,len,base,end)
+#	define qse_strxtoul(str,len,base,end) qse_wcsxtoul(str,len,base,end)
+/* ----- */
+#	define qse_strtoint(str,base,end) qse_wcstoint(str,base,end)
+#	define qse_strtolong(str,base,end) qse_wcstolong(str,base,end)
+#	define qse_strtointmax(str,base,end) qse_wcstointmax(str,base,end)
+/* ----- */
+#	define qse_strtouint(str,base,end) qse_wcstouint(str,base,end)
+#	define qse_strtoulong(str,base,end) qse_wcstoulong(str,base,end)
+#	define qse_strtouintmax(str,base,end) qse_wcstouintmax(str,base,end)
+/* ----- */
+#	define qse_strxtoint(str,len,base,end) qse_wcsxtoint(str,len,base,end)
+#	define qse_strxtolong(str,len,base,end) qse_wcsxtolong(str,len,base,end)
+#	define qse_strxtointmax(str,len,base,end) qse_wcsxtointmax(str,len,base,end)
+/* ----- */
+#	define qse_strxtouint(str,len,base,end) qse_wcsxtouint(str,len,base,end)
+#	define qse_strxtoulong(str,len,base,end) qse_wcsxtoulong(str,len,base,end)
+#	define qse_strxtouintmax(str,len,base,end) qse_wcsxtouintmax(str,len,base,end)
 
 #endif
 
@@ -2461,12 +2567,12 @@ QSE_EXPORT qse_size_t qse_wcsrev (
 	qse_wchar_t* str
 );
 
-QSE_EXPORT qse_size_t qse_mbsxrev (	
+QSE_EXPORT qse_size_t qse_mbsxrev (
 	qse_mchar_t* str,
 	qse_size_t   len
 );
 
-QSE_EXPORT qse_size_t qse_wcsxrev (	
+QSE_EXPORT qse_size_t qse_wcsxrev (
 	qse_wchar_t* str,
 	qse_size_t   len
 );
diff --git a/qse/lib/cmn/str-cnv.c b/qse/lib/cmn/str-cnv.c
index 5ede4eac..58c7411f 100644
--- a/qse/lib/cmn/str-cnv.c
+++ b/qse/lib/cmn/str-cnv.c
@@ -32,231 +32,303 @@
 /*---------------------------------------------------------------
  * multi-byte string to number conversion 
  *---------------------------------------------------------------*/
-int qse_mbstoi (const qse_mchar_t* mbs, int base)
+int qse_mbstoi (const qse_mchar_t* mbs, int base, const qse_mchar_t** end)
 {
 	int v;
-	QSE_MBSTONUM (v, mbs, QSE_NULL, base);
+	
+	QSE_MBSTONUM (v, mbs, end, base, 1);
 	return v;
 }
 
-long qse_mbstol (const qse_mchar_t* mbs, int base)
+long qse_mbstol (const qse_mchar_t* mbs, int base, const qse_mchar_t** end)
 {
 	long v;
-	QSE_MBSTONUM (v, mbs, QSE_NULL, base);
+	QSE_MBSTONUM (v, mbs, end, base, 1);
 	return v;
 }
 
-unsigned int qse_mbstoui (const qse_mchar_t* mbs, int base)
+unsigned int qse_mbstoui (const qse_mchar_t* mbs, int base, const qse_mchar_t** end)
 {
 	unsigned int v;
-	QSE_MBSTONUM (v, mbs, QSE_NULL, base);
+	QSE_MBSTONUM (v, mbs, end, base, 0);
 	return v;
 }
 
-unsigned long qse_mbstoul (const qse_mchar_t* mbs, int base)
+unsigned long qse_mbstoul (const qse_mchar_t* mbs, int base, const qse_mchar_t** end)
 {
 	unsigned long v;
-	QSE_MBSTONUM (v, mbs, QSE_NULL, base);
+	QSE_MBSTONUM (v, mbs, end, base, 0);
 	return v;
 }
 
-int qse_mbsxtoi (const qse_mchar_t* mbs, qse_size_t len, int base)
+/* ----- */
+
+int qse_mbsxtoi (const qse_mchar_t* mbs, qse_size_t len, int base, const qse_mchar_t** end)
 {
 	int v;
-	QSE_MBSXTONUM (v, mbs, len, QSE_NULL, base);
+	QSE_MBSXTONUM (v, mbs, len, end, base, 1);
 	return v;
 }
 
-long qse_mbsxtol (const qse_mchar_t* mbs, qse_size_t len, int base)
+long qse_mbsxtol (const qse_mchar_t* mbs, qse_size_t len, int base, const qse_mchar_t** end)
 {
 	long v;
-	QSE_MBSXTONUM (v, mbs, len, QSE_NULL, base);
+	QSE_MBSXTONUM (v, mbs, len, end, base, 1);
 	return v;
 }
 
-unsigned int qse_mbsxtoui (const qse_mchar_t* mbs, qse_size_t len, int base)
+unsigned int qse_mbsxtoui (const qse_mchar_t* mbs, qse_size_t len, int base, const qse_mchar_t** end)
 {
 	unsigned int v;
-	QSE_MBSXTONUM (v, mbs, len, QSE_NULL, base);
+	QSE_MBSXTONUM (v, mbs, len, end, base, 0);
 	return v;
 }
 
-unsigned long qse_mbsxtoul (const qse_mchar_t* mbs, qse_size_t len, int base)
+unsigned long qse_mbsxtoul (const qse_mchar_t* mbs, qse_size_t len, int base, const qse_mchar_t** end)
 {
 	unsigned long v;
-	QSE_MBSXTONUM (v, mbs, len, QSE_NULL, base);
+	QSE_MBSXTONUM (v, mbs, len, end, base, 0);
 	return v;
 }
 
-qse_int_t qse_mbstoint (const qse_mchar_t* mbs, int base)
+/* ----- */
+
+qse_int_t qse_mbstoint (const qse_mchar_t* mbs, int base, const qse_mchar_t** end)
 {
 	qse_int_t v;
-	QSE_MBSTONUM (v, mbs, QSE_NULL, base);
+	QSE_MBSTONUM (v, mbs, end, base, 1);
 	return v;
 }
 
-qse_long_t qse_mbstolong (const qse_mchar_t* mbs, int base)
+qse_long_t qse_mbstolong (const qse_mchar_t* mbs, int base, const qse_mchar_t** end)
 {
 	qse_long_t v;
-	QSE_MBSTONUM (v, mbs, QSE_NULL, base);
+	QSE_MBSTONUM (v, mbs, end, base, 1);
 	return v;
 }
 
-qse_uint_t qse_mbstouint (const qse_mchar_t* mbs, int base)
+qse_intmax_t qse_mbstointmax (const qse_mchar_t* mbs, int base, const qse_mchar_t** end)
+{
+	qse_intmax_t v;
+	QSE_MBSTONUM (v, mbs, end, base, 1);
+	return v;
+}
+/* ----- */
+
+qse_uint_t qse_mbstouint (const qse_mchar_t* mbs, int base, const qse_mchar_t** end)
 {
 	qse_uint_t v;
-	QSE_MBSTONUM (v, mbs, QSE_NULL, base);
+	QSE_MBSTONUM (v, mbs, end, base, 0);
 	return v;
 }
 
-qse_ulong_t qse_mbstoulong (const qse_mchar_t* mbs, int base)
+qse_ulong_t qse_mbstoulong (const qse_mchar_t* mbs, int base, const qse_mchar_t** end)
 {
 	qse_ulong_t v;
-	QSE_MBSTONUM (v, mbs, QSE_NULL, base);
+	QSE_MBSTONUM (v, mbs, end, base, 0);
 	return v;
 }
 
-qse_int_t qse_mbsxtoint (const qse_mchar_t* mbs, qse_size_t len, int base)
+qse_uintmax_t qse_mbstouintmax (const qse_mchar_t* mbs, int base, const qse_mchar_t** end)
+{
+	qse_uintmax_t v;
+	QSE_MBSTONUM (v, mbs, end, base, 0);
+	return v;
+}
+
+/* ----- */
+
+qse_int_t qse_mbsxtoint (const qse_mchar_t* mbs, qse_size_t len, int base, const qse_mchar_t** end)
 {
 	qse_int_t v;
-	QSE_MBSXTONUM (v, mbs, len, QSE_NULL, base);
+	QSE_MBSXTONUM (v, mbs, len, end, base, 1);
 	return v;
 }
 
-qse_long_t qse_mbsxtolong (const qse_mchar_t* mbs, qse_size_t len, int base)
+qse_long_t qse_mbsxtolong (const qse_mchar_t* mbs, qse_size_t len, int base, const qse_mchar_t** end)
 {
 	qse_long_t v;
-	QSE_MBSXTONUM (v, mbs, len, QSE_NULL, base);
+	QSE_MBSXTONUM (v, mbs, len, end, base, 1);
 	return v;
 }
 
-qse_uint_t qse_mbsxtouint (const qse_mchar_t* mbs, qse_size_t len, int base)
+qse_intmax_t qse_mbsxtointmax (const qse_mchar_t* mbs, qse_size_t len, int base, const qse_mchar_t** end)
+{
+	qse_intmax_t v;
+	QSE_MBSXTONUM (v, mbs, len, end, base, 1);
+	return v;
+}
+/* ----- */
+
+qse_uint_t qse_mbsxtouint (const qse_mchar_t* mbs, qse_size_t len, int base, const qse_mchar_t** end)
 {
 	qse_uint_t v;
-	QSE_MBSXTONUM (v, mbs, len, QSE_NULL, base);
+	QSE_MBSXTONUM (v, mbs, len, end, base, 0);
 	return v;
 }
 
-qse_ulong_t qse_mbsxtoulong (const qse_mchar_t* mbs, qse_size_t len, int base)
+qse_ulong_t qse_mbsxtoulong (const qse_mchar_t* mbs, qse_size_t len, int base, const qse_mchar_t** end)
 {
 	qse_ulong_t v;
-	QSE_MBSXTONUM (v, mbs, len, QSE_NULL, base);
+	QSE_MBSXTONUM (v, mbs, len, end, base, 0);
 	return v;
 }
 
 
+qse_uintmax_t qse_mbsxtouintmax (const qse_mchar_t* mbs, qse_size_t len, int base, const qse_mchar_t** end)
+{
+	qse_uintmax_t v;
+	QSE_MBSXTONUM (v, mbs, len, end, base, 0);
+	return v;
+}
+
 /*---------------------------------------------------------------
  * wide string to number conversion 
  *---------------------------------------------------------------*/
-int qse_wcstoi (const qse_wchar_t* wcs, int base)
+int qse_wcstoi (const qse_wchar_t* wcs, int base, const qse_wchar_t** end)
 {
 	int v;
-	QSE_WCSTONUM (v, wcs, QSE_NULL, base);
+	QSE_WCSTONUM (v, wcs, end, base, 1);
 	return v;
 }
 
-long qse_wcstol (const qse_wchar_t* wcs, int base)
+long qse_wcstol (const qse_wchar_t* wcs, int base, const qse_wchar_t** end)
 {
 	long v;
-	QSE_WCSTONUM (v, wcs, QSE_NULL, base);
+	QSE_WCSTONUM (v, wcs, end, base, 1);
 	return v;
 }
 
-unsigned int qse_wcstoui (const qse_wchar_t* wcs, int base)
+unsigned int qse_wcstoui (const qse_wchar_t* wcs, int base, const qse_wchar_t** end)
 {
 	unsigned int v;
-	QSE_WCSTONUM (v, wcs, QSE_NULL, base);
+	QSE_WCSTONUM (v, wcs, end, base, 0);
 	return v;
 }
 
-unsigned long qse_wcstoul (const qse_wchar_t* wcs, int base)
+unsigned long qse_wcstoul (const qse_wchar_t* wcs, int base, const qse_wchar_t** end)
 {
 	unsigned long v;
-	QSE_WCSTONUM (v, wcs, QSE_NULL, base);
+	QSE_WCSTONUM (v, wcs, end, base, 0);
 	return v;
 }
 
-int qse_wcsxtoi (const qse_wchar_t* wcs, qse_size_t len, int base)
+/* ----- */
+
+int qse_wcsxtoi (const qse_wchar_t* wcs, qse_size_t len, int base, const qse_wchar_t** end)
 {
 	int v;
-	QSE_WCSXTONUM (v, wcs, len, QSE_NULL, base);
+	QSE_WCSXTONUM (v, wcs, len, end, base, 1);
 	return v;
 }
 
-long qse_wcsxtol (const qse_wchar_t* wcs, qse_size_t len, int base)
+long qse_wcsxtol (const qse_wchar_t* wcs, qse_size_t len, int base, const qse_wchar_t** end)
 {
 	long v;
-	QSE_WCSXTONUM (v, wcs, len, QSE_NULL, base);
+	QSE_WCSXTONUM (v, wcs, len, end, base, 1);
 	return v;
 }
 
-unsigned int qse_wcsxtoui (const qse_wchar_t* wcs, qse_size_t len, int base)
+unsigned int qse_wcsxtoui (const qse_wchar_t* wcs, qse_size_t len, int base, const qse_wchar_t** end)
 {
 	unsigned int v;
-	QSE_WCSXTONUM (v, wcs, len, QSE_NULL, base);
+	QSE_WCSXTONUM (v, wcs, len, end, base, 0);
 	return v;
 }
 
-unsigned long qse_wcsxtoul (const qse_wchar_t* wcs, qse_size_t len, int base)
+unsigned long qse_wcsxtoul (const qse_wchar_t* wcs, qse_size_t len, int base, const qse_wchar_t** end)
 {
 	unsigned long v;
-	QSE_WCSXTONUM (v, wcs, len, QSE_NULL, base);
+	QSE_WCSXTONUM (v, wcs, len, end, base, 0);
 	return v;
 }
 
-qse_int_t qse_wcstoint (const qse_wchar_t* wcs, int base)
+/* ----- */
+
+qse_int_t qse_wcstoint (const qse_wchar_t* wcs, int base, const qse_wchar_t** end)
 {
 	qse_int_t v;
-	QSE_WCSTONUM (v, wcs, QSE_NULL, base);
+	QSE_WCSTONUM (v, wcs, end, base, 1);
 	return v;
 }
 
-qse_long_t qse_wcstolong (const qse_wchar_t* wcs, int base)
+qse_long_t qse_wcstolong (const qse_wchar_t* wcs, int base, const qse_wchar_t** end)
 {
 	qse_long_t v;
-	QSE_WCSTONUM (v, wcs, QSE_NULL, base);
+	QSE_WCSTONUM (v, wcs, end, base, 1);
 	return v;
 }
 
-qse_uint_t qse_wcstouint (const qse_wchar_t* wcs, int base)
+qse_intmax_t qse_wcstointmax (const qse_wchar_t* wcs, int base, const qse_wchar_t** end)
+{
+	qse_intmax_t v;
+	QSE_WCSTONUM (v, wcs, end, base, 1);
+	return v;
+}
+
+/* ----- */
+qse_uint_t qse_wcstouint (const qse_wchar_t* wcs, int base, const qse_wchar_t** end)
 {
 	qse_uint_t v;
-	QSE_WCSTONUM (v, wcs, QSE_NULL, base);
+	QSE_WCSTONUM (v, wcs, end, base, 0);
 	return v;
 }
 
-qse_ulong_t qse_wcstoulong (const qse_wchar_t* wcs, int base)
+qse_ulong_t qse_wcstoulong (const qse_wchar_t* wcs, int base, const qse_wchar_t** end)
 {
 	qse_ulong_t v;
-	QSE_WCSTONUM (v, wcs, QSE_NULL, base);
+	QSE_WCSTONUM (v, wcs, end, base, 0);
 	return v;
 }
 
-qse_int_t qse_wcsxtoint (const qse_wchar_t* wcs, qse_size_t len, int base)
+qse_uintmax_t qse_wcstouintmax (const qse_wchar_t* wcs, int base, const qse_wchar_t** end)
+{
+	qse_uintmax_t v;
+	QSE_WCSTONUM (v, wcs, end, base, 0);
+	return v;
+}
+
+/* ----- */
+qse_int_t qse_wcsxtoint (const qse_wchar_t* wcs, qse_size_t len, int base, const qse_wchar_t** end)
 {
 	qse_int_t v;
-	QSE_WCSXTONUM (v, wcs, len, QSE_NULL, base);
+	QSE_WCSXTONUM (v, wcs, len, end, base, 1);
 	return v;
 }
 
-qse_long_t qse_wcsxtolong (const qse_wchar_t* wcs, qse_size_t len, int base)
+qse_long_t qse_wcsxtolong (const qse_wchar_t* wcs, qse_size_t len, int base, const qse_wchar_t** end)
 {
 	qse_long_t v;
-	QSE_WCSXTONUM (v, wcs, len, QSE_NULL, base);
+	QSE_WCSXTONUM (v, wcs, len, end, base, 1);
 	return v;
 }
 
-qse_uint_t qse_wcsxtouint (const qse_wchar_t* wcs, qse_size_t len, int base)
+qse_intmax_t qse_wcsxtointmax (const qse_wchar_t* wcs, qse_size_t len, int base, const qse_wchar_t** end)
+{
+	qse_intmax_t v;
+	QSE_WCSXTONUM (v, wcs, len, end, base, 1);
+	return v;
+}
+
+/* ----- */
+qse_uint_t qse_wcsxtouint (const qse_wchar_t* wcs, qse_size_t len, int base, const qse_wchar_t** end)
 {
 	qse_uint_t v;
-	QSE_WCSXTONUM (v, wcs, len, QSE_NULL, base);
+	QSE_WCSXTONUM (v, wcs, len, end, base, 0);
 	return v;
 }
 
-qse_ulong_t qse_wcsxtoulong (const qse_wchar_t* wcs, qse_size_t len, int base)
+qse_ulong_t qse_wcsxtoulong (const qse_wchar_t* wcs, qse_size_t len, int base, const qse_wchar_t** end)
 {
 	qse_ulong_t v;
-	QSE_WCSXTONUM (v, wcs, len, QSE_NULL, base);
+	QSE_WCSXTONUM (v, wcs, len, end, base, 0);
+	return v;
+}
+
+qse_uintmax_t qse_wcsxtouintmax (const qse_wchar_t* wcs, qse_size_t len, int base, const qse_wchar_t** end)
+{
+	qse_uintmax_t v;
+	QSE_WCSXTONUM (v, wcs, len, end, base, 0);
 	return v;
 }
 
diff --git a/qse/lib/http/httpd-cgi.c b/qse/lib/http/httpd-cgi.c
index d82b915d..9c78382c 100644
--- a/qse/lib/http/httpd-cgi.c
+++ b/qse/lib/http/httpd-cgi.c
@@ -251,7 +251,8 @@ static int cgi_htrd_peek_script_output (qse_htrd_t* htrd, qse_htre_t* req)
 		qse_mchar_t* endptr;
 
 /* TODO: check the syntax of status value??? if not numeric??? */
-		QSE_MBSTONUM (nstatus, req->attr.status, &endptr, 10);
+		/*QSE_MBSTONUM (nstatus, req->attr.status, &endptr, 10);*/
+		nstatus = qse_mbstoi (req->attr.status, 10, &endptr);
 
 		/* 
 		Would it need this kind of extra work?
diff --git a/qse/lib/http/httpd-proxy.c b/qse/lib/http/httpd-proxy.c
index 7fcca121..7d4f49d8 100644
--- a/qse/lib/http/httpd-proxy.c
+++ b/qse/lib/http/httpd-proxy.c
@@ -927,7 +927,7 @@ static void adjust_peer_name_and_port (task_proxy_t* proxy)
 	{
 		/* handle a port number after the colon sign */
 		*colon = QSE_MT('\0');
-		proxy->peer_port = qse_mbstoui (colon + 1, 10);
+		proxy->peer_port = qse_mbstoui (colon + 1, 10, QSE_NULL);
 		/* TODO: check if there is a garbage after the port number.
 		 *       check if the port number has overflown */
 	}
diff --git a/qse/lib/rad/raddic.c b/qse/lib/rad/raddic.c
index 3acbe705..f2661fc8 100644
--- a/qse/lib/rad/raddic.c
+++ b/qse/lib/rad/raddic.c
@@ -1227,7 +1227,7 @@ static int sscanf_i (qse_raddic_t* dic, const qse_char_t* str, int* pvalue)
 	qse_long_t v;
 	const qse_char_t* end;
 
-	QSE_STRTONUM (v, str, &end, 0);
+	v = qse_strtolong (str, 0, &end);
 	if (*end != '\0') 
 	{
 		qse_raddic_seterrfmt (dic, QSE_RADDIC_ESYNERR, QSE_T("invalid number - %s"), str);
@@ -1248,9 +1248,9 @@ static int sscanf_ui (qse_raddic_t* dic, const qse_char_t* str, qse_uintmax_t* p
 		return -1;
 	}
 
-	QSE_STRTONUM (v, str, &end, 0);
-
-	if (*end != '\0')
+	/*QSE_STRTONUM (v, str, &end, 0);*/
+	v = qse_strtouintmax (str, 0, &end);
+	if (*end != QSE_T('\0'))
 	{
 		qse_raddic_seterrfmt (dic, QSE_RADDIC_ESYNERR, QSE_T("invalid unsigned number - %s"), str);
 		return -1;
@@ -1260,6 +1260,7 @@ static int sscanf_ui (qse_raddic_t* dic, const qse_char_t* str, qse_uintmax_t* p
 	return 0;
 }
 
+#if 0
 static int sscanf_ui32 (qse_raddic_t* dic, const qse_char_t* str, qse_uint32_t* pvalue, qse_uint32_t* pvalue2)
 {
 	qse_long_t v, v2;
@@ -1272,11 +1273,13 @@ static int sscanf_ui32 (qse_raddic_t* dic, const qse_char_t* str, qse_uint32_t*
 		return -1;
 	}
 
-	QSE_STRTONUM (v, str, &end, 0);
+	/*QSE_STRTONUM (v, str, &end, 0);*/
+	v = qse_strtolong (str, 0, &end);
 	if (pvalue2 && *end == '.')
 	{
 		start2 = end + 1;
-		QSE_STRTONUM (v2, start2, &end, 0);
+		/*QSE_STRTONUM (v2, start2, &end, 0);*/
+		v2 = qse_strtolong (start2, 0, &end);
 	}
 
 	if (*end != '\0')
@@ -1294,6 +1297,7 @@ static int sscanf_ui32 (qse_raddic_t* dic, const qse_char_t* str, qse_uint32_t*
 
 	return 0;
 }
+#endif
 
 /*
  *	Process the ATTRIBUTE command
@@ -1322,7 +1326,7 @@ static int process_attribute (
 	 */
 	if (sscanf_ui(dic, argv[1], &value) <= -1 || value > QSE_TYPE_MAX(qse_uint16_t)) 
 	{
-		qse_raddic_seterrfmt (dic, QSE_RADDIC_ESYNERR, QSE_T("%s[%zd]: invalid attribute value  %s"), fn, line, argv[1]);
+		qse_raddic_seterrfmt (dic, QSE_RADDIC_ESYNERR, QSE_T("%s[%zd]: invalid attribute value %s"), fn, line, argv[1]);
 		return -1;
 	}
 
@@ -1530,9 +1534,10 @@ static int process_constant(qse_raddic_t* dic, const qse_char_t* fn, const qse_s
  */
 static int process_vendor (qse_raddic_t* dic, const qse_char_t* fn, const qse_size_t line, qse_char_t** argv,  int argc)
 {
-	int value;
+	unsigned int value;
 	int continuation = 0;
 	const qse_char_t* format = QSE_NULL;
+	const qse_char_t* end;
 
 	if ((argc < 2) || (argc > 3)) 
 	{
@@ -1541,14 +1546,18 @@ static int process_vendor (qse_raddic_t* dic, const qse_char_t* fn, const qse_si
 	}
 
 	/*
-	 *	 Validate all entries
+	 * Validate all entries
 	 */
-	if (!QSE_ISDIGIT(argv[1][0])) 
+	//if (!QSE_ISDIGIT(argv[1][0])) 
+	//{
+	//
+	//}
+	value = qse_strtoui(argv[1], 0, &end);
+	if (*end != QSE_T('\0') || value <= 0u || value > 65535u)
 	{
 		qse_raddic_seterrfmt (dic, QSE_RADDIC_ESYNERR, QSE_T("%s[%zd]: invalid value"), fn, line);
 		return -1;
 	}
-	value = qse_strtoi(argv[1], 0);
 
 	/* Create a new VENDOR entry for the list */
 	if (qse_raddic_addvendor(dic, argv[0], value) == QSE_NULL) 
diff --git a/qse/lib/si/nwif-cfg.c b/qse/lib/si/nwif-cfg.c
index 52cd2749..8d3b588c 100644
--- a/qse/lib/si/nwif-cfg.c
+++ b/qse/lib/si/nwif-cfg.c
@@ -342,7 +342,7 @@ static void read_proc_net_if_inet6 (qse_nwifcfg_t* cfg, struct ifreq* ifr)
 
 			if (count >= 6)
 			{
-				index = qse_mbsxtoi (tok[1].ptr, tok[1].len, 16);
+				index = qse_mbsxtoi (tok[1].ptr, tok[1].len, 16, QSE_NULL);
 				if (index == cfg->index)
 				{
 					int ti;
@@ -356,7 +356,7 @@ static void read_proc_net_if_inet6 (qse_nwifcfg_t* cfg, struct ifreq* ifr)
 
 					cfg->addr.type = QSE_NWAD_IN6;
 
-					ti = qse_mbsxtoi (tok[2].ptr, tok[0].len, 16);
+					ti = qse_mbsxtoi (tok[2].ptr, tok[0].len, 16, QSE_NULL);
 					qse_prefixtoip6ad (ti, &cfg->mask.u.in6.addr);
 
 					cfg->mask.type = QSE_NWAD_IN6;
diff --git a/qse/lib/si/sinfo.c b/qse/lib/si/sinfo.c
index f9096a8c..0a0e6ce3 100644
--- a/qse/lib/si/sinfo.c
+++ b/qse/lib/si/sinfo.c
@@ -65,7 +65,8 @@ int qse_get_highest_fd (void)
 
 			if (de->d_name[0] == QSE_MT('.')) continue;
 
-			QSE_MBSTONUM (l, de->d_name, &endptr, 10);
+			/*QSE_MBSTONUM (l, de->d_name, &endptr, 10);*/
+			l = qse_mbstolong (de->d_name, 10, &endptr);
 			if (*endptr == QSE_MT('\0'))
 			{
 				fd = (int)l;
@@ -137,7 +138,8 @@ int qse_close_open_fds_using_proc (int* excepts, qse_size_t count)
 
 			if (de->d_name[0] == QSE_MT('.')) continue;
 
-			QSE_MBSTONUM (l, de->d_name, &endptr, 10);
+			/*QSE_MBSTONUM (l, de->d_name, &endptr, 10);*/
+			l = qse_mbstolong (de->d_name, 10, &endptr);
 			if (*endptr == QSE_MT('\0'))
 			{
 				int fd = (int)l;