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

Merge three almost identical pieces of code used to allocate a new

Browse Source 
directory entry in creat, rename, and mkdir, into alloc_find_free.


git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@819 6ac86273-5f31-0410-b378-82cca8765d1b
This commit is contained in:
Bart Oldeman 2004-03-23 01:36:16 +00:00
parent 05cd65a193
commit d39d3a84f4
1 changed files with 45 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
kernel/fatfs.c
View File

@ -48,6 +48,7 @@ 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);
BOOL find_free(f_node_ptr); BOOL find_free(f_node_ptr);
STATIC int alloc_find_free(f_node_ptr fnp, char *path, char *fcbname);
VOID wipe_out(f_node_ptr); VOID wipe_out(f_node_ptr);
CLUSTER extend(f_node_ptr); CLUSTER extend(f_node_ptr);
COUNT extend_dir(f_node_ptr); COUNT extend_dir(f_node_ptr);
@ -198,34 +199,9 @@ long dos_open(char *path, unsigned flags, unsigned attrib)
} }
else if (flags & O_CREAT) else if (flags & O_CREAT)
{ {
BOOL is_free; int ret = alloc_find_free(fnp, path, fcbname);
if (ret != SUCCESS)
/* Reset the directory by a close followed by */
/* an open */
fnp->f_flags.f_dmod = FALSE;
dir_close(fnp);
fnp = split_path(path, fcbname);
/* Get a free f_node pointer so that we can use */
/* it in building the new file. */
/* Note that if we're in the root and we don't */
/* find an empty slot, we need to abort. */
if (((is_free = find_free(fnp)) == 0) && (fnp->f_flags.f_droot))
{
fnp->f_flags.f_dmod = FALSE;
dir_close(fnp);
return DE_TOOMANY;
}
/* Otherwise just expand the directory */
else if (!is_free && !(fnp->f_flags.f_droot))
{
COUNT ret;
if ((ret = extend_dir(fnp)) != SUCCESS)
/* fnp already closed in extend_dir */
return ret; return ret;
}
/* put the fnode's name into the directory. */ /* put the fnode's name into the directory. */
memcpy(fnp->f_dir.dir_name, fcbname, FNAME_SIZE + FEXT_SIZE); memcpy(fnp->f_dir.dir_name, fcbname, FNAME_SIZE + FEXT_SIZE);
@ -701,7 +677,6 @@ COUNT dos_rename(BYTE * path1, BYTE * path2, int attrib)
{ {
REG f_node_ptr fnp1; REG f_node_ptr fnp1;
REG f_node_ptr fnp2; REG f_node_ptr fnp2;
BOOL is_free;
COUNT ret; COUNT ret;
char fcbname[FNAME_SIZE + FEXT_SIZE]; char fcbname[FNAME_SIZE + FEXT_SIZE];
@ -736,30 +711,11 @@ COUNT dos_rename(BYTE * path1, BYTE * path2, int attrib)
return DE_FILENOTFND; return DE_FILENOTFND;
} }
/* Reset the directory by a close followed by an open */ ret = alloc_find_free(fnp2, path2, fcbname);
fnp2->f_flags.f_dmod = FALSE; if (ret != SUCCESS) {
dir_close(fnp2);
fnp2 = split_path(path2, fcbname);
/* Now find a free slot to put the file into. */
/* If it's the root and we don't have room, return an error. */
if (((is_free = find_free(fnp2)) == 0) && (fnp2->f_flags.f_droot))
{
fnp2->f_flags.f_dmod = FALSE;
dir_close(fnp1);
dir_close(fnp2);
return DE_TOOMANY;
}
/* Otherwise just expand the directory */
else if (!is_free && !(fnp2->f_flags.f_droot))
{
if ((ret = extend_dir(fnp2)) != SUCCESS)
{
dir_close(fnp1); dir_close(fnp1);
return ret; return ret;
} }
}
if ((ret = remove_lfn_entries(fnp1)) < 0) if ((ret = remove_lfn_entries(fnp1)) < 0)
return ret; return ret;
@ -858,6 +814,41 @@ STATIC BOOL find_free(f_node_ptr fnp)
return rc >= 0; return rc >= 0;
} }
/* alloc_find_free: resets the directory by a close followed by */
/* an open. Then finds a spare directory entry and if not */
/* available, tries to extend the directory. */
STATIC int alloc_find_free(f_node_ptr fnp, char *path, char *fcbname)
{
fnp->f_flags.f_dmod = FALSE;
dir_close(fnp);
fnp = split_path(path, fcbname);
/* Get a free f_node pointer so that we can use */
/* it in building the new file. */
/* Note that if we're in the root and we don't */
/* find an empty slot, we need to abort. */
if (find_free(fnp) == 0)
{
if (fnp->f_flags.f_droot)
{
fnp->f_flags.f_dmod = FALSE;
dir_close(fnp);
return DE_TOOMANY;
}
else
{
/* Otherwise just expand the directory */
int ret;
if ((ret = extend_dir(fnp)) != SUCCESS)
/* fnp already closed in extend_dir */
return ret;
}
}
return SUCCESS;
}
/* */ /* */
/* dos_getdate for the file date */ /* dos_getdate for the file date */
/* */ /* */
@ -1093,31 +1084,11 @@ COUNT dos_mkdir(BYTE * dir)
return DE_ACCESS; return DE_ACCESS;
} }
/* Reset the directory by a close followed by */
/* an open */
fnp->f_flags.f_dmod = FALSE;
parent = fnp->f_dirstart; parent = fnp->f_dirstart;
dir_close(fnp);
fnp = split_path(dir, fcbname);
/* Get a free f_node pointer so that we can use */ ret = alloc_find_free(fnp, dir, fcbname);
/* it in building the new file. */ if (ret != SUCCESS)
/* Note that if we're in the root and we don't */
/* find an empty slot, we need to abort. */
if (find_free(fnp) == 0)
{
if (fnp->f_flags.f_droot)
{
fnp->f_flags.f_dmod = FALSE;
dir_close(fnp);
return DE_TOOMANY;
}
/* Otherwise just expand the directory */
if ((ret = extend_dir(fnp)) != SUCCESS)
return ret; return ret;
}
/* get an empty cluster, so that we make it into a */ /* get an empty cluster, so that we make it into a */
/* directory. */ /* directory. */