qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-26 22:31:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix some .. path compression bugs

Browse source
This commit is contained in:
Bill Currie 2002-01-21 17:36:22 +00:00
parent 9833b7009d
commit d5fb0f5a68
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libs/gamecode/builtins/bi_file.c
View file

@ -71,14 +71,18 @@ bi_File_Open (progs_t *pr)
if (p[1] == '.') {
if (p[2] == '/' || p[2] == 0) {
d = p;
if (d > path)
d--;
while (d > path && d[-1] != '/')
d--;
if (d == path
|| (d[-1] == '.' && d[-2] == '.'
&& (d - 2 == path || d[-3] == '/')))
&& d[0] == '.' && d[1] == '.'
&& (d[2] == '/' || d[2] == '0')) {
p += 2 + (p[2] == '/');
continue;
strcpy (d, p + 2);
p = d + 1;
}
strcpy (d, p + 2 + (p[2] == '/'));
p = d + (d != path);
}
} else if (p[1] == '/') {
strcpy (p, p + 2);
@ -92,7 +96,7 @@ bi_File_Open (progs_t *pr)
if (*p == '/')
p++;
}
printf ("'%s' '%s'\n", G_STRING (pr, OFS_PARM0), path);
//printf ("'%s' '%s'\n", G_STRING (pr, OFS_PARM0), path);
if (!path[0])
goto error;
if (path[0] == '.' && path[1] == '.' && (path[2] == '/' || path [2] == 0))