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

Move permission check to better place (only for necessary for opening 

existing files), not for creating them -- suggested by Steffen.


git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@727 6ac86273-5f31-0410-b378-82cca8765d1b
This commit is contained in:
Bart Oldeman 2003-11-23 18:03:35 +00:00
parent 3232712fae
commit a56e592871
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
kernel/fatfs.c
View File

@ -149,7 +149,20 @@ long dos_open(char *path, unsigned flags, unsigned attrib)
wipe_out(fnp); wipe_out(fnp);
status = S_REPLACED; status = S_REPLACED;
} }
else if (!(flags & O_OPEN)) else if (flags & O_OPEN)
{
/* force r/o open for FCB if the file is read-only */
if ((flags & O_FCB) && (fnp->f_dir.dir_attrib & D_RDONLY))
flags = (flags & ~3) | O_RDONLY;
/* Check permissions. -- JPP */
if ((fnp->f_dir.dir_attrib & D_RDONLY) && ((flags & 3) != O_RDONLY))
{
dir_close(fnp);
return DE_ACCESS;
}
}
else
{ {
dir_close(fnp); dir_close(fnp);
return DE_FILEEXISTS; return DE_FILEEXISTS;
@ -216,19 +229,6 @@ long dos_open(char *path, unsigned flags, unsigned attrib)
} }
} }
/* force r/o open for FCB and legacy creat if the file is read-only */
if (((flags & O_FCB)
|| (flags & (O_CREAT | O_LEGACY)) == (O_CREAT | O_LEGACY))
&& (fnp->f_dir.dir_attrib & D_RDONLY))
fnp->f_mode = O_RDONLY;
/* Check permissions. -- JPP */
if ((fnp->f_dir.dir_attrib & D_RDONLY) && (fnp->f_mode != O_RDONLY))
{
dir_close(fnp);
return DE_ACCESS;
}
/* Now change to file */ /* Now change to file */
fnp->f_offset = 0l; fnp->f_offset = 0l;