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

Use simpler code for copying the current directory constructing the "truename":

Browse Source 
instead of fmemcpy followed by strcpy, just use strcpy. Also use the near
TempCDS more.


git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@1475 6ac86273-5f31-0410-b378-82cca8765d1b
This commit is contained in:
Bart Oldeman 2009-07-06 02:22:06 +00:00
parent de81ab4e46
commit 5ad1fd51e1
1 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
kernel/newstuff.c
View File

@ -304,12 +304,13 @@ COUNT truename(const char FAR * src, char * dest, COUNT mode)
if (cdsEntry == NULL) if (cdsEntry == NULL)
return DE_PATHNOTFND; return DE_PATHNOTFND;
fmemcpy(&TempCDS, cdsEntry, sizeof(TempCDS));
tn_printf(("CDS entry: #%u @%p (%u) '%S'\n", result, cdsEntry, tn_printf(("CDS entry: #%u @%p (%u) '%S'\n", result, cdsEntry,
cdsEntry->cdsBackslashOffset, cdsEntry->cdsCurrentPath)); TempCDS.cdsBackslashOffset, TempCDS.cdsCurrentPath));
/* is the current_ldt thing necessary for compatibly?? /* is the current_ldt thing necessary for compatibly??
-- 2001/09/03 ska*/ -- 2001/09/03 ska*/
current_ldt = cdsEntry; current_ldt = cdsEntry;
if (cdsEntry->cdsFlags & CDSNETWDRV) if (TempCDS.cdsFlags & CDSNETWDRV)
result |= IS_NETWORK; result |= IS_NETWORK;
dhp = IsDevice(src); /* returns header if -char- device */ dhp = IsDevice(src); /* returns header if -char- device */
@ -385,34 +386,7 @@ COUNT truename(const char FAR * src, char * dest, COUNT mode)
if (*p != '/') /* i.e., it's a backslash! */ if (*p != '/') /* i.e., it's a backslash! */
{ {
BYTE *cp; BYTE *cp;
if (!(mode & CDS_MODE_SKIP_PHYSICAL))
{
tn_printf(("SUBSTing from: %S\n", cdsEntry->cdsCurrentPath));
/* What to do now: the logical drive letter will be replaced by the hidden
portion of the associated path. This is necessary for NETWORK and
SUBST drives. For local drives it should not harm.
This is actually the reverse mechanism of JOINED drives. */
fmemcpy(dest, cdsEntry->cdsCurrentPath, cdsEntry->cdsBackslashOffset);
if (cdsEntry->cdsFlags & CDSSUBST)
{
/* The drive had been changed --> update the CDS pointer */
if (dest[1] == ':')
{ /* 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;
}
}
rootPos = p = dest + current_ldt->cdsBackslashOffset;
*p = '\\'; /* force backslash! */
}
p++;
/* truename must use the CuDir of the "virtual" drive letter! */
/* tn_printf(("DosGetCuDir drive #%u\n", prevresult & 0x1f)); */
fmemcpy(&TempCDS, cdsEntry, sizeof(TempCDS));
cp = TempCDS.cdsCurrentPath; cp = TempCDS.cdsCurrentPath;
/* ensure termination of strcpy */ /* ensure termination of strcpy */
cp[MAX_CDSPATH - 1] = '\0'; cp[MAX_CDSPATH - 1] = '\0';
@ -430,11 +404,39 @@ COUNT truename(const char FAR * src, char * dest, COUNT mode)
} }
} }
cp += TempCDS.cdsBackslashOffset; if (!(mode & CDS_MODE_SKIP_PHYSICAL))
if (*cp == '\0') {
p[0] = '\0'; tn_printf(("SUBSTing from: %S\n", cp));
/* What to do now: the logical drive letter will be replaced by the hidden
portion of the associated path. This is necessary for NETWORK and
SUBST drives. For local drives it should not harm.
This is actually the reverse mechanism of JOINED drives. */
strcpy(dest, cp);
if (TempCDS.cdsFlags & CDSSUBST)
{
/* The drive had been changed --> update the CDS pointer */
if (dest[1] == ':')
{ /* 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;
}
}
rootPos = p = dest + TempCDS.cdsBackslashOffset;
}
else else
strcpy(p, cp + 1); {
cp += TempCDS.cdsBackslashOffset;
/* truename must use the CuDir of the "virtual" drive letter! */
/* tn_printf(("DosGetCuDir drive #%u\n", prevresult & 0x1f)); */
strcpy(p, cp);
}
if (p[0] == '\0')
p[1] = p[0];
p[0] = '\\'; /* force backslash! */
if (*src != '\\' && *src != '/') if (*src != '\\' && *src != '/')
p += strlen(p); p += strlen(p);
@ -626,7 +628,7 @@ COUNT truename(const char FAR * src, char * dest, COUNT mode)
if (os_major==6 && (result & (IS_DEVICE|IS_NETWORK)) == IS_DEVICE) if (os_major==6 && (result & (IS_DEVICE|IS_NETWORK)) == IS_DEVICE)
result = 0x3a00; /* MS DOS 6.22, according to RBIL: AH=3a if char dev */ result = 0x3a00; /* MS DOS 6.22, according to RBIL: AH=3a if char dev */
else else
result = 0; /* AL is 00, 2f, 5c, or last-of-cdsEntry->cdsCurrentPath? */ result = 0; /* AL is 00, 2f, 5c, or last-of-TempCDS.cdsCurrentPath? */
} }
tn_printf(("Physical path: \"%s\"\n", dest)); tn_printf(("Physical path: \"%s\"\n", dest));
return result; return result;