archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

=== bugfix ===

Browse Source 
Fixing case where BLI_make_file_string reads one byte before passed in string when the string is empty.
Leftover from patch tracker item #2740 - thanks Andrew Zabolotny.
Also fixed the part that made sure exactly one slash is appended at the end of the dir - comment wasn't telling what the code did here :)
This commit is contained in:
Andrea Weikert
2006-02-11 15:02:23 +00:00
parent fbbe5925ff
commit 05166d0a35
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/blenlib/intern/util.c
View File

@@ -797,6 +797,7 @@ void BLI_make_existing_file(char *name)
void BLI_make_file_string(const char *relabase, char *string, const char *dir, const char *file)
{
int sl;
if (!string || !dir || !file) return; /* We don't want any NULLs */
@@ -827,9 +828,15 @@ void BLI_make_file_string(const char *relabase, char *string, const char *dir,
strcat(string, dir);
/* Make sure string ends in one (and only one) slash */
if (string[strlen(string)-1] != '/' && string[strlen(string)-1] != '\\')
strcat(string, "/");
/* Make sure string ends in one (and only one) slash */
/* first trim all slashes from the end of the string */
sl = strlen(string);
while (sl>0 && ( string[sl-1] == '/' || string[sl-1] == '\\') ) {
string[sl-1] = '\0';
sl--;
}
/* since we've now removed all slashes, put back one slash at the end. */
strcat(string, "/");
while (*file && (*file == '/' || *file == '\\')) /* Trim slashes from the front of file */
file++;