struct access_sys_t
{
- unsigned int i_nb_reads;
-
int fd;
/* */
p_access->pf_block = NULL;
p_access->pf_control = FileControl;
p_access->p_sys = p_sys;
- p_sys->i_nb_reads = 0;
p_sys->fd = fd;
if (S_ISREG (st.st_mode) || S_ISBLK (st.st_mode))
p_access->info.i_pos += val;
p_access->info.b_eof = !val;
-
- p_sys->i_nb_reads++;
-
- if (!(p_sys->i_nb_reads % INPUT_FSTAT_NB_READS)
- || (p_access->info.i_pos > p_access->info.i_size))
+ if (p_access->info.i_pos >= p_access->info.i_size)
{
struct stat st;
struct access_sys_t
{
- unsigned int i_nb_reads;
char *psz_name;
GnomeVFSHandle *p_handle;
STANDARD_READ_ACCESS_INIT;
p_sys->p_handle = p_handle;
- p_sys->i_nb_reads = 0;
p_sys->b_pace_control = true;
if( strcmp( "gnomevfs", p_access->psz_access ) &&
gnome_vfs_result_to_string( i_ret ) );
}
}
- else
- {
- p_sys->i_nb_reads++;
- if( p_access->info.i_size != 0 &&
- (p_sys->i_nb_reads % INPUT_FSTAT_NB_READS) == 0 &&
- p_sys->b_local )
- {
- gnome_vfs_file_info_clear( p_sys->p_file_info );
- i_ret = gnome_vfs_get_file_info_from_handle( p_sys->p_handle,
- p_sys->p_file_info, 8 );
- if( i_ret )
- {
- msg_Warn( p_access, "couldn't get file properties again (%s)",
- gnome_vfs_result_to_string( i_ret ) );
- }
- else
- {
- p_access->info.i_size = (int64_t)(p_sys->p_file_info->size);
- }
- }
- }
p_access->info.i_pos += (int64_t)i_read_len;
-
- /* Some Acces (http) never return EOF and loop on the file */
- if( p_access->info.i_pos > p_access->info.i_size )
+ if( p_access->info.i_pos >= p_access->info.i_size
+ && p_access->info.i_size != 0 && p_sys->b_local )
{
- p_access->info.b_eof = true;
- return 0;
+ gnome_vfs_file_info_clear( p_sys->p_file_info );
+ i_ret = gnome_vfs_get_file_info_from_handle( p_sys->p_handle,
+ p_sys->p_file_info, 8 );
+ if( i_ret )
+ msg_Warn( p_access, "couldn't get file properties again (%s)",
+ gnome_vfs_result_to_string( i_ret ) );
+ else
+ p_access->info.i_size = (int64_t)(p_sys->p_file_info->size);
}
return (int)i_read_len;
}