tyler.durden/kernel
1
0
Fork 0
mirror of https://github.com/FDOS/kernel.git synced 2025-07-25 14:54:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug 1953: 21h/29h returns 0 (valid) for all drive root names up to

Browse Source 
LASTDRIVE. Also, if the drive is invalid this function no longer fills in
any values in the destination FCB.


git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@1334 6ac86273-5f31-0410-b378-82cca8765d1b
This commit is contained in:
Bart Oldeman 2007-06-04 16:35:53 +00:00
parent 920274e93a
commit 3f1938d8e8
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
kernel/fcbfns.c
View File

@ -93,22 +93,6 @@ UWORD FcbParseFname(UBYTE *wTestMode, const BYTE FAR * lpFileName, fcb FAR * lpF
WORD wRetCodeName = FALSE, wRetCodeExt = FALSE; WORD wRetCodeName = FALSE, wRetCodeExt = FALSE;
/* pjv -- ExtFcbToFcb? */ /* pjv -- ExtFcbToFcb? */
/* Start out with some simple stuff first. Check if we are */
/* going to use a default drive specificaton. */
if (!(*wTestMode & PARSE_DFLT_DRIVE))
lpFcb->fcb_drive = FDFLT_DRIVE;
if (!(*wTestMode & PARSE_BLNK_FNAME))
{
fmemset(lpFcb->fcb_fname, ' ', FNAME_SIZE);
}
if (!(*wTestMode & PARSE_BLNK_FEXT))
{
fmemset(lpFcb->fcb_fext, ' ', FEXT_SIZE);
}
/* Undocumented behavior, set record number & record size to 0 */
lpFcb->fcb_cublock = lpFcb->fcb_recsiz = 0;
if (!(*wTestMode & PARSE_SEP_STOP)) if (!(*wTestMode & PARSE_SEP_STOP))
{ {
lpFileName = ParseSkipWh(lpFileName); lpFileName = ParseSkipWh(lpFileName);
@ -125,7 +109,7 @@ UWORD FcbParseFname(UBYTE *wTestMode, const BYTE FAR * lpFileName, fcb FAR * lpF
/* non-portable construct to be changed */ /* non-portable construct to be changed */
REG UBYTE Drive = DosUpFChar(*lpFileName) - 'A'; REG UBYTE Drive = DosUpFChar(*lpFileName) - 'A';
if (Drive >= lastdrive) if (get_cds(Drive) == NULL)
{ {
*wTestMode = PARSE_RET_BADDRIVE; *wTestMode = PARSE_RET_BADDRIVE;
return FP_OFF(lpFileName); return FP_OFF(lpFileName);
@ -133,6 +117,20 @@ UWORD FcbParseFname(UBYTE *wTestMode, const BYTE FAR * lpFileName, fcb FAR * lpF
lpFcb->fcb_drive = Drive + 1; lpFcb->fcb_drive = Drive + 1;
lpFileName += 2; lpFileName += 2;
} else if (!(*wTestMode & PARSE_DFLT_DRIVE)) {
lpFcb->fcb_drive = FDFLT_DRIVE;
}
/* Undocumented behavior, set record number & record size to 0 */
lpFcb->fcb_cublock = lpFcb->fcb_recsiz = 0;
if (!(*wTestMode & PARSE_BLNK_FNAME))
{
fmemset(lpFcb->fcb_fname, ' ', FNAME_SIZE);
}
if (!(*wTestMode & PARSE_BLNK_FEXT))
{
fmemset(lpFcb->fcb_fext, ' ', FEXT_SIZE);
} }
/* special cases: '.' and '..' */ /* special cases: '.' and '..' */