1 files changed, 77 insertions, 37 deletions

diff --git a/src/bfstd.c b/src/bfstd.c
index b29fb7b..f2938ad 100644
--- a/src/bfstd.c
+++ b/src/bfstd.c
@@ -211,35 +211,77 @@ const char *xgetprogname(void) {
 	return cmd;
 }
 
-int xstrtoll(const char *str, char **end, int base, long long *value) {
-	// strtoll() skips leading spaces, but we want to reject them
+/** Common prologue for xstrto*() wrappers. */
+static int xstrtox_prologue(const char *str) {
+	// strto*() skips leading spaces, but we want to reject them
 	if (xisspace(str[0])) {
 		errno = EINVAL;
 		return -1;
 	}
 
-	// If end is NULL, make sure the entire string is valid
-	bool entire = !end;
-	char *endp;
-	if (!end) {
-		end = &endp;
-	}
-
 	errno = 0;
-	long long result = strtoll(str, end, base);
+	return 0;
+}
+
+/** Common epilogue for xstrto*() wrappers. */
+static int xstrtox_epilogue(const char *str, char **end, char *endp) {
 	if (errno != 0) {
 		return -1;
 	}
 
-	if (*end == str || (entire && **end != '\0')) {
+	if (end) {
+		*end = endp;
+	}
+
+	// If end is NULL, make sure the entire string is valid
+	if (endp == str || (!end && *endp != '\0')) {
 		errno = EINVAL;
 		return -1;
 	}
 
-	*value = result;
 	return 0;
 }
 
+int xstrtol(const char *str, char **end, int base, long *value) {
+	if (xstrtox_prologue(str) != 0) {
+		return -1;
+	}
+
+	char *endp;
+	*value = strtol(str, &endp, base);
+	return xstrtox_epilogue(str, end, endp);
+}
+
+int xstrtoll(const char *str, char **end, int base, long long *value) {
+	if (xstrtox_prologue(str) != 0) {
+		return -1;
+	}
+
+	char *endp;
+	*value = strtoll(str, &endp, base);
+	return xstrtox_epilogue(str, end, endp);
+}
+
+int xstrtof(const char *str, char **end, float *value) {
+	if (xstrtox_prologue(str) != 0) {
+		return -1;
+	}
+
+	char *endp;
+	*value = strtof(str, &endp);
+	return xstrtox_epilogue(str, end, endp);
+}
+
+int xstrtod(const char *str, char **end, double *value) {
+	if (xstrtox_prologue(str) != 0) {
+		return -1;
+	}
+
+	char *endp;
+	*value = strtod(str, &endp);
+	return xstrtox_epilogue(str, end, endp);
+}
+
 /** Compile and execute a regular expression for xrpmatch(). */
 static int xrpregex(nl_item item, const char *response) {
 	const char *pattern = nl_langinfo(item);
@@ -482,7 +524,9 @@ int rlim_cmp(rlim_t a, rlim_t b) {
 }
 
 dev_t xmakedev(int ma, int mi) {
-#ifdef makedev
+#if __QNX__
+	return makedev(0, ma, mi);
+#elif defined(makedev)
 	return makedev(ma, mi);
 #else
 	return (ma << 8) | mi;
@@ -736,35 +780,31 @@ size_t asciilen(const char *str) {
 }
 
 size_t asciinlen(const char *str, size_t n) {
+	const unsigned char *ustr = (const unsigned char *)str;
 	size_t i = 0;
 
-#if SIZE_WIDTH % 8 == 0
 	// Word-at-a-time isascii()
-	for (size_t word; i + sizeof(word) <= n; i += sizeof(word)) {
-		memcpy(&word, str + i, sizeof(word));
-
-		const size_t mask = (SIZE_MAX / 0xFF) << 7; // 0x808080...
-		word &= mask;
-		if (!word) {
-			continue;
-		}
-
-#if ENDIAN_NATIVE == ENDIAN_BIG
-		word = bswap(word);
-#elif ENDIAN_NATIVE != ENDIAN_LITTLE
-		break;
+#define CHUNK(n) CHUNK_(uint##n##_t, load8_leu##n)
+#define CHUNK_(type, load8) \
+	while (n - i >= sizeof(type)) { \
+		type word = load8(ustr + i); \
+		type mask = (((type)-1) / 0xFF) << 7; /* 0x808080.. */ \
+		word &= mask; \
+		i += trailing_zeros(word) / 8; \
+		if (word) { \
+			return i; \
+		} \
+	}
+
+#if SIZE_WIDTH >= 64
+	CHUNK(64);
 #endif
+	CHUNK(32);
+	CHUNK(16);
+	CHUNK(8);
 
-		size_t first = trailing_zeros(word) / 8;
-		return i + first;
-	}
-#endif
-
-	for (; i < n; ++i) {
-		if (!xisascii(str[i])) {
-			break;
-		}
-	}
+#undef CHUNK_
+#undef CHUNK
 
 	return i;
 }