tyler.durden/kernel
1
0
Fork 0
mirror of https://github.com/FDOS/kernel.git synced 2025-07-23 22:04:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

The truename function must use the current working directory of

Browse Source 
the virtual / created-by-subst drive when it resolves relative
paths, even though truename returns the "real" drive and dir
of where your files actually are in the end. Using the current
directory of the "real" drive made truename give wrong results.

PS: If "subst e: d:\" says "physical path x:\ cannot be made",
then it refers to "making" a root dir. "subst e: d:\foo" works.


git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@1357 6ac86273-5f31-0410-b378-82cca8765d1b
This commit is contained in:
Eric Auer 2007-09-15 22:01:03 +00:00
parent 0b8ae53670
commit 0cc297cf2d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/newstuff.c
View File

@ -425,6 +425,7 @@ COUNT truename(const char FAR * src, char * dest, COUNT mode)
rootPos = p = dest + 2;
if (*p != '/') /* i.e., it's a backslash! */
{
COUNT prevresult = result;
if (!(mode & CDS_MODE_SKIP_PHYSICAL))
{
tn_printf(("SUBSTing from: %S\n", cdsEntry->cdsCurrentPath));
@ -441,6 +442,7 @@ COUNT truename(const char FAR * src, char * dest, COUNT mode)
{ /* sanity check if this really is a local drive still */
unsigned i = drLetterToNr(dest[0]);
/* truename returns the "real", not the "virtual" drive letter! */
if (i < lastdrive) /* sanity check #2 */
result = (result & 0xffe0) | i;
}
@ -449,7 +451,9 @@ COUNT truename(const char FAR * src, char * dest, COUNT mode)
*p = '\\'; /* force backslash! */
}
p++;
if (DosGetCuDir((UBYTE)((result & 0x1f) + 1), p) < 0)
/* truename must use the CuDir of the "virtual" drive letter! */
/* tn_printf(("DosGetCuDir drive #%u\n", prevresult & 0x1f)); */
if (DosGetCuDir((UBYTE)((prevresult & 0x1f) + 1), p) < 0)
return DE_PATHNOTFND;
if (*src != '\\' && *src != '/')
p += strlen(p);
@ -591,7 +595,7 @@ COUNT truename(const char FAR * src, char * dest, COUNT mode)
{
strcpy(dest + 2, dest + j);
}
result = (result & 0xffe0) | i;
result = (result & 0xffe0) | i; /* tweak drive letter (JOIN) */
current_ldt = cdsp;
result &= ~IS_NETWORK;
if (cdsp->cdsFlags & CDSNETWDRV)