luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Eof() now correctly works on file bigger than 4GB opened in direct mode.

Browse source 
[INTERPRETER]
* BUG: Eof() now correctly works on file bigger than 4GB opened in direct mode.
This commit is contained in:
gambas 2018-08-27 23:57:30 +02:00
parent 4145ccd2fa
commit 7d16436c5c
4 changed files with 34 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
main/gbx/gbx_stream.c
View file

@ -141,7 +141,7 @@ int STREAM_get_readable(STREAM *stream, int *len)
return (-1); return (-1);
} }
static int default_eof(STREAM *stream) bool STREAM_default_eof(STREAM *stream)
{ {
int fd; int fd;
int ilen; int ilen;
@ -1710,7 +1710,7 @@ bool STREAM_eof(STREAM *stream)
if (stream->type->eof) if (stream->type->eof)
return ((*(stream->type->eof))(stream)); return ((*(stream->type->eof))(stream));
else else
return default_eof(stream); return STREAM_default_eof(stream);
} }

3
main/gbx/gbx_stream.h
View file

@ -83,6 +83,8 @@ typedef
int64_t size; int64_t size;
int fd; int fd;
unsigned watch : 1; unsigned watch : 1;
unsigned has_size : 1;
unsigned use_size : 1;
} }
STREAM_DIRECT; STREAM_DIRECT;
@ -224,6 +226,7 @@ void STREAM_flush(STREAM *stream);
int STREAM_handle(STREAM *stream); int STREAM_handle(STREAM *stream);
void STREAM_lof(STREAM *stream, int64_t *len); void STREAM_lof(STREAM *stream, int64_t *len);
bool STREAM_eof(STREAM *stream); bool STREAM_eof(STREAM *stream);
bool STREAM_default_eof(STREAM *stream);
void STREAM_load(const char *path, char **buffer, int *len); void STREAM_load(const char *path, char **buffer, int *len);

30
main/gbx/gbx_stream_direct.c
View file

@ -119,6 +119,8 @@ static int stream_open(STREAM *stream, const char *path, int mode)
stream->common.available_now = TRUE; stream->common.available_now = TRUE;
} }
stream->direct.has_size = FALSE;
FD = fd; FD = fd;
return FALSE; return FALSE;
} }
@ -167,7 +169,33 @@ static int stream_flush(STREAM *stream)
} }
#define stream_eof NULL static int stream_eof(STREAM *stream)
{
struct stat info;
off_t pos;
if (!stream->direct.has_size)
{
if (fstat(FD, &info) == 0)
{
stream->direct.use_size = TRUE;
stream->direct.size = info.st_size;
}
stream->direct.has_size = TRUE;
}
if (stream->direct.use_size && !stream->common.no_lseek)
{
pos = lseek(FD, 0, SEEK_CUR);
if (pos >= 0)
return pos >= stream->direct.size;
stream->common.no_lseek = TRUE;
}
return STREAM_default_eof(stream);
}
static int stream_lof(STREAM *stream, int64_t *len) static int stream_lof(STREAM *stream, int64_t *len)

14
main/gbx/gbx_stream_process.c
View file

@ -102,23 +102,9 @@ static int stream_flush(STREAM *stream)
} }
/*static int stream_eof(STREAM *stream)
{
int ilen;
if (STREAM_get_readable(FD, &ilen))
return TRUE;
return (ilen == 0);
}*/
#define stream_eof NULL #define stream_eof NULL
/*static int stream_lof(STREAM *stream, int64_t *len)
{
*len = 0; //stream->direct.size;
return FALSE;
}*/
#define stream_lof NULL #define stream_lof NULL