tyler.durden/kernel
1
0
Fork 0
mirror of https://github.com/FDOS/kernel.git synced 2025-07-28 16:24:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate dir_close().

Browse Source 
Its only purpose left was to flush buffers, which isn't necessary after
just open/read, so we can move that to dir_write().


git-svn-id: https://svn.code.sf.net/p/freedos/svn/kernel/trunk@1410 6ac86273-5f31-0410-b378-82cca8765d1b
This commit is contained in:
Bart Oldeman 2009-05-29 00:25:38 +00:00
parent 1cc33a1a5e
commit 5b46738372
3 changed files with 17 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
kernel/fatdir.c
View File

@ -282,18 +282,10 @@ BOOL dir_write_update(REG f_node_ptr fnp, BOOL update)
bp->b_flag &= ~(BFR_DATA | BFR_FAT); bp->b_flag &= ~(BFR_DATA | BFR_FAT);
bp->b_flag |= BFR_DIR | BFR_DIRTY | BFR_VALID; bp->b_flag |= BFR_DIR | BFR_DIRTY | BFR_VALID;
} }
return TRUE; /* Clear buffers after directory write or DOS close */
}
VOID dir_close(REG f_node_ptr fnp)
{
/* Test for invalid f_nodes */
if (fnp == NULL || !(fnp->f_flags & F_DDIR))
return;
/* Clear buffers after release */
/* hazard: no error checking! */ /* hazard: no error checking! */
flush_buffers(fnp->f_dpb->dpb_unit); flush_buffers(fnp->f_dpb->dpb_unit);
return TRUE;
} }
#ifndef IPL #ifndef IPL
@ -307,10 +299,10 @@ COUNT dos_findfirst(UCOUNT attr, BYTE * name)
/* The findfirst/findnext calls are probably the worst of the */ /* The findfirst/findnext calls are probably the worst of the */
/* DOS calls. They must work somewhat on the fly (i.e. - open */ /* DOS calls. They must work somewhat on the fly (i.e. - open */
/* but never close). Since we don't want to lose fnodes every */ /* but never close). The near fnodes now work this way. Every */
/* time a directory is searched, we will initialize the DOS */ /* time a directory is searched, we will initialize the DOS */
/* dirmatch structure and then for every find, we will open the */ /* dirmatch structure and then for every find, we will open the */
/* current directory, do a seek and read, then close the fnode. */ /* current directory, do a seek and read. */
/* Parse out the file name */ /* Parse out the file name */
i = ParseDosName(name, SearchDir.dir_name, TRUE); i = ParseDosName(name, SearchDir.dir_name, TRUE);
@ -369,15 +361,12 @@ COUNT dos_findfirst(UCOUNT attr, BYTE * name)
#ifdef DEBUG #ifdef DEBUG
printf("dos_findfirst: %11s\n", fnp->f_dir.dir_name); printf("dos_findfirst: %11s\n", fnp->f_dir.dir_name);
#endif #endif
dir_close(fnp);
return SUCCESS; return SUCCESS;
} }
fnp->f_diroff++; fnp->f_diroff++;
} }
/* Now that we've done our failed search, close it and */ /* Now that we've done our failed search, return an error. */
/* return an error. */
dir_close(fnp);
return DE_NFILES; return DE_NFILES;
} }
/* Otherwise just do a normal find next */ /* Otherwise just do a normal find next */
@ -385,7 +374,6 @@ COUNT dos_findfirst(UCOUNT attr, BYTE * name)
{ {
dmp->dm_entry = 0; dmp->dm_entry = 0;
dmp->dm_dircluster = fnp->f_dirstart; dmp->dm_dircluster = fnp->f_dirstart;
dir_close(fnp);
return dos_findnext(); return dos_findnext();
} }
} }

113
kernel/fatfs.c
View File

