fix TOKENIZE$ bug

Author: braindigitalis

os/programs/webserver.rrbasic

@@ -20,11 +20,11 @@ ENDPROC
 
 DEF PROCprocessRequest
     SOCKREAD client_socket, REQUEST$
-    VERB$ = TOKENIZE$(REQUEST$, " ") ' Get the request details
-    FILEPATH$ = TOKENIZE$(REQUEST$, " ")
+    VERB$ = TRIM$(TOKENIZE$(REQUEST$, " ")) ' Get the request details
+    FILEPATH$ = TRIM$(TOKENIZE$(REQUEST$, " "))
     IF FILEPATH$ = "/" THEN FILEPATH$ = "/index.html"
-    PRINT FILEPATH$
-    VERSION$ = REQUEST$
+    VERSION$ = TRIM$(REQUEST$)
+    PRINT VERB$; " -> "; FILEPATH$
     FILEPATH$ = "/system/webserver" + FILEPATH$
 	FH = OPENIN(FILEPATH$)
 	IF FH > -1 THEN

src/basic/string.c

@@ -481,9 +481,9 @@ char* basic_tokenize(struct basic_ctx* ctx)
 		if (ofs + split_len > len) {
 			break;
 		} else if (!strncmp(current_value, split, split_len)) {
-
-			size_t ret_len = ofs + split_len;
-			size_t new_len = len - ret_len;
+			size_t ret_len = ofs;
+			size_t new_ofs = ofs + split_len;
+			size_t new_len = len - new_ofs;
 
 			char* return_value = buddy_malloc(ctx->allocator, ret_len + 1);
 			if (!return_value) {
@@ -501,7 +501,7 @@ char* basic_tokenize(struct basic_ctx* ctx)
 			memcpy(return_value, old_value, ret_len);
 			return_value[ret_len] = 0;
 
-			memcpy(new_value, old_value + ret_len, new_len);
+			memcpy(new_value, old_value + new_ofs, new_len);
 			new_value[new_len] = 0;
 
 			basic_set_string_variable(varname, new_value, ctx, false, false);

src/fs/filesystem.c

@@ -723,7 +723,6 @@ int _open(const char* filename, int oflag)
 {
 	fs_handle_type_t type = file_input;
 	fs_directory_entry_t* file = NULL;
-	/* First check if we can find the file in the filesystem */
 
 	if ((oflag & _O_APPEND) == _O_APPEND) {
 		type = file_random;
@@ -737,16 +736,19 @@ int _open(const char* filename, int oflag)
 		type = file_input;
 	}
 
+	/* First check if we can find the file in the filesystem */
 	file = fs_get_file_info(filename);
 	if (file == NULL && type == file_input) {
 		fs_set_error(FS_ERR_INVALID_FILEPATH);
+		dprintf("_open: non-existent file %s\n", filename);
 		return -1;
 	} else if (file == NULL && type != file_input) {
 		file = fs_create_file(filename, 0);
 	} else if (file != NULL && type == file_output) {
 		fs_truncate_file(file, 0);
 	}
 	if (file == NULL) {
+		dprintf("_open: null file info for %s\n", filename);
 		return -1;
 	}
 
@@ -755,6 +757,7 @@ int _open(const char* filename, int oflag)
 	int fd = alloc_filehandle(type, file, IOBUFSZ, 0);
 	if (fd == -1) {
 		fs_set_error(FS_ERR_NO_MORE_FDS);
+		dprintf("_open: out of descriptors opening %s\n", filename);
 		return -1;
 	}
 
@@ -766,6 +769,7 @@ int _open(const char* filename, int oflag)
 			* Give up the filehandle and return error.
 			*/
 			destroy_filehandle(fd);
+			dprintf("_open: failed to read initial buffer for %s\n", filename);
 			return -1;
 		} else {
 			if (file->size <= filehandles[fd]->inbufsize) {