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

Copy FCB-format filename from PriPathName

Browse Source 
(some redirectors require FCB-format filename stored in SDA+22Bh DirEntBuffer)
This commit is contained in:
lpproj 2015-09-22 12:19:27 +09:00
parent 9f254f2bee
commit a87e233849
1 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
kernel/dosfns.c
View File

@ -414,6 +414,17 @@ const char FAR *get_root(const char FAR * fname)
return fname; return fname;
} }
STATIC void ConvertPathNameToFCBName(char *FCBName, const char *PathName)
{
ConvertNameSZToName83(FCBName, (char *)FP_OFF(get_root(PathName)));
FCBName[FNAME_SIZE + FEXT_SIZE] = '\0';
}
STATIC void set_fcbname(void)
{
ConvertPathNameToFCBName(DirEntBuffer.dir_name, PriPathName);
}
/* initialize SFT fields (for open/creat) for character devices */ /* initialize SFT fields (for open/creat) for character devices */
STATIC int DeviceOpenSft(struct dhdr FAR *dhp, sft FAR *sftp) STATIC int DeviceOpenSft(struct dhdr FAR *dhp, sft FAR *sftp)
{ {
@ -490,6 +501,8 @@ long DosOpenSft(char FAR * fname, unsigned flags, unsigned attrib)
if (result < SUCCESS) if (result < SUCCESS)
return result; return result;
set_fcbname();
/* now get a free system file table entry */ /* now get a free system file table entry */
if ((sftp = get_free_sft(&sft_idx)) == (sft FAR *) - 1) if ((sftp = get_free_sft(&sft_idx)) == (sft FAR *) - 1)
return DE_TOOMANY; return DE_TOOMANY;
@ -919,6 +932,8 @@ COUNT DosChangeDir(BYTE FAR * s)
if (result < SUCCESS) if (result < SUCCESS)
return DE_PATHNOTFND; return DE_PATHNOTFND;
set_fcbname();
if ((FP_OFF(current_ldt) != 0xFFFF) && if ((FP_OFF(current_ldt) != 0xFFFF) &&
(strlen(PriPathName) >= sizeof(current_ldt->cdsCurrentPath))) (strlen(PriPathName) >= sizeof(current_ldt->cdsCurrentPath)))
return DE_PATHNOTFND; return DE_PATHNOTFND;
@ -977,6 +992,8 @@ COUNT DosFindFirst(UCOUNT attr, BYTE FAR * name)
if (rc < SUCCESS) if (rc < SUCCESS)
return rc; return rc;
set_fcbname();
/* /// Added code here to do matching against device names. /* /// Added code here to do matching against device names.
DOS findfirst will match exact device names if the DOS findfirst will match exact device names if the
filename portion (excluding the extension) contains filename portion (excluding the extension) contains
@ -1049,7 +1066,7 @@ COUNT DosFindNext(void)
/* findnext will always fail on a volume id search or device name */ /* findnext will always fail on a volume id search or device name */
if ((sda_tmp_dm.dm_attr_srch & ~(D_RDONLY | D_ARCHIVE | D_DEVICE)) == D_VOLID if ((sda_tmp_dm.dm_attr_srch & ~(D_RDONLY | D_ARCHIVE | D_DEVICE)) == D_VOLID
|| sda_tmp_dm.dm_entry == 0xffff) || (!(sda_tmp_dm.dm_drive & 0x80) && sda_tmp_dm.dm_entry == 0xffff))
return DE_NFILES; return DE_NFILES;
memset(&SearchDir, 0, sizeof(struct dirent)); memset(&SearchDir, 0, sizeof(struct dirent));
@ -1113,6 +1130,8 @@ COUNT DosGetFattr(BYTE FAR * name)
if (PriPathName[3] == '\0') if (PriPathName[3] == '\0')
return 0x10; return 0x10;
set_fcbname();
if (result & IS_NETWORK) if (result & IS_NETWORK)
return network_redirector(REM_GETATTRZ); return network_redirector(REM_GETATTRZ);
@ -1133,6 +1152,8 @@ COUNT DosSetFattr(BYTE FAR * name, UWORD attrp)
if (result < SUCCESS) if (result < SUCCESS)
return result; return result;
set_fcbname();
if (result & IS_NETWORK) if (result & IS_NETWORK)
return remote_setfattr(attrp); return remote_setfattr(attrp);
@ -1170,6 +1191,8 @@ COUNT DosDelete(BYTE FAR * path, int attrib)
if (result < SUCCESS) if (result < SUCCESS)
return result; return result;
set_fcbname();
if (result & IS_NETWORK) if (result & IS_NETWORK)
return network_redirector(REM_DELETE); return network_redirector(REM_DELETE);
@ -1206,6 +1229,8 @@ COUNT DosRename(BYTE FAR * path1, BYTE FAR * path2)
if (result < SUCCESS) if (result < SUCCESS)
return result; return result;
set_fcbname();
if ((result & (IS_NETWORK | IS_DEVICE)) == IS_DEVICE) if ((result & (IS_NETWORK | IS_DEVICE)) == IS_DEVICE)
return DE_FILENOTFND; return DE_FILENOTFND;
@ -1220,6 +1245,8 @@ COUNT DosMkRmdir(const char FAR * dir, int action)
if (result < SUCCESS) if (result < SUCCESS)
return result; return result;
set_fcbname();
if (result & IS_NETWORK) if (result & IS_NETWORK)
return network_redirector(action == 0x39 ? REM_MKDIR : REM_RMDIR); return network_redirector(action == 0x39 ? REM_MKDIR : REM_RMDIR);
@ -1355,7 +1382,10 @@ COUNT DosTruename(const char FAR *src, char FAR *dest)
*/ */
COUNT rc = truename(src, PriPathName, CDS_MODE_ALLOW_WILDCARDS); COUNT rc = truename(src, PriPathName, CDS_MODE_ALLOW_WILDCARDS);
if (rc >= SUCCESS) if (rc >= SUCCESS)
{
fstrcpy(dest, PriPathName); fstrcpy(dest, PriPathName);
set_fcbname();
}
return rc; return rc;
} }