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

Make the fnode f_flags completely equal to the SFT sft_flags.

Browse Source 
Rename SFT_FDIRTY to SFT_FCLEAN to avoid confusion.


git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@1420 6ac86273-5f31-0410-b378-82cca8765d1b
This commit is contained in:
Bart Oldeman 2009-06-05 00:06:05 +00:00
parent fedf951beb
commit ec30074f48
4 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hdr/fnode.h
View File

@ -53,9 +53,6 @@ struct f_node {
UBYTE f_sft_idx; /* corresponding SFT index */ UBYTE f_sft_idx; /* corresponding SFT index */
}; };
#define F_DMOD 0x40 /* directory has been modified */
#define F_DDATE 0x4000 /* date set using setdate */
typedef struct f_node *f_node_ptr; typedef struct f_node *f_node_ptr;
struct lfn_inode { struct lfn_inode {

2
hdr/sft.h
View File

@ -115,7 +115,7 @@ typedef struct sfttbl {
/* the following bits are file (block) unique */ /* the following bits are file (block) unique */
#define SFT_FDATE 0x4000 /* File date set */ #define SFT_FDATE 0x4000 /* File date set */
#define SFT_FDIRTY 0x0040 /* File has been written to */ #define SFT_FCLEAN 0x0040 /* File has not been written to */
#define SFT_FDMASK 0x003f /* File mask for drive no */ #define SFT_FDMASK 0x003f /* File mask for drive no */
/* the following bits are device (char) unique */ /* the following bits are device (char) unique */

8
kernel/fatdir.c
View File

@ -43,6 +43,8 @@ VOID dir_init_fnode(f_node_ptr fnp, CLUSTER dirstart)
{ {
/* reset the directory flags */ /* reset the directory flags */
fnp->f_sft_idx = 0xff; fnp->f_sft_idx = 0xff;
fnp->f_flags &= ~SFT_FDATE;
fnp->f_flags |= SFT_FCLEAN;
fnp->f_diroff = 0; fnp->f_diroff = 0;
fnp->f_offset = 0l; fnp->f_offset = 0l;
fnp->f_cluster_offset = 0; fnp->f_cluster_offset = 0;
@ -166,7 +168,7 @@ COUNT dir_read(REG f_node_ptr fnp)
/* Determine if we hit the end of the directory. If we have, */ /* Determine if we hit the end of the directory. If we have, */
/* bump the offset back to the end and exit. If not, fill the */ /* bump the offset back to the end and exit. If not, fill the */
/* dirent portion of the fnode, clear the f_dmod bit and leave, */ /* dirent portion of the fnode, set the SFT_FCLEAN bit and leave,*/
/* but only for root directories */ /* but only for root directories */
if (fnp->f_dirstart == 0) if (fnp->f_dirstart == 0)
@ -215,7 +217,7 @@ COUNT dir_read(REG f_node_ptr fnp)
swap_deleted(fnp->f_dir.dir_name); swap_deleted(fnp->f_dir.dir_name);
/* Update the fnode's directory info */ /* Update the fnode's directory info */
fnp->f_flags &= ~F_DMOD; fnp->f_flags |= SFT_FCLEAN;
/* and for efficiency, stop when we hit the first */ /* and for efficiency, stop when we hit the first */
/* unused entry. */ /* unused entry. */
@ -238,7 +240,7 @@ BOOL dir_write_update(REG f_node_ptr fnp, BOOL update)
UBYTE FAR *vp; UBYTE FAR *vp;
/* Update the entry if it was modified by a write or create... */ /* Update the entry if it was modified by a write or create... */
if (fnp->f_flags & (F_DMOD|F_DDATE)) if ((fnp->f_flags & (SFT_FCLEAN|SFT_FDATE)) != SFT_FCLEAN)
{ {
bp = getblock(fnp->f_dirsector, fnp->f_dpb->dpb_unit); bp = getblock(fnp->f_dirsector, fnp->f_dpb->dpb_unit);

46
kernel/fatfs.c
View File

@ -196,7 +196,7 @@ int dos_open(char *path, unsigned flags, unsigned attrib, int fd)
if (status != S_OPENED) if (status != S_OPENED)
{ {
init_direntry(&fnp->f_dir, attrib, FREE, fcbname); init_direntry(&fnp->f_dir, attrib, FREE, fcbname);
fnp->f_flags = F_DMOD; fnp->f_flags &= ~SFT_FCLEAN;
if (!dir_write(fnp)) if (!dir_write(fnp))
return DE_ACCESS; return DE_ACCESS;
} }
@ -212,9 +212,9 @@ int dos_open(char *path, unsigned flags, unsigned attrib, int fd)
fnp->f_cluster_offset = 0; fnp->f_cluster_offset = 0;
} }
fnp->f_flags = 0; fnp->f_flags &= ~(SFT_FDATE|SFT_FCLEAN);
if (status != S_OPENED) if (status == S_OPENED)
fnp->f_flags = F_DMOD; 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 */
@ -238,9 +238,9 @@ COUNT dos_close(COUNT fd)
/* Translate the fd into a useful pointer */ /* Translate the fd into a useful pointer */
f_node_ptr fnp = sft_to_fnode(fd); f_node_ptr fnp = sft_to_fnode(fd);
if (fnp->f_flags & F_DMOD) if (!(fnp->f_flags & SFT_FCLEAN))
{ {
if (!(fnp->f_flags & F_DDATE)) if (!(fnp->f_flags & SFT_FDATE))
{ {
fnp->f_dir.dir_time = dos_gettime(); fnp->f_dir.dir_time = dos_gettime();
fnp->f_dir.dir_date = dos_getdate(); fnp->f_dir.dir_date = dos_getdate();
@ -345,7 +345,7 @@ COUNT remove_lfn_entries(f_node_ptr fnp)
if (fnp->f_dir.dir_attrib != D_LFN) if (fnp->f_dir.dir_attrib != D_LFN)
break; break;
fnp->f_dir.dir_name[0] = DELETED; fnp->f_dir.dir_name[0] = DELETED;
fnp->f_flags |= F_DMOD; fnp->f_flags &= ~SFT_FCLEAN;
if (!dir_write(fnp)) return DE_BLKINVLD; if (!dir_write(fnp)) return DE_BLKINVLD;
} }
fnp->f_diroff = original_diroff; fnp->f_diroff = original_diroff;
@ -443,7 +443,7 @@ STATIC COUNT delete_dir_entry(f_node_ptr fnp)
/* The directory has been modified, so set the */ /* The directory has been modified, so set the */
/* bit before closing it, allowing it to be */ /* bit before closing it, allowing it to be */
/* updated */ /* updated */
fnp->f_flags |= F_DMOD; fnp->f_flags &= ~SFT_FCLEAN;
dir_write(fnp); dir_write(fnp);
/* SUCCESSful completion, return it */ /* SUCCESSful completion, return it */
@ -591,9 +591,9 @@ COUNT dos_rename(BYTE * path1, BYTE * path2, int attrib)
/* init fnode for new file name to match old file name */ /* init fnode for new file name to match old file name */
memcpy(&fnp2->f_dir, &fnp1->f_dir, sizeof(struct dirent)); memcpy(&fnp2->f_dir, &fnp1->f_dir, sizeof(struct dirent));
/* The directory has been modified, so set the bit before */ /* The directory has been modified, so reset the bit before */
/* closing it, allowing it to be updated. */ /* closing it, allowing it to be updated. */
fnp1->f_flags = F_DMOD; fnp1->f_flags &= ~SFT_FCLEAN;
/* Ok, so we can delete this one. Save the file info. */ /* Ok, so we can delete this one. Save the file info. */
*(fnp1->f_dir.dir_name) = DELETED; *(fnp1->f_dir.dir_name) = DELETED;
@ -606,7 +606,7 @@ COUNT dos_rename(BYTE * path1, BYTE * path2, int attrib)
/* The directory has been modified, so set the bit before */ /* The directory has been modified, so set the bit before */
/* closing it, allowing it to be updated. */ /* closing it, allowing it to be updated. */
fnp2->f_flags = F_DMOD; fnp2->f_flags &= ~SFT_FCLEAN;
dir_write(fnp2); dir_write(fnp2);
/* SUCCESSful completion, return it */ /* SUCCESSful completion, return it */
@ -686,7 +686,7 @@ STATIC BOOL find_free(f_node_ptr fnp)
/* available, tries to extend the directory. */ /* available, tries to extend the directory. */
STATIC int alloc_find_free(f_node_ptr fnp, char *path, char *fcbname) STATIC int alloc_find_free(f_node_ptr fnp, char *path, char *fcbname)
{ {
fnp->f_flags &= ~F_DMOD; fnp->f_flags |= SFT_FCLEAN;
fnp = split_path(path, fcbname, fnp); fnp = split_path(path, fcbname, fnp);
/* Get a free f_node pointer so that we can use */ /* Get a free f_node pointer so that we can use */
@ -697,7 +697,7 @@ STATIC int alloc_find_free(f_node_ptr fnp, char *path, char *fcbname)
{ {
if (fnp->f_dirstart == 0) if (fnp->f_dirstart == 0)
{ {
fnp->f_flags &= ~F_DMOD; fnp->f_flags |= SFT_FCLEAN;
return DE_TOOMANY; return DE_TOOMANY;
} }
else else
@ -863,7 +863,7 @@ COUNT dos_mkdir(BYTE * dir)
init_direntry(&fnp->f_dir, D_DIR, free_fat, fcbname); init_direntry(&fnp->f_dir, D_DIR, free_fat, fcbname);
fnp->f_flags = F_DMOD; fnp->f_flags &= ~SFT_FCLEAN;
fnp->f_offset = 0l; fnp->f_offset = 0l;
@ -928,7 +928,7 @@ COUNT dos_mkdir(BYTE * dir)
flush_buffers(dpbp->dpb_unit); flush_buffers(dpbp->dpb_unit);
/* Close the directory so that the entry is updated */ /* Close the directory so that the entry is updated */
fnp->f_flags |= F_DMOD; fnp->f_flags &= ~SFT_FCLEAN;
dir_write(fnp); dir_write(fnp);
return SUCCESS; return SUCCESS;
@ -972,7 +972,7 @@ STATIC CLUSTER extend(f_node_ptr fnp)
} }
/* Mark the directory so that the entry is updated */ /* Mark the directory so that the entry is updated */
fnp->f_flags |= F_DMOD; fnp->f_flags &= ~SFT_FCLEAN;
return free_fat; return free_fat;
} }
@ -1285,8 +1285,8 @@ long rwblock(COUNT fd, VOID FAR * buffer, UCOUNT count, int mode)
if (mode==XFR_WRITE) if (mode==XFR_WRITE)
{ {
fnp->f_dir.dir_attrib |= D_ARCHIVE; fnp->f_dir.dir_attrib |= D_ARCHIVE;
fnp->f_flags |= F_DMOD; /* mark file as modified */ /* mark file as modified and set date not valid any more */
fnp->f_flags &= ~F_DDATE; /* set date not valid any more */ fnp->f_flags &= ~(SFT_FCLEAN|SFT_FDATE);
if (dos_extend(fnp) != SUCCESS) if (dos_extend(fnp) != SUCCESS)
{ {
@ -1630,7 +1630,8 @@ COUNT dos_setfattr(BYTE * name, UWORD attrp)
/* set attributes that user requested */ /* set attributes that user requested */
fnp->f_dir.dir_attrib |= attrp; /* JPP */ fnp->f_dir.dir_attrib |= attrp; /* JPP */
fnp->f_flags |= F_DMOD | F_DDATE; fnp->f_flags &= ~SFT_FCLEAN;
fnp->f_flags |= SFT_FDATE;
/* close open files in compat mode, otherwise there was a critical error */ /* close open files in compat mode, otherwise there was a critical error */
rc = merge_file_changes(fnp, -1); rc = merge_file_changes(fnp, -1);
@ -1810,12 +1811,10 @@ STATIC f_node_ptr sft_to_fnode(int fd)
{ {
sft FAR *sftp = idx_to_sft(fd); sft FAR *sftp = idx_to_sft(fd);
f_node_ptr fnp = &fnode[0]; f_node_ptr fnp = &fnode[0];
UWORD flags;
fnp->f_sft_idx = fd; fnp->f_sft_idx = fd;
flags = sftp->sft_flags; fnp->f_flags = sftp->sft_flags;
fnp->f_flags = (flags & SFT_FDATE) | ((flags & SFT_FDIRTY) ^ SFT_FDIRTY);
fnp->f_dir.dir_attrib = sftp->sft_attrib; fnp->f_dir.dir_attrib = sftp->sft_attrib;
fmemcpy(fnp->f_dir.dir_name, sftp->sft_name, FNAME_SIZE + FEXT_SIZE); fmemcpy(fnp->f_dir.dir_name, sftp->sft_name, FNAME_SIZE + FEXT_SIZE);
@ -1842,8 +1841,7 @@ STATIC void fnode_to_sft(f_node_ptr fnp)
{ {
sft FAR *sftp = idx_to_sft(fnp->f_sft_idx); sft FAR *sftp = idx_to_sft(fnp->f_sft_idx);
sftp->sft_flags = (sftp->sft_flags & ~(SFT_FDATE | SFT_FDIRTY)) | sftp->sft_flags = fnp->f_flags;
((fnp->f_flags & (SFT_FDATE | SFT_FDIRTY)) ^ SFT_FDIRTY);
sftp->sft_attrib = fnp->f_dir.dir_attrib; sftp->sft_attrib = fnp->f_dir.dir_attrib;
fmemcpy(sftp->sft_name, fnp->f_dir.dir_name, FNAME_SIZE + FEXT_SIZE); fmemcpy(sftp->sft_name, fnp->f_dir.dir_name, FNAME_SIZE + FEXT_SIZE);