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

Fixed fl_filename_relative access to const string.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8066 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher 2010-12-19 23:52:59 +00:00
parent 740d7e211f
commit 31f6505cb3
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/filename_absolute.cxx
View File

@ -152,18 +152,20 @@ fl_filename_relative(char *to, // O - Relative filename
\param[out] to resulting relative filename \param[out] to resulting relative filename
\param[in] tolen size of the relative filename buffer \param[in] tolen size of the relative filename buffer
\param[in] from absolute filename \param[in] from absolute filename
\param[in] cwd relative to this absolute path \param[in] base relative to this absolute path
\return 0 if no change, non zero otherwise \return 0 if no change, non zero otherwise
*/ */
int // O - 0 if no change, 1 if changed int // O - 0 if no change, 1 if changed
fl_filename_relative(char *to, // O - Relative filename fl_filename_relative(char *to, // O - Relative filename
int tolen, // I - Size of "to" buffer int tolen, // I - Size of "to" buffer
const char *from, // I - Absolute filename const char *from, // I - Absolute filename
const char *cwd) { // I - Find path relative to this path const char *base) { // I - Find path relative to this path
const char *newslash; // Directory separator char *newslash; // Directory separator
const char *slash; // Directory separator const char *slash; // Directory separator
char *cwd = 0L;
if (base) cwd = strdup(base);
// return if "from" is not an absolute path // return if "from" is not an absolute path
#if defined(WIN32) || defined(__EMX__) #if defined(WIN32) || defined(__EMX__)
if (from[0] == '\0' || if (from[0] == '\0' ||
@ -173,6 +175,7 @@ fl_filename_relative(char *to, // O - Relative filename
if (from[0] == '\0' || !isdirsep(*from)) { if (from[0] == '\0' || !isdirsep(*from)) {
#endif // WIN32 || __EMX__ #endif // WIN32 || __EMX__
strlcpy(to, from, tolen); strlcpy(to, from, tolen);
if (cwd) free(cwd);
return 0; return 0;
} }
@ -185,6 +188,7 @@ fl_filename_relative(char *to, // O - Relative filename
if (!cwd || cwd[0] == '\0' || !isdirsep(*cwd)) { if (!cwd || cwd[0] == '\0' || !isdirsep(*cwd)) {
#endif // WIN32 || __EMX__ #endif // WIN32 || __EMX__
strlcpy(to, from, tolen); strlcpy(to, from, tolen);
if (cwd) free(cwd);
return 0; return 0;
} }
@ -196,6 +200,7 @@ fl_filename_relative(char *to, // O - Relative filename
// test for the exact same string and return "." if so // test for the exact same string and return "." if so
if (!strcasecmp(from, cwd)) { if (!strcasecmp(from, cwd)) {
strlcpy(to, ".", tolen); strlcpy(to, ".", tolen);
free(cwd);
return (1); return (1);
} }
@ -203,6 +208,7 @@ fl_filename_relative(char *to, // O - Relative filename
if (tolower(*from & 255) != tolower(*cwd & 255)) { if (tolower(*from & 255) != tolower(*cwd & 255)) {
// Not the same drive... // Not the same drive...
strlcpy(to, from, tolen); strlcpy(to, from, tolen);
free(cwd);
return 0; return 0;
} }
@ -212,6 +218,7 @@ fl_filename_relative(char *to, // O - Relative filename
// test for the exact same string and return "." if so // test for the exact same string and return "." if so
if (!strcmp(from, cwd)) { if (!strcmp(from, cwd)) {
strlcpy(to, ".", tolen); strlcpy(to, ".", tolen);
free(cwd);
return (1); return (1);
} }
#endif // WIN32 || __EMX__ #endif // WIN32 || __EMX__
@ -255,6 +262,7 @@ fl_filename_relative(char *to, // O - Relative filename
// finally add the differing path from "from" // finally add the differing path from "from"
strlcat(to, slash, tolen); strlcat(to, slash, tolen);
free(cwd);
return 1; return 1;
} }