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

Remove usage of the fnode f_flags field where it is not relevant anymore.

Browse Source 
Because of the explicit dir_write() calls we only need them in situations
where SFTs where used, that is for open files but not for directories.


git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@1436 6ac86273-5f31-0410-b378-82cca8765d1b
This commit is contained in:
Bart Oldeman 2009-06-11 12:33:30 +00:00
parent 3a16a4c755
commit 76c967d581
2 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/fatdir.c
View File

@ -43,8 +43,6 @@ VOID dir_init_fnode(f_node_ptr fnp, CLUSTER dirstart)
{
/* reset the directory flags */
fnp->f_sft_idx = 0xff;
fnp->f_flags &= ~SFT_FDATE;
fnp->f_flags |= SFT_FCLEAN;
fnp->f_dmp = &sda_tmp_dm;
if (fnp == &fnode[1])
fnp->f_dmp = &sda_tmp_dm_ren;
@ -211,9 +209,6 @@ COUNT dir_read(REG f_node_ptr fnp)
swap_deleted(fnp->f_dir.dir_name);
/* Update the fnode's directory info */
fnp->f_flags |= SFT_FCLEAN;
/* and for efficiency, stop when we hit the first */
/* unused entry. */
/* either returns 1 or 0 */
@ -235,7 +230,7 @@ BOOL dir_write_update(REG f_node_ptr fnp, BOOL update)
UBYTE FAR *vp;
/* Update the entry if it was modified by a write or create... */
if ((fnp->f_flags & (SFT_FCLEAN|SFT_FDATE)) != SFT_FCLEAN)
if (!update || (fnp->f_flags & (SFT_FCLEAN|SFT_FDATE)) != SFT_FCLEAN)
{
bp = getblock(fnp->f_dirsector, fnp->f_dpb->dpb_unit);

21
kernel/fatfs.c
View File

@ -195,7 +195,6 @@ int dos_open(char *path, unsigned flags, unsigned attrib, int fd)
if (status != S_OPENED)
{
init_direntry(&fnp->f_dir, attrib, FREE, fnp->f_dmp->dm_name_pat);
fnp->f_flags &= ~SFT_FCLEAN;
if (!dir_write(fnp))
return DE_ACCESS;
}
@ -347,7 +346,6 @@ COUNT remove_lfn_entries(f_node_ptr fnp)
if (fnp->f_dir.dir_attrib != D_LFN)
break;
fnp->f_dir.dir_name[0] = DELETED;
fnp->f_flags &= ~SFT_FCLEAN;
if (!dir_write(fnp)) return DE_BLKINVLD;
}
fnp->f_dmp->dm_entry = original_diroff;
@ -445,7 +443,6 @@ STATIC COUNT delete_dir_entry(f_node_ptr fnp)
/* The directory has been modified, so set the */
/* bit before closing it, allowing it to be */
/* updated */
fnp->f_flags &= ~SFT_FCLEAN;
dir_write(fnp);
/* SUCCESSful completion, return it */
@ -592,10 +589,6 @@ COUNT dos_rename(BYTE * path1, BYTE * path2, int attrib)
/* init fnode for new file name to match old file name */
memcpy(&fnp2->f_dir, &fnp1->f_dir, sizeof(struct dirent));
/* The directory has been modified, so reset the bit before */
/* closing it, allowing it to be updated. */
fnp1->f_flags &= ~SFT_FCLEAN;
/* Ok, so we can delete this one. Save the file info. */
*(fnp1->f_dir.dir_name) = DELETED;
@ -604,10 +597,6 @@ COUNT dos_rename(BYTE * path1, BYTE * path2, int attrib)
/* put the fnode's name into the directory. */
memcpy(fnp2->f_dir.dir_name, fcbname, FNAME_SIZE + FEXT_SIZE);
/* The directory has been modified, so set the bit before */
/* closing it, allowing it to be updated. */
fnp2->f_flags &= ~SFT_FCLEAN;
dir_write(fnp2);
/* SUCCESSful completion, return it */
@ -687,7 +676,6 @@ STATIC BOOL find_free(f_node_ptr fnp)
/* available, tries to extend the directory. */
STATIC int alloc_find_free(f_node_ptr fnp, char *path)
{
fnp->f_flags |= SFT_FCLEAN;
fnp = split_path(path, fnp);
/* Get a free f_node pointer so that we can use */
@ -698,7 +686,6 @@ STATIC int alloc_find_free(f_node_ptr fnp, char *path)
{
if (fnp->f_dmp->dm_dircluster == 0)
{
fnp->f_flags |= SFT_FCLEAN;
return DE_TOOMANY;
}
else
@ -885,8 +872,6 @@ COUNT dos_mkdir(BYTE * dir)
init_direntry(&fnp->f_dir, D_DIR, free_fat, fnp->f_dmp->dm_name_pat);
fnp->f_flags &= ~SFT_FCLEAN;
/* Mark the cluster in the FAT as used and create new dir there */
if (link_fat(fnp->f_dpb, free_fat, LONG_LAST_CLUSTER) != SUCCESS) /* free->last */
return DE_HNDLDSKFULL; /* should never happen */
@ -910,7 +895,6 @@ COUNT dos_mkdir(BYTE * dir)
init_direntry(&fnp->f_dir, D_DIR, free_fat, ". ");
/* And put it out */
fnp->f_flags &= ~SFT_FCLEAN;
dir_write(fnp);
/* create the ".." entry */
@ -927,7 +911,6 @@ COUNT dos_mkdir(BYTE * dir)
fnp->f_dir.dir_name[1] = '.';
/* and put it out */
fnp->f_flags &= ~SFT_FCLEAN;
dir_write(fnp);
return SUCCESS;
@ -970,8 +953,6 @@ STATIC CLUSTER extend(f_node_ptr fnp)
return LONG_LAST_CLUSTER; /* should never happen */
}
/* Mark the directory so that the entry is updated */
fnp->f_flags &= ~SFT_FCLEAN;
return free_fat;
}
@ -1610,8 +1591,6 @@ COUNT dos_setfattr(BYTE * name, UWORD attrp)
/* set attributes that user requested */
fnp->f_dir.dir_attrib |= attrp; /* JPP */
fnp->f_flags &= ~SFT_FCLEAN;
fnp->f_flags |= SFT_FDATE;
/* close open files in compat mode, otherwise there was a critical error */
rc = merge_file_changes(fnp, -1);