OS_Develop/FreeDOS
OS_Develop/FreeDOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not compares filenames to name field in block devices

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@1127 6ac86273-5f31-0410-b378-82cca8765d1b
This commit is contained in:
Kenneth J Davis 2005-07-10 01:19:29 +00:00
parent 790ad53fee
commit 696614a6c1
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
kernel/dosfns.c
View File

@ -1370,7 +1370,10 @@ COUNT DosLockUnlock(COUNT hndl, LONG pos, LONG len, COUNT unlock)
* This seems to work well. * This seems to work well.
*/ */
/* check for a device */ /* check for a device
returns device header if match, else returns NULL
can only match character devices (as only they have names)
*/
struct dhdr FAR *IsDevice(const char FAR * fname) struct dhdr FAR *IsDevice(const char FAR * fname)
{ {
struct dhdr FAR *dhp; struct dhdr FAR *dhp;
@ -1387,15 +1390,35 @@ struct dhdr FAR *IsDevice(const char FAR * fname)
{ {
*/ */
/* BUGFIX: MSCD000<00> should be handled like MSCD000<20> TE
ie the 8 character device name may be padded with spaces ' ' or NULs '\0'
Note: fname is assumed an ASCIIZ string (ie not padded, unknown length)
but the name in the device header is assumed FNAME_SIZE and padded. KJD
*/
/* check for names that will never be devices to avoid checking all device headers.
only the file name (not path nor extension) need be checked, "" == root or empty name
*/
if ( (*froot == '\0') ||
((*froot=='.') && ((*(froot+1)=='\0') || (*(froot+2)=='\0' && *(froot+1)=='.')))
)
{
return NULL;
}
/* cycle through all device headers checking for match */
for (dhp = (struct dhdr FAR *)&nul_dev; dhp != (struct dhdr FAR *)-1; for (dhp = (struct dhdr FAR *)&nul_dev; dhp != (struct dhdr FAR *)-1;
dhp = dhp->dh_next) dhp = dhp->dh_next)
{ {
if (!(dhp->dh_attr & ATTR_CHAR)) /* if this is block device, skip */
/* BUGFIX: MSCD000<00> should be handled like MSCD000<20> TE */ continue;
for (i = 0; i < FNAME_SIZE; i++) for (i = 0; i < FNAME_SIZE; i++)
{ {
unsigned char c1 = (unsigned char)froot[i]; unsigned char c1 = (unsigned char)froot[i];
/* ignore extensions and handle filenames shorter than FNAME_SIZE */
if (c1 == '.' || c1 == '\0') if (c1 == '.' || c1 == '\0')
{ {
/* check if remainder of device name consists of spaces or nulls */ /* check if remainder of device name consists of spaces or nulls */
@ -1410,6 +1433,8 @@ struct dhdr FAR *IsDevice(const char FAR * fname)
if (DosUpFChar(c1) != DosUpFChar(dhp->dh_name[i])) if (DosUpFChar(c1) != DosUpFChar(dhp->dh_name[i]))
break; break;
} }
/* if found a match then return device header */
if (i == FNAME_SIZE) if (i == FNAME_SIZE)
return dhp; return dhp;
} }