Bugfix in kvlog & strowhatever implementations

Author: maxdev1

build.sh

@@ -6,7 +6,7 @@ fi
 . "$ROOT/ghost.sh"
 
 # Prioritized applications that need to be built first
-APPLICATION_PRIORITY=("libproperties" "libdevice" "libps2" "libps2driver" "libinput" "libwindow" "libfont" "libterminal" "libvideo" "libpci" "libahci")
+APPLICATION_PRIORITY=("libjson" "libproperties" "libdevice" "libps2" "libps2driver" "libinput" "libwindow" "libfont" "libterminal" "libvideo" "libpci" "libahci")
 
 # Flags
 FIRST_RUN=0

libc/src/stdio/kvlog.c

@@ -32,40 +32,38 @@ void kvlog(const char* message, va_list l)
 	va_list lc;
 	va_copy(lc, l);
 
-	// First try
 	uint32_t messageLen = strlen(message);
-	uint32_t bufLen = messageLen * 4;
+	uint32_t bufLen = messageLen * 2;
 
-	char* buf = malloc(bufLen);
-	if(!buf)
-	{
-		g_log("failed to allocate buffer for kernel logging");
-		return;
-	}
-
-	int printed = vsnprintf(buf, bufLen, message, l);
-	int success = printed == messageLen - 1;
-	if(success)
-		g_log(buf);
+	char* buf = NULL;
+	int printed = -1;
 
-	free(buf);
-
-	// Buffer too small? Second try
-	if(!success)
+	for(;;)
 	{
-		bufLen = messageLen * 8;
-		buf = (char*) malloc(bufLen);
+		free(buf);
+		buf = malloc(bufLen);
+
 		if(!buf)
 		{
-			g_log("failed to allocate buffer for kernel logging on retry");
+			g_log("failed to allocate buffer for kernel logging");
+			va_end(lc);
 			return;
 		}
 
-		vsnprintf(buf, bufLen, message, lc);
-		g_log(buf);
+		va_list ltmp;
+		va_copy(ltmp, lc);
+		printed = vsnprintf(buf, bufLen, message, ltmp);
+		va_end(ltmp);
 
-		free(buf);
+		if(printed >= 0 && (uint32_t) printed < bufLen)
+		{
+			g_log(buf);
+			break;
+		}
+
+		bufLen *= 2;
 	}
 
+	free(buf);
 	va_end(lc);
 }

libc/src/stdlib/bsearch.c

@@ -26,8 +26,24 @@
  *
  */
 void* bsearch(const void* value, const void* array, size_t num_elements,
-		size_t size, int (*comparator)(const void*, const void*)) {
-	klog("warning: bsearch is not implemented");
-	return 0;
-}
+              size_t size, int (*comparator)(const void*, const void*))
+{
+	size_t low = 0;
+	size_t high = num_elements;
+
+	while(low < high)
+	{
+		size_t mid = low + (high - low) / 2;
+		const void* elem = (const char*) array + mid * size;
 
+		int cmp = comparator(value, elem);
+		if(cmp < 0)
+			high = mid;
+		else if(cmp > 0)
+			low = mid + 1;
+		else
+			return (void*) elem;
+	}
+
+	return NULL;
+}

libc/src/stdlib/strtod.c

@@ -18,14 +18,64 @@
  *                                                                           *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include "stdlib.h"
-#include "errno.h"
-#include <ghost/system.h>
+#include <ctype.h>
+#include <math.h>
 
 /**
  *
  */
 double strtod(const char* str, char** endptr)
 {
-	__G_NOT_IMPLEMENTED("strtod");
+	const char* p = str;
+	while(isspace(*p))
+		p++;
+
+	int sign = 1;
+	if(*p == '+' || *p == '-')
+	{
+		if(*p == '-')
+			sign = -1;
+		p++;
+	}
+
+	double value = 0.0;
+	while(isdigit(*p))
+	{
+		value = value * 10.0 + (*p - '0');
+		p++;
+	}
+
+	if(*p == '.')
+	{
+		p++;
+		double frac = 1.0;
+		while(isdigit(*p))
+		{
+			frac *= 0.1;
+			value += (*p - '0') * frac;
+			p++;
+		}
+	}
+
+	int exp_sign = 1;
+	int exp_val = 0;
+	if(*p == 'e' || *p == 'E')
+	{
+		p++;
+		if(*p == '+' || *p == '-')
+		{
+			if(*p == '-')
+				exp_sign = -1;
+			p++;
+		}
+		while(isdigit(*p))
+		{
+			exp_val = exp_val * 10 + (*p - '0');
+			p++;
+		}
+	}
+
+	if(endptr)
+		*endptr = (char*) p;
+	return sign * value * pow(10.0, exp_sign * exp_val);
 }

libc/src/stdlib/strtof.c

@@ -18,14 +18,64 @@
  *                                                                           *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include "stdlib.h"
