Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-06 00:22:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fl_filename_list returns -1 now (Win32) if it was called with

Browse Source 
a non-existing directory.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3014 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher
2003-05-28 16:38:09 +00:00
parent 5ccb6afda8
commit 0753014e30
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+2
View File
@@ -1,5 +1,7 @@
CHANGES IN FLTK 1.1.4 CHANGES IN FLTK 1.1.4
- fl_filename_list returned 0 on Win32 if no directory
existed (STR #54)
- Pressing 'home' after the last letter in a Text_Editor - Pressing 'home' after the last letter in a Text_Editor
would move the cursor to pos 0 (STR #39) would move the cursor to pos 0 (STR #39)
- Fl::get_key(x) would mix up Ctrl and Meta on OS X (STR - Fl::get_key(x) would mix up Ctrl and Meta on OS X (STR
src/scandir_win32.c
+6 -5
View File
@@ -1,5 +1,5 @@
/* /*
* "$Id: scandir_win32.c,v 1.11.2.4.2.6 2003/01/30 21:44:38 easysw Exp $" * "$Id: scandir_win32.c,v 1.11.2.4.2.7 2003/05/28 16:38:09 matthiaswm Exp $"
* *
* WIN32 scandir function for the Fast Light Tool Kit (FLTK). * WIN32 scandir function for the Fast Light Tool Kit (FLTK).
* *
@@ -45,7 +45,7 @@ int fl_scandir(const char *dirname, struct dirent ***namelist,
len = strlen(dirname); len = strlen(dirname);
findIn = malloc(len+5); findIn = malloc(len+5);
if (!findIn) return 0; if (!findIn) return -1;
strcpy(findIn, dirname); strcpy(findIn, dirname);
for (d = findIn; *d; d++) if (*d=='/') *d='\\'; for (d = findIn; *d; d++) if (*d=='/') *d='\\';
@@ -58,7 +58,7 @@ int fl_scandir(const char *dirname, struct dirent ***namelist,
free(findIn); free(findIn);
ret = GetLastError(); ret = GetLastError();
if (ret != ERROR_NO_MORE_FILES) { if (ret != ERROR_NO_MORE_FILES) {
/* TODO: return some error code */ nDir = -1;
} }
*namelist = dir; *namelist = dir;
return nDir; return nDir;
@@ -87,7 +87,8 @@ int fl_scandir(const char *dirname, struct dirent ***namelist,
} while (FindNextFile(h, &find)); } while (FindNextFile(h, &find));
ret = GetLastError(); ret = GetLastError();
if (ret != ERROR_NO_MORE_FILES) { if (ret != ERROR_NO_MORE_FILES) {
/* TODO: return some error code */ /* don't return an error code, because the dir list may still be valid
up to this point */
} }
FindClose(h); FindClose(h);
@@ -103,5 +104,5 @@ int fl_scandir(const char *dirname, struct dirent ***namelist,
#endif #endif
/* /*
* End of "$Id: scandir_win32.c,v 1.11.2.4.2.6 2003/01/30 21:44:38 easysw Exp $". * End of "$Id: scandir_win32.c,v 1.11.2.4.2.7 2003/05/28 16:38:09 matthiaswm Exp $".
*/ */