Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 12:55:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CRT]

Browse source 
* Update _ftelli64()
* Fixes a couple msvcrt tests.
CORE-8080

svn path=/trunk/; revision=63226
This commit is contained in:
Amine Khaldi 2014-05-11 10:45:02 +00:00
parent c93f8e51f0
commit bef8de14c4
1 changed files with 39 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

55
reactos/lib/sdk/crt/stdio/file.c
View file

@ -83,6 +83,7 @@ int *__p___mb_cur_max(void);
/* values for wxflag in file descriptor */ /* values for wxflag in file descriptor */
#define WX_OPEN 0x01 #define WX_OPEN 0x01
#define WX_ATEOF 0x02 #define WX_ATEOF 0x02
#define WX_READNL 0x04 /* read started with \n */
#define WX_READEOF 0x04 /* like ATEOF, but for underlying file rather than buffer */ #define WX_READEOF 0x04 /* like ATEOF, but for underlying file rather than buffer */
#define WX_READCR 0x08 /* underlying file is at \r */ #define WX_READCR 0x08 /* underlying file is at \r */
#define WX_DONTINHERIT 0x10 #define WX_DONTINHERIT 0x10
@ -2894,8 +2895,6 @@ int CDECL fsetpos(FILE* file, const fpos_t *pos)
*/ */
__int64 CDECL _ftelli64(FILE* file) __int64 CDECL _ftelli64(FILE* file)
{ {
/* TODO: just call fgetpos and return lower half of result */
int off=0;
__int64 pos; __int64 pos;
_lock_file(file); _lock_file(file);
@ -2905,26 +2904,50 @@ __int64 CDECL _ftelli64(FILE* file)
return -1; return -1;
} }
if(file->_bufsiz) { if(file->_bufsiz) {
if( file->_flag & _IOWRT ) { if(file->_flag & _IOWRT) {
off = file->_ptr - file->_base; pos += file->_ptr - file->_base;
if(get_ioinfo(file->_file)->wxflag & WX_TEXT) {
char *p;
for(p=file->_base; p<file->_ptr; p++)
if(*p == '\n')
pos++;
}
} else if(!file->_cnt) { /* nothing to do */
} else if(_lseeki64(file->_file, 0, SEEK_END)==pos) {
int i;
pos -= file->_cnt;
if(get_ioinfo(file->_file)->wxflag & WX_TEXT) {
for(i=0; i<file->_cnt; i++)
if(file->_ptr[i] == '\n')
pos--;
}
} else { } else {
off = -file->_cnt; char *p;
if (get_ioinfo(file->_file)->wxflag & WX_TEXT) {
/* Black magic correction for CR removal */ if(_lseeki64(file->_file, pos, SEEK_SET) != pos) {
int i; _unlock_file(file);
for (i=0; i<file->_cnt; i++) { return -1;
if (file->_ptr[i] == '\n') }
off--;
} pos -= file->_bufsiz;
/* Black magic when reading CR at buffer boundary*/ pos += file->_ptr - file->_base;
if(get_ioinfo(file->_file)->wxflag & WX_READCR)
off--; if(get_ioinfo(file->_file)->wxflag & WX_TEXT) {
if(get_ioinfo(file->_file)->wxflag & WX_READNL)
pos--;
for(p=file->_base; p<file->_ptr; p++)
if(*p == '\n')
pos++;
} }
} }
} }
_unlock_file(file); _unlock_file(file);
return off + pos; return pos;
} }
/********************************************************************* /*********************************************************************