-#include "errno.h"
-#include <ghost/system.h>
+#include <ctype.h>
+#include <math.h>
 
 /**
  *
  */
 float strtof(const char* str, char** endptr)
 {
-	__G_NOT_IMPLEMENTED("strtof");
+	const char* p = str;
+	while(isspace(*p))
+		p++;
+
+	int sign = 1;
+	if(*p == '+' || *p == '-')
+	{
+		if(*p == '-')
+			sign = -1;
+		p++;
+	}
+
+	double val = 0.0;
+	while(isdigit(*p))
+	{
+		val = val * 10.0 + (*p - '0');
+		p++;
+	}
+
+	if(*p == '.')
+	{
+		p++;
+		double frac = 1.0;
+		while(isdigit(*p))
+		{
+			frac *= 0.1;
+			val += (*p - '0') * frac;
+			p++;
+		}
+	}
+
+	int exp_sign = 1;
+	int exp_val = 0;
+	if(*p == 'e' || *p == 'E')
+	{
+		p++;
+		if(*p == '+' || *p == '-')
+		{
+			if(*p == '-')
+				exp_sign = -1;
+			p++;
+		}
+		while(isdigit(*p))
+		{
+			exp_val = exp_val * 10 + (*p - '0');
+			p++;
+		}
+	}
+
+	if(endptr)
+		*endptr = (char*) p;
+	return (float) (sign * val * pow(10.0, exp_sign * exp_val));
 }

libc/src/stdlib/strtol.c

@@ -18,15 +18,71 @@
  *                                                                           *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include "stdlib.h"
-#include "errno.h"
-#include "stdio.h"
+#include <ctype.h>
+#include <limits.h>
 
 /**
  *
  */
-long strtol(const char* str, char** endptr, int base) {
+long strtol(const char* str, char** endptr, int base)
+{
+	const char* p = str;
+	while(isspace(*p))
+		p++;
 
-	klog("warning: strtol is not implemented");
-	return 0;
+	int sign = 1;
+	if(*p == '+' || *p == '-')
+	{
+		if(*p == '-')
+			sign = -1;
+		p++;
+	}
+
+	if(base == 0)
+	{
+		if(*p == '0')
+		{
+			if(p[1] == 'x' || p[1] == 'X')
+			{
+				base = 16;
+				p += 2;
+			}
+			else
+			{
+				base = 8;
+				p++;
+			}
+		}
+		else
+			base = 10;
+	}
+	else if(base == 16 && *p == '0' && (p[1] == 'x' || p[1] == 'X'))
+		p += 2;
+
+	long result = 0;
+	while(*p)
+	{
+		int digit;
+		if(isdigit(*p))
+			digit = *p - '0';
+		else if(isalpha(*p))
+			digit = (tolower(*p) - 'a') + 10;
+		else
+			break;
+		if(digit >= base)
+			break;
+
+		if(result > (LONG_MAX - digit) / base)
+		{
+			result = LONG_MAX;
+			break;
+		}
+
+		result = result * base + digit;
+		p++;
+	}
+
+	if(endptr)
+		*endptr = (char*) p;
+	return sign * result;
 }

libc/src/stdlib/strtoul.c

@@ -18,14 +18,68 @@
  *                                                                           *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include "stdlib.h"
-#include "errno.h"
-#include <ghost/system.h>
+#include <ctype.h>
+#include <limits.h>
 
-/**
- *
- */
 unsigned long strtoul(const char* str, char** endptr, int base)
 {
-	__G_NOT_IMPLEMENTED("strtoul");
+	const char* p = str;
+	while(isspace(*p))
+		p++;
+
+	int neg = 0;
+	if(*p == '+' || *p == '-')
+	{
+		if(*p == '-')
+			neg = 1;
+		p++;
+	}
+
+	if(base == 0)
+	{
+		if(*p == '0')
+		{
+			if(p[1] == 'x' || p[1] == 'X')
+			{
+				base = 16;
+				p += 2;
+			}
+			else
+			{
+				base = 8;
+				p++;
+			}
+		}
+		else
+			base = 10;
+	}
+	else if(base == 16 && *p == '0' && (p[1] == 'x' || p[1] == 'X'))
+		p += 2;
+
+	unsigned long result = 0;
+	while(*p)
+	{
+		int digit;
+		if(isdigit(*p))
+			digit = *p - '0';
+		else if(isalpha(*p))
+			digit = (tolower(*p) - 'a') + 10;
+		else
+			break;
+		if(digit >= base)
+			break;
+
+		if(result > (ULONG_MAX - digit) / base)
+		{
+			result = ULONG_MAX;
+			break;
+		}
+
+		result = result * base + digit;
+		p++;
+	}
+
+	if(endptr)
+		*endptr = (char*) p;
+	return neg ? (unsigned long) (-(long) result) : result;
 }