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

Eliminate highwater fnode field. 

git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@540 6ac86273-5f31-0410-b378-82cca8765d1b
This commit is contained in:
Bart Oldeman 2003-03-12 23:29:08 +00:00
parent a4cf009198
commit 355580dded
4 changed files with 21 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hdr/fnode.h
View File

@ -55,7 +55,6 @@ struct f_node {
struct dpb FAR *f_dpb; /* the block device for file */ struct dpb FAR *f_dpb; /* the block device for file */
ULONG f_offset; /* byte offset for next op */ ULONG f_offset; /* byte offset for next op */
ULONG f_highwater; /* the largest offset ever */
CLUSTER f_back; /* the cluster we were at */ CLUSTER f_back; /* the cluster we were at */
CLUSTER f_cluster_offset; /* relative cluster number within file */ CLUSTER f_cluster_offset; /* relative cluster number within file */
CLUSTER f_cluster; /* the cluster we are at */ CLUSTER f_cluster; /* the cluster we are at */

4
kernel/dosfns.c
View File

@ -1072,8 +1072,8 @@ COUNT DosFindNext(void)
COUNT rc; COUNT rc;
register dmatch FAR *dmp = dta; register dmatch FAR *dmp = dta;
/* /// findnext will always fail on a device name. - Ron Cemer */ /* /// findnext will always fail on a device name device name or volume id */
if (dmp->dm_attr_fnd == D_DEVICE) if (dmp->dm_attr_fnd == D_DEVICE || dmp->dm_attr_fnd & D_VOLID)
return DE_NFILES; return DE_NFILES;
/* /*

2
kernel/fatdir.c
View File

@ -46,7 +46,7 @@ VOID dir_init_fnode(f_node_ptr fnp, CLUSTER dirstart)
fnp->f_flags.f_droot = FALSE; fnp->f_flags.f_droot = FALSE;
fnp->f_flags.f_ddir = TRUE; fnp->f_flags.f_ddir = TRUE;
fnp->f_flags.f_dnew = TRUE; fnp->f_flags.f_dnew = TRUE;
fnp->f_diroff = fnp->f_offset = fnp->f_highwater = 0l; fnp->f_diroff = fnp->f_offset = 0l;
fnp->f_cluster_offset = 0; fnp->f_cluster_offset = 0;
/* root directory */ /* root directory */

48
kernel/fatfs.c
View File

@ -229,7 +229,6 @@ long dos_open(char *path, unsigned flags, unsigned attrib)
/* Now change to file */ /* Now change to file */
fnp->f_offset = 0l; fnp->f_offset = 0l;
fnp->f_highwater = fnp->f_dir.dir_size;
fnp->f_back = LONG_LAST_CLUSTER; fnp->f_back = LONG_LAST_CLUSTER;
if (status != S_OPENED) if (status != S_OPENED)
@ -288,7 +287,6 @@ COUNT dos_close(COUNT fd)
fnp->f_dir.dir_date = dos_getdate(); fnp->f_dir.dir_date = dos_getdate();
} }
fnp->f_dir.dir_size = fnp->f_highwater;
merge_file_changes(fnp, FALSE); /* /// Added - Ron Cemer */ merge_file_changes(fnp, FALSE); /* /// Added - Ron Cemer */
} }
fnp->f_flags.f_ddir = TRUE; fnp->f_flags.f_ddir = TRUE;
@ -470,7 +468,6 @@ STATIC void merge_file_changes(f_node_ptr fnp, int collect)
f_node which refers to this file. */ f_node which refers to this file. */
if (fnp2->f_mode != RDONLY) if (fnp2->f_mode != RDONLY)
{ {
fnp2->f_dir.dir_size = fnp2->f_highwater;
copy_file_changes(fnp2, fnp); copy_file_changes(fnp2, fnp);
break; break;
} }
@ -480,8 +477,6 @@ STATIC void merge_file_changes(f_node_ptr fnp, int collect)
/* We just made changes to this file, so we are /* We just made changes to this file, so we are
distributing these changes to the other f_nodes distributing these changes to the other f_nodes
which refer to this file. */ which refer to this file. */
if (fnp->f_mode != RDONLY)
fnp->f_dir.dir_size = fnp->f_highwater;
copy_file_changes(fnp, fnp2); copy_file_changes(fnp, fnp2);
} }
} }
@ -505,7 +500,6 @@ STATIC int is_same_file(f_node_ptr fnp1, f_node_ptr fnp2)
/* /// Added - Ron Cemer */ /* /// Added - Ron Cemer */
STATIC void copy_file_changes(f_node_ptr src, f_node_ptr dst) STATIC void copy_file_changes(f_node_ptr src, f_node_ptr dst)
{ {
dst->f_highwater = src->f_highwater;
dst->f_dir.dir_start = src->f_dir.dir_start; dst->f_dir.dir_start = src->f_dir.dir_start;
#ifdef WITHFAT32 #ifdef WITHFAT32
dst->f_dir.dir_start_high = src->f_dir.dir_start_high; dst->f_dir.dir_start_high = src->f_dir.dir_start_high;
@ -758,8 +752,6 @@ COUNT dos_rename(BYTE * path1, BYTE * path2, int attrib)
fnp1->f_flags.f_dnew = fnp2->f_flags.f_dnew = FALSE; fnp1->f_flags.f_dnew = fnp2->f_flags.f_dnew = FALSE;
fnp1->f_flags.f_ddir = fnp2->f_flags.f_ddir = TRUE; fnp1->f_flags.f_ddir = fnp2->f_flags.f_ddir = TRUE;
fnp2->f_highwater = fnp2->f_offset = fnp1->f_dir.dir_size;
/* 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;
@ -929,7 +921,7 @@ ULONG dos_getfsize(COUNT fd)
return (ULONG)-1l; return (ULONG)-1l;
/* Return the file size */ /* Return the file size */
return fnp->f_highwater; return fnp->f_dir.dir_size;
} }
/* */ /* */
@ -951,7 +943,6 @@ BOOL dos_setfsize(COUNT fd, LONG size)
/* Change the file size */ /* Change the file size */
fnp->f_dir.dir_size = size; fnp->f_dir.dir_size = size;
fnp->f_highwater = size;
merge_file_changes(fnp, FALSE); /* /// Added - Ron Cemer */ merge_file_changes(fnp, FALSE); /* /// Added - Ron Cemer */
@ -1126,7 +1117,6 @@ COUNT dos_mkdir(BYTE * dir)
fnp->f_flags.f_dnew = FALSE; fnp->f_flags.f_dnew = FALSE;
fnp->f_flags.f_ddir = TRUE; fnp->f_flags.f_ddir = TRUE;
fnp->f_highwater = 0l;
fnp->f_offset = 0l; fnp->f_offset = 0l;
/* Mark the cluster in the FAT as used */ /* Mark the cluster in the FAT as used */
@ -1401,7 +1391,7 @@ COUNT map_cluster(REG f_node_ptr fnp, COUNT mode)
return SUCCESS; return SUCCESS;
} }
/* extends a file from f_highwater to f_offset */ /* extends a file from f_dir.dir_size to f_offset */
/* Proper OS's write zeros in between, but DOS just adds */ /* Proper OS's write zeros in between, but DOS just adds */
/* garbage sectors, and lets the caller do the zero filling */ /* garbage sectors, and lets the caller do the zero filling */
/* if you prefer you can have this enabled using */ /* if you prefer you can have this enabled using */
@ -1418,12 +1408,12 @@ STATIC COUNT dos_extend(f_node_ptr fnp)
ULONG count; ULONG count;
#endif #endif
if (fnp->f_offset <= fnp->f_highwater) if (fnp->f_offset <= fnp->f_dir.dir_size)
return SUCCESS; return SUCCESS;
#ifdef WRITEZEROS #ifdef WRITEZEROS
count = fnp->f_offset - fnp->f_highwater; count = fnp->f_offset - fnp->f_dir.dir_size;
fnp->f_offset = fnp->f_highwater; fnp->f_offset = fnp->f_dir.dir_size;
while (count > 0) while (count > 0)
#endif #endif
{ {
@ -1473,9 +1463,8 @@ STATIC COUNT dos_extend(f_node_ptr fnp)
/* update pointers and counters */ /* update pointers and counters */
count -= xfr_cnt; count -= xfr_cnt;
fnp->f_offset += xfr_cnt; fnp->f_offset += xfr_cnt;
fnp->f_dir.dir_size = fnp->f_offset;
#endif #endif
fnp->f_highwater = fnp->f_offset; fnp->f_dir.dir_size = fnp->f_offset;
merge_file_changes(fnp, FALSE); /* /// Added - Ron Cemer */ merge_file_changes(fnp, FALSE); /* /// Added - Ron Cemer */
} }
return SUCCESS; return SUCCESS;
@ -1536,7 +1525,7 @@ STATIC COUNT dos_extend(f_node_ptr fnp)
better for the people, that complain about slow floppy access better for the people, that complain about slow floppy access
the the
fnp->f_offset +to_xfer < fnp->f_highwater && avoid EOF problems fnp->f_offset +to_xfer < fnp->f_dir.dir_size && avoid EOF problems
condition can probably _carefully_ be dropped condition can probably _carefully_ be dropped
@ -1604,7 +1593,7 @@ UCOUNT rwblock(COUNT fd, VOID FAR * buffer, UCOUNT count, int mode)
/* remove all the following allocated clusters in shrink_file */ /* remove all the following allocated clusters in shrink_file */
if (mode == XFR_WRITE) if (mode == XFR_WRITE)
{ {
fnp->f_highwater = fnp->f_offset; fnp->f_dir.dir_size = fnp->f_offset;
shrink_file(fnp); shrink_file(fnp);
} }
return 0; return 0;
@ -1622,7 +1611,7 @@ UCOUNT rwblock(COUNT fd, VOID FAR * buffer, UCOUNT count, int mode)
{ {
/* Do an EOF test and return whatever was transferred */ /* Do an EOF test and return whatever was transferred */
/* but only for regular files. */ /* but only for regular files. */
if (mode == XFR_READ && !(fnp->f_flags.f_ddir) && (fnp->f_offset >= fnp->f_highwater)) if (mode == XFR_READ && !(fnp->f_flags.f_ddir) && (fnp->f_offset >= fnp->f_dir.dir_size))
{ {
return ret_cnt; return ret_cnt;
} }
@ -1680,8 +1669,8 @@ UCOUNT rwblock(COUNT fd, VOID FAR * buffer, UCOUNT count, int mode)
sectors_wanted = to_xfer; sectors_wanted = to_xfer;
/* avoid EOF problems */ /* avoid EOF problems */
if (mode == XFR_READ && to_xfer > fnp->f_highwater - fnp->f_offset) if (mode == XFR_READ && to_xfer > fnp->f_dir.dir_size - fnp->f_offset)
sectors_wanted = (UCOUNT)(fnp->f_highwater - fnp->f_offset); sectors_wanted = (UCOUNT)(fnp->f_dir.dir_size - fnp->f_offset);
sectors_wanted /= secsize; sectors_wanted /= secsize;
@ -1759,7 +1748,7 @@ UCOUNT rwblock(COUNT fd, VOID FAR * buffer, UCOUNT count, int mode)
/* a maximum of what is left. */ /* a maximum of what is left. */
xfr_cnt = min(to_xfer, secsize - fnp->f_boff); xfr_cnt = min(to_xfer, secsize - fnp->f_boff);
if (!fnp->f_flags.f_ddir && mode == XFR_READ) if (!fnp->f_flags.f_ddir && mode == XFR_READ)
xfr_cnt = (UWORD) min(xfr_cnt, fnp->f_highwater - fnp->f_offset); xfr_cnt = (UWORD) min(xfr_cnt, fnp->f_dir.dir_size - fnp->f_offset);
/* transfer a block */ /* transfer a block */
/* Transfer size as either a full block size, or the */ /* Transfer size as either a full block size, or the */
@ -1780,7 +1769,7 @@ UCOUNT rwblock(COUNT fd, VOID FAR * buffer, UCOUNT count, int mode)
probably not reused later probably not reused later
*/ */
if (xfr_cnt == sizeof(bp->b_buffer) || if (xfr_cnt == sizeof(bp->b_buffer) ||
(mode == XFR_READ && fnp->f_offset + xfr_cnt == fnp->f_highwater)) (mode == XFR_READ && fnp->f_offset + xfr_cnt == fnp->f_dir.dir_size))
{ {
bp->b_flag |= BFR_UNCACHE; bp->b_flag |= BFR_UNCACHE;
} }
@ -1794,10 +1783,9 @@ UCOUNT rwblock(COUNT fd, VOID FAR * buffer, UCOUNT count, int mode)
buffer = add_far((VOID FAR *) buffer, (ULONG) xfr_cnt); buffer = add_far((VOID FAR *) buffer, (ULONG) xfr_cnt);
if (mode == XFR_WRITE) if (mode == XFR_WRITE)
{ {
if (fnp->f_offset > fnp->f_highwater) if (fnp->f_offset > fnp->f_dir.dir_size)
{ {
fnp->f_highwater = fnp->f_offset; fnp->f_dir.dir_size = fnp->f_offset;
fnp->f_dir.dir_size = fnp->f_highwater;
} }
merge_file_changes(fnp, FALSE); /* /// Added - Ron Cemer */ merge_file_changes(fnp, FALSE); /* /// Added - Ron Cemer */
} }
@ -1836,7 +1824,7 @@ LONG dos_lseek(COUNT fd, LONG foffset, COUNT origin)
/* offset from eof */ /* offset from eof */
case 2: case 2:
return fnp->f_offset = fnp->f_highwater + foffset; return fnp->f_offset = fnp->f_dir.dir_size + foffset;
/* default to an invalid function */ /* default to an invalid function */
default: default:
@ -2183,7 +2171,7 @@ STATIC VOID shrink_file(f_node_ptr fnp)
CLUSTER next, st; CLUSTER next, st;
struct dpb FAR *dpbp = fnp->f_dpb; struct dpb FAR *dpbp = fnp->f_dpb;
fnp->f_offset = fnp->f_highwater; /* end of file */ fnp->f_offset = fnp->f_dir.dir_size; /* end of file */
if (fnp->f_offset) if (fnp->f_offset)
fnp->f_offset--; /* last existing cluster */ fnp->f_offset--; /* last existing cluster */
@ -2203,7 +2191,7 @@ STATIC VOID shrink_file(f_node_ptr fnp)
/* last cluster is encountered. */ /* last cluster is encountered. */
/* zap the FAT pointed to */ /* zap the FAT pointed to */
if (fnp->f_highwater == 0) if (fnp->f_dir.dir_size == 0)
{ {
setdstart(fnp->f_dir, FREE); setdstart(fnp->f_dir, FREE);
link_fat(dpbp, st, FREE); link_fat(dpbp, st, FREE);