diff options
| author | Matthias Melcher <git@matthiasm.com> | 2020-01-03 21:38:18 +0100 |
|---|---|---|
| committer | Matthias Melcher <git@matthiasm.com> | 2020-01-03 21:38:18 +0100 |
| commit | 618024827e1d26d790294cbe0aaefe8b67c31642 (patch) | |
| tree | 5fa6500ef276472f99c41b26276f3602d3484146 /src | |
| parent | 1ba9e64ba9fad8bb0193239e53878d471b2f4d53 (diff) | |
| parent | 27d22aeed6e03fdb211bdec1da99d6d7ea7f3974 (diff) | |
Merge remote-tracking branch 'refs/remotes/origin/master'
Diffstat (limited to 'src')
| -rw-r--r-- | src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx | 2 | ||||
| -rw-r--r-- | src/drivers/X11/Fl_X11_System_Driver.cxx | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx index f28802ba0..b18b9c98e 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx +++ b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.cxx @@ -891,7 +891,7 @@ char *Fl_WinAPI_System_Driver::preference_rootnode(Fl_Preferences *prefs, Fl_Pre if ( (application==0L) || (application[0]==0) ) application = "unknown"; - snprintf(filename + strlen(filename), sizeof(filename) - strlen(filename), + snprintf(filename + strlen(filename), FL_PATH_MAX - strlen(filename), "/%s/%s.prefs", vendor, application); for (char *s = filename; *s; s++) if (*s == '\\') *s = '/'; return filename; diff --git a/src/drivers/X11/Fl_X11_System_Driver.cxx b/src/drivers/X11/Fl_X11_System_Driver.cxx index 11e56de23..3c4cc043d 100644 --- a/src/drivers/X11/Fl_X11_System_Driver.cxx +++ b/src/drivers/X11/Fl_X11_System_Driver.cxx @@ -408,17 +408,17 @@ char *Fl_X11_System_Driver::preference_rootnode(Fl_Preferences *prefs, Fl_Prefer case Fl_Preferences::USER: e = getenv("HOME"); // make sure that $HOME is set to an existing directory - if ( (e==0L) || (e[0]=0) || (::access(e, F_OK)==-1) ) ) { + if ( (e==0L) || (e[0]==0) || (::access(e, F_OK)==-1) ) { struct passwd *pw = getpwuid(getuid()); e = pw->pw_dir; } - if ( (e==0L) || (e[0]=0) || (::access(e, F_OK)==-1) ) ) { + if ( (e==0L) || (e[0]==0) || (::access(e, F_OK)==-1) ) { return 0L; } else { - strlcpy(filename, e, sizeof(filename)); + strlcpy(filename, e, FL_PATH_MAX); if (filename[strlen(filename)-1] != '/') - strlcat(filename, "/", sizeof(filename)); - strlcat(filename, ".fltk/", sizeof(filename)); + strlcat(filename, "/", FL_PATH_MAX); + strlcat(filename, ".fltk/", FL_PATH_MAX); } break; case Fl_Preferences::SYSTEM: @@ -432,7 +432,7 @@ char *Fl_X11_System_Driver::preference_rootnode(Fl_Preferences *prefs, Fl_Prefer if ( (application==0L) || (application[0]==0) ) application = "unknown"; - snprintf(filename + strlen(filename), sizeof(filename) - strlen(filename), + snprintf(filename + strlen(filename), FL_PATH_MAX - strlen(filename), "%s/%s.prefs", vendor, application); return filename; } |