Minor improvements to recursive copy and

- Also use smaller sizes when calling malloc. I'm pretty sure we didn't need to allocate 1024 bytes.
- Also 33 characters are the most that can be viewed on the top screen's CWD display.

Author: joel16

include/file/dirlist.h

@@ -18,7 +18,7 @@ typedef struct File
 	int isDir; // Folder flag
 	int isReadOnly; // Read-only flag
 	int isHidden; // Hidden file flag
-	char name[256]; // File name
+	u8 name[256]; // File name
 	char ext[4]; // File extension
 	u64 size; // File size
 } File;

source/file/dirlist.c

@@ -115,7 +115,7 @@ Result updateList(int clearindex)
 		if (R_SUCCEEDED(ret = FSDIR_Read(dirHandle, &entryCount, MAX_FILES, entries)))
 		{
 			qsort(entries, entryCount, sizeof(FS_DirectoryEntry), cmpstringp);
-			char name[255] = {'\0'};
+			u8 name[255] = {'\0'};
 
 			for (u32 i = 0; i < entryCount; i++) 
 			{

source/file/file_operations.c

@@ -304,7 +304,7 @@ Result copy_folder_recursive(char * src, char * dst)
 
 		if (R_SUCCEEDED(ret = FSDIR_Read(dirHandle, &entryCount, MAX_FILES, entries)))
 		{
-			char name[255] = {'\0'};
+			u8 name[255] = {'\0'};
 			for (u32 i = 0; i < entryCount; i++) 
 			{
 				u16_to_u8(&name[0], entries[i].name, 254);
@@ -335,8 +335,41 @@ Result copy_folder_recursive(char * src, char * dst)
 						copy_folder_recursive(inbuffer, outbuffer); // Copy folder (via recursion)	
 
 					else 
-						copy_file(inbuffer, outbuffer, false); // Copy file
-					
+					{
+						if (copyFromNand)
+						{
+							FS_Archive sd, nand;
+							openArchive(&sd, ARCHIVE_SDMC);
+							openArchive(&nand, ARCHIVE_NAND_CTR_FS);
+
+							ret = copy_file_archive(nand, sd, ARCHIVE_NAND_CTR_FS, ARCHIVE_SDMC, inbuffer, outbuffer);
+
+							closeArchive(sd);
+							closeArchive(nand);
+
+							if (R_FAILED(ret))
+								return ret;
+						}
+						else if ((copyFromSD) && (BROWSE_STATE == STATE_NAND))
+						{
+							FS_Archive sd, nand;
+							openArchive(&sd, ARCHIVE_SDMC);
+							openArchive(&nand, ARCHIVE_NAND_CTR_FS);
+							
+							ret = copy_file_archive(sd, nand, ARCHIVE_SDMC, ARCHIVE_NAND_CTR_FS, inbuffer, outbuffer);
+							
+							closeArchive(sd);
+							closeArchive(nand);
+
+							if (R_FAILED(ret))
+								return ret;
+						}	
+						else 
+						{
+							if (R_FAILED(ret = ret = copy_file(inbuffer, outbuffer, false))) // Copy file
+								return ret;
+						}
+					}
 
 					if (!isMovingToBin)
 						drawProgress(copymode == 1? "Moving" : "Copying", basename(name), i, entryCount);

source/menus/menu_main.c

@@ -81,8 +81,7 @@ void menu_displayMainMenu(void)
 		{
 			screen_draw_string(170, 109, 0.45f, 0.45f, RGBA8(Options_text_colour.r, Options_text_colour.g, Options_text_colour.b, 255), lang_options[language][4]);
 			screen_draw_string(170, 146, 0.45f, 0.45f, RGBA8(Options_text_colour.r, Options_text_colour.g, Options_text_colour.b, 255), lang_options[language][6]);
-		}
-			
+		}	
 	}
 	else
 		screen_draw_texture(TEXTURE_OPTIONS_ICON, 25, 0);
@@ -182,7 +181,7 @@ void menu_displayMainMenu(void)
 
 	screen_draw_texture(TEXTURE_BACKGROUND, 0, 0);
 
-	screen_draw_stringf(84, 28, 0.45f, 0.45f, RGBA8(TopScreen_bar_colour.r, TopScreen_bar_colour.g, TopScreen_bar_colour.b, 255), "%.35s", cwd); // Display current path
+	screen_draw_stringf(84, 28, 0.45f, 0.45f, RGBA8(TopScreen_bar_colour.r, TopScreen_bar_colour.g, TopScreen_bar_colour.b, 255), "%.33s", cwd); // Display current path
 
 	drawStatusBar();
 

source/theme.c

@@ -47,8 +47,8 @@ Result saveThemeConfig(char * themePath, char * coloursPath)
 {
 	Result ret = 0;
 
-	char * buf = (char *)malloc(1024);
-	snprintf(buf, 1024, themeConfig, themePath, coloursPath);
+	char * buf = (char *)malloc(512);
+	snprintf(buf, 512, themeConfig, themePath, coloursPath);
 
 	if (R_FAILED(ret = fsWrite(fsArchive, "/3ds/3DShell/theme.cfg", buf)))
 		return ret;
@@ -87,8 +87,8 @@ static Result createFontColours(void)
 {
 	Result ret = 0;
 
-	char * buf = (char *)malloc(1024);
-	snprintf(buf, 1024, coloursConfig,  48, 174, 222,
+	char * buf = (char *)malloc(512);
+	snprintf(buf, 512, coloursConfig,  48, 174, 222,
 										255, 255, 255,
 										0, 0, 0,
 										95, 95, 95,

source/utils.c

@@ -16,8 +16,8 @@ Result saveConfig(int sortBy, bool recycleBin, bool protection, bool hidden)
 {
 	Result ret = 0;
 
-	char * buf = (char *)malloc(1024);
-	snprintf(buf, 1024, configFile, sortBy, recycleBin, protection, hidden);
+	char * buf = (char *)malloc(256);
+	snprintf(buf, 256, configFile, sortBy, recycleBin, protection, hidden);
 
 	if (R_FAILED(ret = fsWrite(fsArchive, "/3ds/3DShell/config.cfg", buf)))
 		return ret;
@@ -83,7 +83,7 @@ Result getLastDirectory(void)
 
 		buf[size] = '\0';
 
-		char tempPath[250];
+		char tempPath[256];
 		sscanf(buf, "%[^\n]s", tempPath);
 
 		if (dirExists(fsArchive, tempPath)) // Incase a directory previously visited had been deleted, set start path to sdmc:/ to avoid errors.