mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove erroneous uses of sizeof(filename) where filename is a char* and not a char array

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@12051 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2016-10-19 17:25:53 +00:00
parent da276e6efa
commit 8970b21aa2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/drivers/X11/Fl_X11_System_Driver.cxx
View File

@ -249,10 +249,10 @@ int Fl_X11_System_Driver::file_browser_load_filesystem(Fl_File_Browser *browser,
} else {
for (int i = 0, vp = (struct vmount *) list; i < res; ++i) {
name = (char *) vp + vp->vmt_data[VMT_STUB].vmt_off;
strlcpy(filename, name, sizeof(filename));
strlcpy(filename, name, lname);
// Skip the already added root filesystem
if (strcmp("/", filename) != 0) {
strlcat(filename, "/", sizeof(filename));
strlcat(filename, "/", lname);
browser->add(filename, icon);
}
vp = (struct vmount *) ((char *) vp + vp->vmt_length);
@ -280,10 +280,10 @@ int Fl_X11_System_Driver::file_browser_load_filesystem(Fl_File_Browser *browser,
res = getmntinfo(&list, ST_WAIT);
if (0 < res) {
for (int i = 0; i < res; ++i) {
strlcpy(filename, list[i].f_mntonname, sizeof(filename));
strlcpy(filename, list[i].f_mntonname, lname);
// Skip the already added root filesystem
if (strcmp("/", filename) != 0) {
strlcat(filename, "/", sizeof(filename));
strlcat(filename, "/", lname);
browser->add(filename, icon);
}
}
@ -333,7 +333,7 @@ int Fl_X11_System_Driver::file_browser_load_filesystem(Fl_File_Browser *browser,
continue; // "/" was added before
// Add a trailing slash (except for the root filesystem)
strlcat(filename, "/", sizeof(filename));
strlcat(filename, "/", lname);
// printf("Fl_File_Browser::load() - adding \"%s\" to list...\n", filename);
browser->add(filename, icon);