@ -152,10 +152,7 @@ int dos_open(char *path, unsigned flags, unsigned attrib, int fd)
/* an access error. */ /* an access error. */
if ((fnp->f_dir.dir_attrib & (D_RDONLY | D_DIR | D_VOLID)) if ((fnp->f_dir.dir_attrib & (D_RDONLY | D_DIR | D_VOLID))
|| (fnp->f_dir.dir_attrib & ~D_ARCHIVE & ~attrib)) || (fnp->f_dir.dir_attrib & ~D_ARCHIVE & ~attrib))
{
dir_close(fnp);
return DE_ACCESS; return DE_ACCESS;
}
/* Release the existing files FAT and set the */ /* Release the existing files FAT and set the */
/* length to zero, effectively truncating the */ /* length to zero, effectively truncating the */
@ -175,14 +172,10 @@ int dos_open(char *path, unsigned flags, unsigned attrib, int fd)
if ((fnp->f_dir.dir_attrib & (D_DIR | D_VOLID)) || if ((fnp->f_dir.dir_attrib & (D_DIR | D_VOLID)) ||
((fnp->f_dir.dir_attrib & D_RDONLY) && ((fnp->f_dir.dir_attrib & D_RDONLY) &&
((flags & O_ACCMODE) != O_RDONLY))) ((flags & O_ACCMODE) != O_RDONLY)))
{
dir_close(fnp);
return DE_ACCESS; return DE_ACCESS;
} }
}
else else
{ {
dir_close(fnp);
return DE_FILEEXISTS; return DE_FILEEXISTS;
} }
} }
@ -197,7 +190,6 @@ int dos_open(char *path, unsigned flags, unsigned attrib, int fd)
{ {
/* open: If we can't find the file, just return a not */ /* open: If we can't find the file, just return a not */
/* found error. */ /* found error. */
dir_close(fnp);
return DE_FILENOTFND; return DE_FILENOTFND;
} }
@ -258,7 +250,6 @@ COUNT dos_close(COUNT fd)
fnp->f_flags |= F_DDIR; fnp->f_flags |= F_DDIR;
dir_write_update(fnp, TRUE); dir_write_update(fnp, TRUE);
dir_close(fnp);
return SUCCESS; return SUCCESS;
} }
@ -312,7 +303,6 @@ BOOL dir_exists(char * path)
if ((fnp = split_path(path, fcbname, &fnode[0])) == NULL) if ((fnp = split_path(path, fcbname, &fnode[0])) == NULL)
return FALSE; return FALSE;
dir_close(fnp);
return TRUE; return TRUE;
} }
@ -353,10 +343,8 @@ COUNT remove_lfn_entries(f_node_ptr fnp)
if (fnp->f_diroff == 0) if (fnp->f_diroff == 0)
break; break;
fnp->f_diroff--; fnp->f_diroff--;
if (dir_read(fnp) <= 0) { if (dir_read(fnp) <= 0)
dir_close(fnp);
return DE_BLKINVLD; return DE_BLKINVLD;
}
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;
@ -364,10 +352,8 @@ COUNT remove_lfn_entries(f_node_ptr fnp)
if (!dir_write(fnp)) return DE_BLKINVLD; if (!dir_write(fnp)) return DE_BLKINVLD;
} }
fnp->f_diroff = original_diroff; fnp->f_diroff = original_diroff;
if (dir_read(fnp) <= 0) { if (dir_read(fnp) <= 0)
dir_close(fnp);
return DE_BLKINVLD; return DE_BLKINVLD;
}
return SUCCESS; return SUCCESS;
} }
@ -462,7 +448,6 @@ STATIC COUNT delete_dir_entry(f_node_ptr fnp)
/* updated */ /* updated */
fnp->f_flags |= F_DMOD; fnp->f_flags |= F_DMOD;
dir_write(fnp); dir_write(fnp);
dir_close(fnp);
/* SUCCESSful completion, return it */ /* SUCCESSful completion, return it */
return SUCCESS; return SUCCESS;
@ -489,19 +474,13 @@ COUNT dos_delete(BYTE * path, int attrib)
/* by find_fname() if attrib is set to a */ /* by find_fname() if attrib is set to a */
/* special value */ /* special value */
if (fnp->f_dir.dir_attrib & (D_RDONLY | D_DIR)) if (fnp->f_dir.dir_attrib & (D_RDONLY | D_DIR))
{
dir_close(fnp);
return DE_ACCESS; return DE_ACCESS;
}
return delete_dir_entry(fnp); return delete_dir_entry(fnp);
} }
else else
{
/* No such file, return the error */ /* No such file, return the error */
dir_close(fnp);
return DE_FILENOTFND; return DE_FILENOTFND;
}
} }
COUNT dos_rmdir(BYTE * path) COUNT dos_rmdir(BYTE * path)
@ -525,10 +504,7 @@ COUNT dos_rmdir(BYTE * path)
/* Check that we're not trying to remove the root! */ /* Check that we're not trying to remove the root! */
if ((path[0] == '\\') && (path[1] == NULL)) if ((path[0] == '\\') && (path[1] == NULL))
{
dir_close(fnp);
return DE_ACCESS; return DE_ACCESS;
}
/* Verify name exists, and if so then ensure it refers */ /* Verify name exists, and if so then ensure it refers */
/* to a directory and directory is empty. */ /* to a directory and directory is empty. */
@ -540,37 +516,25 @@ COUNT dos_rmdir(BYTE * path)
*/ */
if ( !(fnp->f_dir.dir_attrib & D_DIR) || if ( !(fnp->f_dir.dir_attrib & D_DIR) ||
(fnp->f_dir.dir_attrib & ~(D_DIR |D_ARCHIVE)) ) (fnp->f_dir.dir_attrib & ~(D_DIR |D_ARCHIVE)) )
{
dir_close(fnp);
return DE_ACCESS; return DE_ACCESS;
}
/* Check that the directory is empty. Only the */ /* Check that the directory is empty. Only the */
/* "." and ".." are permissable. */ /* "." and ".." are permissable. */
fnp->f_flags &= ~F_DMOD; fnp->f_flags &= ~F_DMOD;
fnp1 = dir_open(path, &fnode[1]); fnp1 = dir_open(path, &fnode[1]);
if (fnp1 == NULL) if (fnp1 == NULL)
{
dir_close(fnp);
return DE_ACCESS; return DE_ACCESS;
}
dir_read(fnp1); dir_read(fnp1);
/* 1st entry should be ".", else directory corrupt or not empty */ /* 1st entry should be ".", else directory corrupt or not empty */
if (fnp1->f_dir.dir_name[0] != '.' || fnp1->f_dir.dir_name[1] != ' ') if (fnp1->f_dir.dir_name[0] != '.' || fnp1->f_dir.dir_name[1] != ' ')
{
dir_close(fnp);
return DE_ACCESS; return DE_ACCESS;
}
fnp1->f_diroff++; fnp1->f_diroff++;
dir_read(fnp1); dir_read(fnp1);
/* secondard entry should be ".." */ /* secondard entry should be ".." */
if (fnp1->f_dir.dir_name[0] != '.' || fnp1->f_dir.dir_name[1] != '.') if (fnp1->f_dir.dir_name[0] != '.' || fnp1->f_dir.dir_name[1] != '.')
{
dir_close(fnp);
return DE_ACCESS; return DE_ACCESS;
}
/* Now search through the directory and make certain */ /* Now search through the directory and make certain */
/* that there are no entries. */ /* that there are no entries. */
@ -589,21 +553,14 @@ COUNT dos_rmdir(BYTE * path)
fnp1->f_diroff++; fnp1->f_diroff++;
} }
dir_close(fnp1);
/* If anything was found, exit with an error. */ /* If anything was found, exit with an error. */
if (found) if (found)
{
dir_close(fnp);
return DE_ACCESS; return DE_ACCESS;
}
return delete_dir_entry(fnp); return delete_dir_entry(fnp);
} }
else else
{
/* No such file, return the error */ /* No such file, return the error */
dir_close(fnp);
return DE_FILENOTFND; return DE_FILENOTFND;
}
} }
COUNT dos_rename(BYTE * path1, BYTE * path2, int attrib) COUNT dos_rename(BYTE * path1, BYTE * path2, int attrib)
@ -628,32 +585,19 @@ COUNT dos_rename(BYTE * path1, BYTE * path2, int attrib)
/* Check that we don't have a duplicate name, so if we find */ /* Check that we don't have a duplicate name, so if we find */
/* one, it's an error. */ /* one, it's an error. */
if (find_fname(fnp2, fcbname, attrib)) if (find_fname(fnp2, fcbname, attrib))
{
dir_close(fnp2);
return DE_ACCESS; return DE_ACCESS;
}
/* next split the passed source into compnents (i.e. - path to */ /* next split the passed source into compnents (i.e. - path to */
/* old file name and name of old file name */ /* old file name and name of old file name */
if ((fnp1 = split_path(path1, fcbname, &fnode[0])) == NULL) if ((fnp1 = split_path(path1, fcbname, &fnode[0])) == NULL)
{
dir_close(fnp2);
return DE_PATHNOTFND; return DE_PATHNOTFND;
}
if (!find_fname(fnp1, fcbname, attrib)) if (!find_fname(fnp1, fcbname, attrib))
{
/* No such file, return the error */
dir_close(fnp1);
dir_close(fnp2);
return DE_FILENOTFND; return DE_FILENOTFND;
}
ret = alloc_find_free(fnp2, path2, fcbname); ret = alloc_find_free(fnp2, path2, fcbname);
if (ret != SUCCESS) { if (ret != SUCCESS)
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;
@ -672,9 +616,7 @@ COUNT dos_rename(BYTE * path1, BYTE * path2, int attrib)
*(fnp1->f_dir.dir_name) = DELETED; *(fnp1->f_dir.dir_name) = DELETED;
dir_write(fnp1); dir_write(fnp1);
dir_close(fnp1);
dir_write(fnp2); dir_write(fnp2);
dir_close(fnp2);
/* SUCCESSful completion, return it */ /* SUCCESSful completion, return it */
return SUCCESS; return SUCCESS;
@ -748,13 +690,12 @@ 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 */ /* alloc_find_free: resets the directory by an open */
/* an open. Then finds a spare directory entry and if not */ /* Then finds a spare directory entry and if not */
/* 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 &= ~F_DMOD;
dir_close(fnp);
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 */
@ -766,7 +707,6 @@ 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 &= ~F_DMOD;
dir_close(fnp);
return DE_TOOMANY; return DE_TOOMANY;
} }
else else
@ -906,18 +846,12 @@ COUNT dos_mkdir(BYTE * dir)
is lost forever is lost forever
*/ */
if (strlen(dir) >= MAX_CDSPATH) /* dir is already output of "truename" */ if (strlen(dir) >= MAX_CDSPATH) /* dir is already output of "truename" */
{
dir_close(fnp);
return DE_PATHNOTFND; return DE_PATHNOTFND;
}
/* Check that we don't have a duplicate name, so if we */ /* Check that we don't have a duplicate name, so if we */
/* find one, it's an error. */ /* find one, it's an error. */
if (find_fname(fnp, fcbname, D_ALL)) if (find_fname(fnp, fcbname, D_ALL))
{
dir_close(fnp);
return DE_ACCESS; return DE_ACCESS;
}
parent = fnp->f_dirstart; parent = fnp->f_dirstart;
@ -934,10 +868,7 @@ COUNT dos_mkdir(BYTE * dir)
/* No empty clusters, disk is FULL! Translate into a */ /* No empty clusters, disk is FULL! Translate into a */
/* useful error message. */ /* useful error message. */
if (free_fat == LONG_LAST_CLUSTER) if (free_fat == LONG_LAST_CLUSTER)
{
dir_close(fnp);
return DE_HNDLDSKFULL; return DE_HNDLDSKFULL;
}
init_direntry(&fnp->f_dir, D_DIR, free_fat, fcbname); init_direntry(&fnp->f_dir, D_DIR, free_fat, fcbname);
@ -958,10 +889,7 @@ COUNT dos_mkdir(BYTE * dir)
printf("FAT (dos_mkdir)\n"); printf("FAT (dos_mkdir)\n");
#endif #endif
if (bp == NULL) if (bp == NULL)
{
dir_close(fnp);
return DE_BLKINVLD; return DE_BLKINVLD;
}
/* Create the "." entry */ /* Create the "." entry */
init_direntry(&DirEntBuffer, D_DIR, free_fat, ". "); init_direntry(&DirEntBuffer, D_DIR, free_fat, ". ");
@ -999,10 +927,7 @@ COUNT dos_mkdir(BYTE * dir)
printf("DIR (dos_mkdir)\n"); printf("DIR (dos_mkdir)\n");
#endif #endif
if (bp == NULL) if (bp == NULL)
{
dir_close(fnp);
return DE_BLKINVLD; return DE_BLKINVLD;
}
fmemset(bp->b_buffer, 0, BUFFERSIZE); fmemset(bp->b_buffer, 0, BUFFERSIZE);
bp->b_flag |= BFR_DIRTY | BFR_VALID | BFR_UNCACHE; /* need not be cached */ bp->b_flag |= BFR_DIRTY | BFR_VALID | BFR_UNCACHE; /* need not be cached */
} }
@ -1014,7 +939,6 @@ COUNT dos_mkdir(BYTE * dir)
/* 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 |= F_DMOD;
dir_write(fnp); dir_write(fnp);
dir_close(fnp);
return SUCCESS; return SUCCESS;
} }
@ -1067,10 +991,7 @@ STATIC COUNT extend_dir(f_node_ptr fnp)
CLUSTER cluster = extend(fnp); CLUSTER cluster = extend(fnp);
if (cluster == LONG_LAST_CLUSTER) if (cluster == LONG_LAST_CLUSTER)
{
dir_close(fnp);
return DE_HNDLDSKFULL; return DE_HNDLDSKFULL;
}
/* clear out the blocks in the cluster */ /* clear out the blocks in the cluster */
for (idx = 0; idx <= fnp->f_dpb->dpb_clsmask; idx++) for (idx = 0; idx <= fnp->f_dpb->dpb_clsmask; idx++)
@ -1084,10 +1005,7 @@ STATIC COUNT extend_dir(f_node_ptr fnp)
printf("DIR (extend_dir)\n"); printf("DIR (extend_dir)\n");
#endif #endif
if (bp == NULL) if (bp == NULL)
{
dir_close(fnp);
return DE_BLKINVLD; return DE_BLKINVLD;
}
fmemset(bp->b_buffer, 0, BUFFERSIZE); fmemset(bp->b_buffer, 0, BUFFERSIZE);
bp->b_flag |= BFR_DIRTY | BFR_VALID; bp->b_flag |= BFR_DIRTY | BFR_VALID;
@ -1096,10 +1014,7 @@ STATIC COUNT extend_dir(f_node_ptr fnp)
} }
if (!find_free(fnp)) if (!find_free(fnp))
{
dir_close(fnp);
return DE_HNDLDSKFULL; return DE_HNDLDSKFULL;
}
/* flush the drive buffers so that all info is written */ /* flush the drive buffers so that all info is written */
/* hazard: no error checking! */ /* hazard: no error checking! */
@ -1673,7 +1588,6 @@ int dos_cd(char * PathName)
/* problem: RBIL table 01643 does not give a FAT32 field for the /* problem: RBIL table 01643 does not give a FAT32 field for the
CDS start cluster. But we are not using this field ourselves */ CDS start cluster. But we are not using this field ourselves */
cdsp->cdsStrtClst = (UWORD)fnp->f_dirstart; cdsp->cdsStrtClst = (UWORD)fnp->f_dirstart;
dir_close(fnp);
return SUCCESS; return SUCCESS;
} }
#endif #endif
@ -1683,7 +1597,6 @@ COUNT dos_getfattr(BYTE * name)
{ {
f_node_ptr fnp; f_node_ptr fnp;
char fcbname[FNAME_SIZE + FEXT_SIZE]; char fcbname[FNAME_SIZE + FEXT_SIZE];
COUNT result;
/* split the passed dir into components (i.e. - path to */ /* split the passed dir into components (i.e. - path to */
/* new directory and name of new directory. */ /* new directory and name of new directory. */
@ -1691,12 +1604,8 @@ COUNT dos_getfattr(BYTE * name)
return DE_PATHNOTFND; return DE_PATHNOTFND;
if (find_fname(fnp, fcbname, D_ALL)) if (find_fname(fnp, fcbname, D_ALL))
result = fnp->f_dir.dir_attrib; return fnp->f_dir.dir_attrib;
else return DE_FILENOTFND;
result = DE_FILENOTFND;
dir_close(fnp);
return result;
} }
COUNT dos_setfattr(BYTE * name, UWORD attrp) COUNT dos_setfattr(BYTE * name, UWORD attrp)
@ -1719,17 +1628,12 @@ COUNT dos_setfattr(BYTE * name, UWORD attrp)
if ((fnp = split_path(name, fcbname, &fnode[0])) == NULL) if ((fnp = split_path(name, fcbname, &fnode[0])) == NULL)
return DE_PATHNOTFND; return DE_PATHNOTFND;
if (!find_fname(fnp, fcbname, D_ALL)) { if (!find_fname(fnp, fcbname, D_ALL))
dir_close(fnp);
return DE_FILENOTFND; return DE_FILENOTFND;
}
/* if caller tries to set DIR on non-directory, return error */ /* if caller tries to set DIR on non-directory, return error */
if ((attrp & D_DIR) && !(fnp->f_dir.dir_attrib & D_DIR)) if ((attrp & D_DIR) && !(fnp->f_dir.dir_attrib & D_DIR))
{
dir_close(fnp);
return DE_ACCESS; return DE_ACCESS;
}
/* Set the attribute from the fnode and return */ /* Set the attribute from the fnode and return */
/* clear all attributes but DIR and VOLID */ /* clear all attributes but DIR and VOLID */
@ -1744,7 +1648,6 @@ COUNT dos_setfattr(BYTE * name, UWORD attrp)
rc = merge_file_changes(fnp, -1); rc = merge_file_changes(fnp, -1);
if (rc == SUCCESS) if (rc == SUCCESS)
dir_write(fnp); dir_write(fnp);
dir_close(fnp);
return rc; return rc;
} }
#endif #endif

1
kernel/proto.h
View File

@ -142,7 +142,6 @@ f_node_ptr dir_open(const char *dirname, f_node_ptr fnp);
COUNT dir_read(REG f_node_ptr fnp); COUNT dir_read(REG f_node_ptr fnp);
BOOL dir_write_update(REG f_node_ptr fnp, BOOL update); BOOL dir_write_update(REG f_node_ptr fnp, BOOL update);
#define dir_write(fnp) dir_write_update(fnp, FALSE) #define dir_write(fnp) dir_write_update(fnp, FALSE)
VOID dir_close(REG f_node_ptr fnp);
COUNT dos_findfirst(UCOUNT attr, BYTE * name); COUNT dos_findfirst(UCOUNT attr, BYTE * name);
COUNT dos_findnext(void); COUNT dos_findnext(void);
void ConvertName83ToNameSZ(BYTE FAR * destSZ, BYTE FAR * srcFCBName); void ConvertName83ToNameSZ(BYTE FAR * destSZ, BYTE FAR * srcFCBName);