From c9b5b36906f0b44fc074f8d10acc4be1741e7c7a Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Tue, 22 Jan 2002 00:46:09 +0000 Subject: Fix filename_relative(). git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1942 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/filename_absolute.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') 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 $". // -- cgit v1.2.3