github/amiga-clib2
1
0
Fork 0
mirror of https://github.com/adtools/clib2.git synced 2025-12-08 14:59:05 +00:00
Code Issues Releases Wiki Activity

- Made the file descriptor checks in the fsync() and fdatasync()

Browse Source 
functions more robust.


git-svn-id: file:///Users/olsen/Code/migration-svn-zu-git/logical-line-staging/clib2/trunk@14865 87f5fb63-7c3d-0410-a384-fd976d0f7a62
This commit is contained in:
Olaf Barthel
2005-03-07 11:58:50 +00:00
parent a9c8cdc554
commit ef43011783
6 changed files with 53 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
library/changes
View File

@ -22,6 +22,9 @@
- Added more safety checks to verify that file descriptor
file handles are valid.
- Made the file descriptor checks in the fsync() and fdatasync()
functions more robust.
c.lib 1.189 (5.3.2005)

42
library/stdio_fdhookentry.c
View File

@ -1,5 +1,5 @@
/*
* $Id: stdio_fdhookentry.c,v 1.17 2005-03-07 11:16:43 obarthel Exp $
* $Id: stdio_fdhookentry.c,v 1.18 2005-03-07 11:58:49 obarthel Exp $
*
* :ts=4
*
@ -65,6 +65,7 @@ __fd_hook_entry(
int new_mode;
char * buffer = NULL;
int result = -1;
BPTR file;
ENTER();
@ -73,7 +74,8 @@ __fd_hook_entry(
__fd_lock(fd);
if(fd->fd_DefaultFile == ZERO)
file = fd->fd_DefaultFile;
if(file == ZERO)
{
SHOWMSG("file is closed");
@ -90,11 +92,11 @@ __fd_hook_entry(
assert( fam->fam_Data != NULL );
assert( fam->fam_Size > 0 );
D(("read %ld bytes from position %ld to 0x%08lx",fam->fam_Size,Seek(fd->fd_DefaultFile,0,OFFSET_CURRENT),fam->fam_Data));
D(("read %ld bytes from position %ld to 0x%08lx",fam->fam_Size,Seek(file,0,OFFSET_CURRENT),fam->fam_Data));
PROFILE_OFF();
result = Read(fd->fd_DefaultFile,fam->fam_Data,fam->fam_Size);
result = Read(file,fam->fam_Data,fam->fam_Size);
PROFILE_ON();
@ -124,20 +126,20 @@ __fd_hook_entry(
PROFILE_OFF();
if(Seek(fd->fd_DefaultFile,0,OFFSET_END) >= 0)
if(Seek(file,0,OFFSET_END) >= 0)
{
if(FLAG_IS_SET(fd->fd_Flags,FDF_CACHE_POSITION))
fd->fd_Position = Seek(fd->fd_DefaultFile,0,OFFSET_CURRENT);
fd->fd_Position = Seek(file,0,OFFSET_CURRENT);
}
PROFILE_ON();
}
D(("write %ld bytes to position %ld from 0x%08lx",fam->fam_Size,Seek(fd->fd_DefaultFile,0,OFFSET_CURRENT),fam->fam_Data));
D(("write %ld bytes to position %ld from 0x%08lx",fam->fam_Size,Seek(file,0,OFFSET_CURRENT),fam->fam_Data));
PROFILE_OFF();
result = Write(fd->fd_DefaultFile,fam->fam_Data,fam->fam_Size);
result = Write(file,fam->fam_Data,fam->fam_Size);
PROFILE_ON();
@ -174,7 +176,7 @@ __fd_hook_entry(
/* OK, so we cannot close it. But we might be obliged to
reset a console into buffered mode. */
if(FLAG_IS_SET(fd->fd_Flags,FDF_NON_BLOCKING) && FLAG_IS_SET(fd->fd_Flags,FDF_IS_INTERACTIVE))
SetMode(fd->fd_DefaultFile,DOSFALSE);
SetMode(file,DOSFALSE);
}
else
{
@ -192,14 +194,14 @@ __fd_hook_entry(
PROFILE_OFF();
parent_dir = __safe_parent_of_file_handle(fd->fd_DefaultFile);
parent_dir = __safe_parent_of_file_handle(file);
if(parent_dir != ZERO)
{
if(__safe_examine_file_handle(fd->fd_DefaultFile,fib))
if(__safe_examine_file_handle(file,fib))
name_and_path_valid = TRUE;
}
if(CANNOT Close(fd->fd_DefaultFile))
if(CANNOT Close(file))
{
fam->fam_Error = __translate_io_error_to_errno(IoErr());
@ -358,7 +360,7 @@ __fd_hook_entry(
else
new_mode = OFFSET_END;
D(("seek to offset %ld, new_mode %ld; current position = %ld",fam->fam_Offset,new_mode,Seek(fd->fd_DefaultFile,0,OFFSET_CURRENT)));
D(("seek to offset %ld, new_mode %ld; current position = %ld",fam->fam_Offset,new_mode,Seek(file,0,OFFSET_CURRENT)));
if(FLAG_IS_SET(fd->fd_Flags,FDF_CACHE_POSITION))
{
@ -367,7 +369,7 @@ __fd_hook_entry(
else
{
PROFILE_OFF();
current_position = Seek(fd->fd_DefaultFile,0,OFFSET_CURRENT);
current_position = Seek(file,0,OFFSET_CURRENT);
PROFILE_ON();
if(current_position < 0)
@ -393,7 +395,7 @@ __fd_hook_entry(
case OFFSET_END:
if(__safe_examine_file_handle(fd->fd_DefaultFile,fib))
if(__safe_examine_file_handle(file,fib))
{
new_position = fib->fib_Size + fam->fam_Offset;
@ -408,7 +410,7 @@ __fd_hook_entry(
LONG position;
PROFILE_OFF();
position = Seek(fd->fd_DefaultFile,fam->fam_Offset,new_mode);
position = Seek(file,fam->fam_Offset,new_mode);
PROFILE_ON();
if(position < 0)
@ -419,7 +421,7 @@ __fd_hook_entry(
#if defined(UNIX_PATH_SEMANTICS)
{
if(NOT fib_is_valid && CANNOT __safe_examine_file_handle(fd->fd_DefaultFile,fib))
if(NOT fib_is_valid && CANNOT __safe_examine_file_handle(file,fib))
{
fam->fam_Error = __translate_io_error_to_errno(IoErr());
goto out;
@ -469,7 +471,7 @@ __fd_hook_entry(
else
mode = DOSTRUE; /* single character mode */
if(CANNOT SetMode(fd->fd_DefaultFile,mode))
if(CANNOT SetMode(file,mode))
{
fam->fam_Error = __translate_io_error_to_errno(IoErr());
goto out;
@ -492,7 +494,7 @@ __fd_hook_entry(
SHOWMSG("file_action_examine");
if(CANNOT __safe_examine_file_handle(fd->fd_DefaultFile,fam->fam_FileInfo))
if(CANNOT __safe_examine_file_handle(file,fam->fam_FileInfo))
{
SHOWMSG("couldn't examine the file");
@ -500,7 +502,7 @@ __fd_hook_entry(
goto out;
}
fh = BADDR(fd->fd_DefaultFile);
fh = BADDR(file);
fam->fam_FileSystem = fh->fh_Type;

4
library/stdio_protos.h
View File

@ -1,5 +1,5 @@
/*
* $Id: stdio_protos.h,v 1.13 2005-03-07 11:16:43 obarthel Exp $
* $Id: stdio_protos.h,v 1.14 2005-03-07 11:58:50 obarthel Exp $
*
* :ts=4
*
@ -201,7 +201,7 @@ extern int __grow_file_size(struct fd * fd,int num_bytes);
/****************************************************************************/
/* unistd_sync_fd.c */
extern void __sync_fd(struct fd * fd,int mode);
extern int __sync_fd(struct fd * fd,int mode);
/****************************************************************************/

15
library/unistd_fdatasync.c
View File

@ -1,5 +1,5 @@
/*
* $Id: unistd_fdatasync.c,v 1.4 2005-03-07 11:16:43 obarthel Exp $
* $Id: unistd_fdatasync.c,v 1.5 2005-03-07 11:58:50 obarthel Exp $
*
* :ts=4
*
@ -71,19 +71,8 @@ fdatasync(int file_descriptor)
goto out;
}
if(FLAG_IS_SET(fd->fd_Flags,FDF_IS_SOCKET))
{
__set_errno(EINVAL);
if(__sync_fd(fd,0) < 0) /* flush just the data */
goto out;
}
if(fd->fd_DefaultFile == ZERO)
{
__set_errno(EBADF);
goto out;
}
__sync_fd(fd,0); /* flush just the data */
result = 0;

15
library/unistd_fsync.c
View File

@ -1,5 +1,5 @@
/*
* $Id: unistd_fsync.c,v 1.4 2005-03-07 11:16:43 obarthel Exp $
* $Id: unistd_fsync.c,v 1.5 2005-03-07 11:58:50 obarthel Exp $
*
* :ts=4
*
@ -70,19 +70,8 @@ fsync(int file_descriptor)
goto out;
}
if(FLAG_IS_SET(fd->fd_Flags,FDF_IS_SOCKET))
{
__set_errno(EINVAL);
if(__sync_fd(fd,1) < 0) /* flush everything */
goto out;
}
if(fd->fd_DefaultFile == ZERO)
{
__set_errno(EBADF);
goto out;
}
__sync_fd(fd,1); /* flush everything */
result = 0;

24
library/unistd_sync_fd.c
View File

@ -1,5 +1,5 @@
/*
* $Id: unistd_sync_fd.c,v 1.3 2005-03-07 11:16:43 obarthel Exp $
* $Id: unistd_sync_fd.c,v 1.4 2005-03-07 11:58:50 obarthel Exp $
*
* :ts=4
*
@ -47,13 +47,27 @@
/****************************************************************************/
void
int
__sync_fd(struct fd * fd,int mode)
{
int result = -1;
assert( fd != NULL );
__fd_lock(fd);
if(FLAG_IS_SET(fd->fd_Flags,FDF_IS_SOCKET))
{
__set_errno(EINVAL);
goto out;
}
if(fd->fd_DefaultFile == ZERO)
{
__set_errno(EBADF);
goto out;
}
/* The mode tells us what to flush. 0 means "flush just the data", and
everything else means "flush everything. */
Flush(fd->fd_DefaultFile);
@ -67,5 +81,11 @@ __sync_fd(struct fd * fd,int mode)
DoPkt(fh->fh_Type,ACTION_FLUSH, 0,0,0,0,0);
}
result = 0;
out:
__fd_unlock(fd);
return(result);
}