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

Merged if status==S_OPENED logic in dos_open, cache dir_attrib, and remove

Browse Source 
unnecessary init to 0.


git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@1447 6ac86273-5f31-0410-b378-82cca8765d1b
This commit is contained in:
Bart Oldeman 2009-06-16 20:13:41 +00:00
parent 4d0e2c4b47
commit d854929efb
1 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
kernel/fatfs.c
View File

@ -104,7 +104,6 @@ struct dpb FAR *get_dpb(COUNT dsk)
STATIC void init_direntry(struct dirent *dentry, unsigned attrib, STATIC void init_direntry(struct dirent *dentry, unsigned attrib,
CLUSTER cluster, char *name) CLUSTER cluster, char *name)
{ {
dentry->dir_size = 0l;
memset(dentry, 0, sizeof(struct dirent)); memset(dentry, 0, sizeof(struct dirent));
memcpy(dentry->dir_name, name, FNAME_SIZE + FEXT_SIZE); memcpy(dentry->dir_name, name, FNAME_SIZE + FEXT_SIZE);
#ifdef WITHFAT32 #ifdef WITHFAT32
@ -138,13 +137,14 @@ int dos_open(char *path, unsigned flags, unsigned attrib, int fd)
/* find one, truncate it (O_CREAT). */ /* find one, truncate it (O_CREAT). */
if (status == SUCCESS) if (status == SUCCESS)
{ {
unsigned char dir_attrib = fnp->f_dir.dir_attrib;
if (flags & O_TRUNC) if (flags & O_TRUNC)
{ {
/* The only permissable attribute is archive, */ /* The only permissable attribute is archive, */
/* check for any other bit set. If it is, give */ /* check for any other bit set. If it is, give */
/* an access error. */ /* an access error. */
if ((fnp->f_dir.dir_attrib & (D_RDONLY | D_DIR | D_VOLID)) if ((dir_attrib & (D_RDONLY | D_DIR | D_VOLID))
|| (fnp->f_dir.dir_attrib & ~D_ARCHIVE & ~attrib)) || (dir_attrib & ~D_ARCHIVE & ~attrib))
return DE_ACCESS; return DE_ACCESS;
/* Release the existing files FAT and set the */ /* Release the existing files FAT and set the */
@ -156,15 +156,14 @@ int dos_open(char *path, unsigned flags, unsigned attrib, int fd)
else if (flags & O_OPEN) else if (flags & O_OPEN)
{ {
/* force r/o open for FCB if the file is read-only */ /* force r/o open for FCB if the file is read-only */
if ((flags & O_FCB) && (fnp->f_dir.dir_attrib & D_RDONLY)) if ((flags & O_FCB) && (dir_attrib & D_RDONLY))
flags = (flags & ~3) | O_RDONLY; flags = (flags & ~3) | O_RDONLY;
/* Check permissions. -- JPP /* Check permissions. -- JPP
(do not allow to open volume labels/directories, (do not allow to open volume labels/directories,
and do not allow writing to r/o files) */ and do not allow writing to r/o files) */
if ((fnp->f_dir.dir_attrib & (D_DIR | D_VOLID)) || if ((dir_attrib & (D_DIR | D_VOLID)) ||
((fnp->f_dir.dir_attrib & D_RDONLY) && ((dir_attrib & D_RDONLY) && ((flags & O_ACCMODE) != O_RDONLY)))
((flags & O_ACCMODE) != O_RDONLY)))
return DE_ACCESS; return DE_ACCESS;
status = S_OPENED; status = S_OPENED;
} }
@ -187,32 +186,24 @@ int dos_open(char *path, unsigned flags, unsigned attrib, int fd)
return status; return status;
} }
if (status != S_OPENED) /* Now change to file */
fnp->f_sft_idx = fd;
fnp->f_offset = 0l;
fnp->f_cluster_offset = 0;
fnp->f_flags &= ~(SFT_FDATE|SFT_FCLEAN);
if (status == S_OPENED)
fnp->f_flags |= SFT_FCLEAN;
else
{ {
init_direntry(&fnp->f_dir, attrib, FREE, fnp->f_dmp->dm_name_pat); init_direntry(&fnp->f_dir, attrib, FREE, fnp->f_dmp->dm_name_pat);
if (!dir_write(fnp)) if (!dir_write(fnp))
return DE_ACCESS; return DE_ACCESS;
} }
/* Now change to file */
fnp->f_sft_idx = fd;
fnp->f_offset = 0l;
if (status != S_OPENED)
{
fnp->f_cluster = FREE;
setdstart(fnp->f_dpb, &fnp->f_dir, FREE);
fnp->f_cluster_offset = 0;
}
fnp->f_flags &= ~(SFT_FDATE|SFT_FCLEAN);
if (status == S_OPENED)
fnp->f_flags |= SFT_FCLEAN;
merge_file_changes(fnp, status == S_OPENED); /* /// Added - Ron Cemer */ merge_file_changes(fnp, status == S_OPENED); /* /// Added - Ron Cemer */
/* /// Moved from above. - Ron Cemer */ /* /// Moved from above. - Ron Cemer */
fnp->f_cluster = getdstart(fnp->f_dpb, &fnp->f_dir); fnp->f_cluster = getdstart(fnp->f_dpb, &fnp->f_dir);
fnp->f_cluster_offset = 0;
fnode_to_sft(fnp); fnode_to_sft(fnp);
return status; return status;