From 7e20aa06f9861469d5f69f982ac34e143e0cb2e5 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Sun, 10 Apr 2016 17:56:53 +0000 Subject: Fix error in WIN32 code when rewriting Fl_File_Browser.cxx for the driver model. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11572 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/drivers/WinAPI/Fl_WinAPI_System_Driver.H | 2 +- src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/drivers/WinAPI') diff --git a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H index 2712942f8..e5bfb41b8 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H +++ b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H @@ -78,7 +78,7 @@ public: virtual int open_uri(const char *uri, char *msg, int msglen); virtual int use_recent_tooltip_fix() {return 1;} virtual int file_browser_load_filesystem(Fl_File_Browser *browser, char *filename, Fl_File_Icon *icon); - virtual int file_browser_load_directory(const char *directory, char *filename, dirent ***pfiles, Fl_File_Sort_F *sort); + virtual int file_browser_load_directory(const char *directory, char *filename, size_t name_size, dirent ***pfiles, Fl_File_Sort_F *sort); virtual void newUUID(char *uuidBuffer); virtual char *preference_rootnode(Fl_Preferences *prefs, Fl_Preferences::Root root, const char *vendor, const char *application); diff --git a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx index 5c4d52421..9df5b2f71 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx +++ b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx @@ -717,16 +717,16 @@ int Fl_WinAPI_System_Driver::file_browser_load_filesystem(Fl_File_Browser *brows return num_files; } -int Fl_WinAPI_System_Driver::file_browser_load_directory(const char *directory, char *filename, dirent ***pfiles, - Fl_File_Sort_F *sort) +int Fl_WinAPI_System_Driver::file_browser_load_directory(const char *directory, char *filename, + size_t name_size, dirent ***pfiles, Fl_File_Sort_F *sort) { - strlcpy(filename, directory, sizeof(filename)); + strlcpy(filename, directory, name_size); int i = (int) (strlen(filename) - 1); if (i == 2 && filename[1] == ':' && (filename[2] == '/' || filename[2] == '\\')) filename[2] = '/'; else if (filename[i] != '/' && filename[i] != '\\') - strlcat(filename, "/", sizeof(filename)); + strlcat(filename, "/", name_size); return filename_list(filename, pfiles, sort); } -- cgit v1.2.3