* Update alloc_buffer().
CORE-8080

svn path=/trunk/; revision=63291
This commit is contained in:
Amine Khaldi 2014-05-14 14:45:08 +00:00
parent 41b9a3a556
commit e5361e27bd

View file

@ -533,19 +533,24 @@ int CDECL _isatty(int fd)
} }
/* INTERNAL: Allocate stdio file buffer */ /* INTERNAL: Allocate stdio file buffer */
/*static*/ void alloc_buffer(FILE* file) /*static*/ BOOL alloc_buffer(FILE* file)
{ {
file->_base = calloc(BUFSIZ,1); if((file->_file==STDOUT_FILENO || file->_file==STDERR_FILENO)
if(file->_base) { && _isatty(file->_file))
file->_bufsiz = BUFSIZ; return FALSE;
file->_flag |= _IOMYBUF;
} else { file->_base = calloc(BUFSIZ,1);
file->_base = (char*)(&file->_charbuf); if(file->_base) {
/* put here 2 ??? */ file->_bufsiz = BUFSIZ;
file->_bufsiz = sizeof(file->_charbuf); file->_flag |= _IOMYBUF;
} } else {
file->_ptr = file->_base; file->_base = (char*)(&file->_charbuf);
file->_cnt = 0; /* put here 2 ??? */
file->_bufsiz = sizeof(file->_charbuf);
}
file->_ptr = file->_base;
file->_cnt = 0;
return TRUE;
} }
/* INTERNAL: Convert integer to base32 string (0-9a-v), 0 becomes "" */ /* INTERNAL: Convert integer to base32 string (0-9a-v), 0 becomes "" */
@ -2886,7 +2891,7 @@ wint_t CDECL fgetwc(FILE* file)
wint_t ret; wint_t ret;
int ch; int ch;
_lock_file(file); _lock_file(file);
if((get_ioinfo(file->_file)->exflag & (EF_UTF8 | EF_UTF16)) if((get_ioinfo(file->_file)->exflag & (EF_UTF8 | EF_UTF16))
|| !(get_ioinfo(file->_file)->wxflag & WX_TEXT)) { || !(get_ioinfo(file->_file)->wxflag & WX_TEXT)) {