- Handle EOVERFLOW.

emukidid · Feb 15, 2024 · acd0805 · acd0805
1 parent ca21f57
commit acd0805
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/cube/swiss/source/devices/ftp/deviceHandler-FTP.c b/cube/swiss/source/devices/ftp/deviceHandler-FTP.c
@@ -102,8 +102,10 @@ s32 deviceHandler_FTP_readDir(file_handle* ffile, file_handle** dir, u32 type){
 	(*dir)[0].fileAttrib = IS_SPECIAL;
 
 	// Read each entry of the directory
-	while( (entry = readdir(dp)) != NULL ){
-		if(!strcmp(entry->d_name, ".") || !strcmp(entry->d_name, "..")) {
+	do {
+		errno = 0;
+		entry = readdir(dp);
+		if(!entry || !strcmp(entry->d_name, ".") || !strcmp(entry->d_name, "..")) {
 			continue;
 		}
 		// Do we want this one?
@@ -124,7 +126,7 @@ s32 deviceHandler_FTP_readDir(file_handle* ffile, file_handle** dir, u32 type){
 			(*dir)[i].fileAttrib = S_ISDIR(fstat.st_mode) ? IS_DIR : IS_FILE;
 			++i;
 		}
-	}
+	} while(entry || errno == EOVERFLOW);
 
 	closedir(dp);
 	return num_entries;

diff --git a/cube/swiss/source/devices/smb/deviceHandler-SMB.c b/cube/swiss/source/devices/smb/deviceHandler-SMB.c
@@ -106,8 +106,10 @@ s32 deviceHandler_SMB_readDir(file_handle* ffile, file_handle** dir, u32 type){
 	(*dir)[0].fileAttrib = IS_SPECIAL;
 
 	// Read each entry of the directory
-	while( (entry = readdir(dp)) != NULL ){
-		if(!strcmp(entry->d_name, ".") || !strcmp(entry->d_name, "..")) {
+	do {
+		errno = 0;
+		entry = readdir(dp);
+		if(!entry || !strcmp(entry->d_name, ".") || !strcmp(entry->d_name, "..")) {
 			continue;
 		}
 		// Do we want this one?
@@ -128,7 +130,7 @@ s32 deviceHandler_SMB_readDir(file_handle* ffile, file_handle** dir, u32 type){
 			(*dir)[i].fileAttrib = S_ISDIR(fstat.st_mode) ? IS_DIR : IS_FILE;
 			++i;
 		}
-	}
+	} while(entry || errno == EOVERFLOW);
 
 	closedir(dp);
 	return num_entries;