increase max filenames and filename buffer, sort filenames

RSDuck · May 27, 2018 · 9a5d4e1 · 9a5d4e1
1 parent d3ce576
commit 9a5d4e1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -47,7 +47,7 @@ CFLAGS	:=	-g -Wall -Ofast -ffunction-sections \
 			$(ARCH) $(DEFINES)
 
 CFLAGS	+=	$(INCLUDE) -D__SWITCH__ -DTILED_RENDERING -DBRANCHLESS_GBA_GFX \
-	-DUSE_FRAME_SKIP -DNXLINK_STDIO#-DTHREADED_RENDERER
+	-DUSE_FRAME_SKIP# -DNXLINK_STDIO#-DTHREADED_RENDERER
 
 CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
 

diff --git a/source/switch/ui.cpp b/source/switch/ui.cpp
@@ -189,8 +189,8 @@ struct Setting {
 	bool meta;
 };
 
-#define FILENAMEBUFFER_SIZE (1024 * 20)  // 20kb
-#define FILENAMES_COUNT_MAX 1024
+#define FILENAMEBUFFER_SIZE (1024 * 32)  // 32kb
+#define FILENAMES_COUNT_MAX 2048
 
 #define SETTINGS_MAX (128)
 

diff --git a/source/switch/util.cpp b/source/switch/util.cpp
@@ -1,5 +1,6 @@
 #include <algorithm>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/dirent.h>
 
@@ -9,6 +10,8 @@ struct alphabetize {
 	inline bool operator()(char* a, char* b) { return strcasecmp(a, b) < 0; }
 };
 
+static int sortAlpha(const void* a, const void* b) { return strcasecmp(*((const char**)a), *((const char**)b)); }
+
 bool isDirectory(char* path) {
 	DIR* dir = opendir(path);
 	if (!dir) {
@@ -58,6 +61,9 @@ void getDirectoryContents(char* filenameBuffer, char** filenames, int* filenames
 
 		closedir(dir);
 	}
+
+	qsort(filenames + 1, (*filenamesCount) - 1,  // ".." should stay at the to
+	      sizeof(char*), &sortAlpha);
 }
 
 void strcpy_safe(char* dst, const char* src, unsigned src_length) {