tyler.durden
/
kernel
mirror of https://github.com/FDOS/kernel.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FATFS: rmdir of read only directories is valid 

After comparison with DR-DOS 7.01 and MS-DOS 6.22 over at Dosemu2 it
was seen that rmdir of a directory having the _A_RDONLY bit set should
succeed. This patch makes that change.

For reference the test report can be found in the fdpp issue
https://github.com/dosemu2/fdpp/issues/161. An identical patch has
been applied there.
This commit is contained in:
Andrew Bird 2021-01-07 21:00:12 +00:00 committed by Kenneth J Davis
parent 92ae538f1d
commit 4e21e947fc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/fatfs.c
View File

@ -463,8 +463,9 @@ COUNT dos_rmdir(BYTE * path)
return DE_PATHNOTFND; return DE_PATHNOTFND;
/* Directories may have attributes, but if other than 'archive' */ /* Directories may have attributes, but if other than 'archive' */
/* then do not allow (RDONLY|SYSTEM|HIDDEN) directory to be deleted. */ /* or 'read only' then deny i.e. do not allow (SYSTEM|HIDDEN) */
if (fnp->f_dir.dir_attrib & ~(D_DIR |D_ARCHIVE)) /* directory to be deleted. */
if (fnp->f_dir.dir_attrib & ~(D_DIR | D_RDONLY | D_ARCHIVE))
return DE_ACCESS; return DE_ACCESS;
dir_read(fnp); dir_read(fnp);