diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-01-22 00:46:09 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-01-22 00:46:09 +0000 |
| commit | c9b5b36906f0b44fc074f8d10acc4be1741e7c7a (patch) | |
| tree | 63bd8db9bd5aaba573faeaf342c9954366d0fac0 | |
| parent | c0175add066cbd4ed3988de1f4f70f615f13f877 (diff) | |
Fix filename_relative().
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1942 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | src/filename_absolute.cxx | 7 |
3 files changed, 10 insertions, 5 deletions
@@ -1,5 +1,7 @@ CHANGES IN FLTK 1.1.0b11 + - filename_relative() didn't always return the correct + relative path. - Updated the test makefile to work with more versions of "make". - Added new "--with-optim" configure option to set the diff --git a/configure.in b/configure.in index 8e4e3d6f9..f20809df6 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl -*- sh -*- dnl the "configure" script is made from this by running GNU "autoconf" dnl -dnl "$Id: configure.in,v 1.33.2.31.2.49 2002/01/13 19:17:36 easysw Exp $" +dnl "$Id: configure.in,v 1.33.2.31.2.50 2002/01/22 00:46:09 easysw Exp $" dnl dnl Configuration script for the Fast Light Tool Kit (FLTK). dnl @@ -35,7 +35,7 @@ dnl FLTK library versions... FL_MAJOR_VERSION=1 FL_MINOR_VERSION=1 FL_PATCH_VERSION=0 -FL_RELEASE_VERSION=b9 +FL_RELEASE_VERSION=b11 FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION} AC_SUBST(FL_MAJOR_VERSION) @@ -683,5 +683,5 @@ dnl Make sure the fltk-config script is executable... chmod +x fltk-config dnl -dnl End of "$Id: configure.in,v 1.33.2.31.2.49 2002/01/13 19:17:36 easysw Exp $". +dnl End of "$Id: configure.in,v 1.33.2.31.2.50 2002/01/22 00:46:09 easysw Exp $". dnl diff --git a/src/filename_absolute.cxx b/src/filename_absolute.cxx index 0ec72db23..d6dee8e0e 100644 --- a/src/filename_absolute.cxx +++ b/src/filename_absolute.cxx @@ -1,5 +1,5 @@ // -// "$Id: filename_absolute.cxx,v 1.5.2.4.2.5 2002/01/01 15:11:31 easysw Exp $" +// "$Id: filename_absolute.cxx,v 1.5.2.4.2.6 2002/01/22 00:46:09 easysw Exp $" // // Filename expansion routines for the Fast Light Tool Kit (FLTK). // @@ -141,6 +141,9 @@ filename_relative(char *to, // O - Relative filename else if (*slash != *newslash) break; #endif // WIN32 || __EMX__ || __APPLE__ + if (*newslash == '\0' && *slash != '\0' && !isdirsep(*slash)) + newslash--; + while (!isdirsep(*slash) && slash > from) slash --; if (isdirsep(*slash)) slash ++; @@ -172,5 +175,5 @@ filename_relative(char *to, // O - Relative filename // -// End of "$Id: filename_absolute.cxx,v 1.5.2.4.2.5 2002/01/01 15:11:31 easysw Exp $". +// End of "$Id: filename_absolute.cxx,v 1.5.2.4.2.6 2002/01/22 00:46:09 easysw Exp $". // |