diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2005-05-13 03:19:13 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2005-05-13 03:19:13 +0000 |
| commit | 79de1e070de8551106af305e4c52f1ce84a56203 (patch) | |
| tree | 298d928059439decf69ad49fb50570e3c5d106f6 | |
| parent | 2c8fc6f66aaea63087979ca411cfa0d68abdca3c (diff) | |
filename_relative() now converts the current directory to forward
slashes as needed on WIN32 (STR #816)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4347 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | src/filename_absolute.cxx | 3 |
2 files changed, 5 insertions, 0 deletions
@@ -2,6 +2,8 @@ CHANGES IN FLTK 1.1.7 - Documentation fixes (STR #648, STR #692, STR #730, STR #744, STR #745) + - filename_relative() now converts the current directory + to forward slashes as needed on WIN32 (STR #816) - Fl_File_Chooser::value() and ::directory() now handle paths with backslashes on WIN32 (STR #811) - Added the standard rgb.txt file from X11 to the test diff --git a/src/filename_absolute.cxx b/src/filename_absolute.cxx index eda86d94b..6ffc6df39 100644 --- a/src/filename_absolute.cxx +++ b/src/filename_absolute.cxx @@ -134,6 +134,9 @@ fl_filename_relative(char *to, // O - Relative filename } #if defined(WIN32) || defined(__EMX__) + for (slash = strchr(cwd, '\\'); slash; slash = strchr(slash + 1, '\\')) + *slash = '/'; + if (!strcasecmp(from, cwd)) { strlcpy(to, ".", tolen); return (1); |