#include <precomp.h>
#include "wine/unicode.h"
+#include "internal/wine/msvcrt.h"
#include <sys/utime.h>
#include <direct.h>
#define MSVCRT_INTERNAL_BUFSIZ 4096
-/* ioinfo structure size is different in msvcrXX.dll's */
-typedef struct {
- HANDLE handle;
- unsigned char wxflag;
- char lookahead[3];
- int exflag;
- CRITICAL_SECTION crit;
-} ioinfo;
-
/*********************************************************************
* __pioinfo (MSVCRT.@)
* array of pointers to ioinfo arrays [32]
return ret + (fd%MSVCRT_FD_BLOCK_SIZE);
}
-static inline ioinfo* get_ioinfo(int fd)
+/*static*/ inline ioinfo* get_ioinfo(int fd)
{
ioinfo *ret = get_ioinfo_nolock(fd);
- if(ret->exflag & EF_CRIT_INIT)
- EnterCriticalSection(&ret->crit);
+ if(ret == &__badioinfo)
+ return ret;
+ if(!(ret->exflag & EF_CRIT_INIT)) {
+ LOCK_FILES();
+ if(!(ret->exflag & EF_CRIT_INIT)) {
+ InitializeCriticalSection(&ret->crit);
+ ret->exflag |= EF_CRIT_INIT;
+ }
+ UNLOCK_FILES();
+ }
+ EnterCriticalSection(&ret->crit);
return ret;
}
-static inline void release_ioinfo(ioinfo *info)
+static inline BOOL alloc_pioinfo_block(int fd)
+{
+ ioinfo *block;
+ int i;
+
+ if(fd<0 || fd>=MSVCRT_MAX_FILES)
+ {
+ *_errno() = ENFILE;
+ return FALSE;
+ }
+
+ block = calloc(MSVCRT_FD_BLOCK_SIZE, sizeof(ioinfo));
+ if(!block)
+ {
+ WARN(":out of memory!\n");
+ *_errno() = ENOMEM;
+ return FALSE;
+ }
+ for(i=0; i<MSVCRT_FD_BLOCK_SIZE; i++)
+ block[i].handle = INVALID_HANDLE_VALUE;
+ if(InterlockedCompareExchangePointer((void**)&__pioinfo[fd/MSVCRT_FD_BLOCK_SIZE], block, NULL))
+ free(block);
+ return TRUE;
+}
+
+static inline ioinfo* get_ioinfo_alloc_fd(int fd)
{
- if(info->exflag & EF_CRIT_INIT)
+ ioinfo *ret, *info;
+
+ ret = get_ioinfo(fd);
+ if(ret != &__badioinfo)
+ {
+ LOCK_FILES();
+ /* locate next free slot */
+ if (fd == fdstart && fd == fdend)
+ fdstart = fdend + 1;
+ else if (fd == fdstart)
+ {
+ fdstart++;
+ while (fdstart < fdend &&
+ ((info = get_ioinfo_nolock(fdstart))->exflag & EF_CRIT_INIT))
+ {
+ if (TryEnterCriticalSection(&info->crit))
+ {
+ if (info->handle == INVALID_HANDLE_VALUE)
+ {
+ LeaveCriticalSection(&info->crit);
+ break;
+ }
+ LeaveCriticalSection(&info->crit);
+ }
+ fdstart++;
+ }
+ }
+ /* update last fd in use */
+ if (fd >= fdend)
+ fdend = fd + 1;
+ TRACE("fdstart is %d, fdend is %d\n", fdstart, fdend);
+ UNLOCK_FILES();
+ return ret;
+ }
+
+ if(!alloc_pioinfo_block(fd))
+ return &__badioinfo;
+
+ ret = get_ioinfo(fd);
+ if(ret == &__badioinfo)
+ return ret;
+
+ LOCK_FILES();
+ /* locate next free slot */
+ if (fd == fdstart && fd == fdend)
+ fdstart = fdend + 1;
+ else if (fd == fdstart)
+ {
+ fdstart++;
+ while (fdstart < fdend &&
+ ((info = get_ioinfo_nolock(fdstart))->exflag & EF_CRIT_INIT))
+ {
+ if (TryEnterCriticalSection(&info->crit))
+ {
+ if (info->handle == INVALID_HANDLE_VALUE)
+ {
+ LeaveCriticalSection(&info->crit);
+ break;
+ }
+ LeaveCriticalSection(&info->crit);
+ }
+ fdstart++;
+ }
+ }
+ /* update last fd in use */
+ if (fd >= fdend)
+ fdend = fd + 1;
+ TRACE("fdstart is %d, fdend is %d\n", fdstart, fdend);
+ UNLOCK_FILES();
+
+ return ret;
+}
+
+/*static*/ inline void release_ioinfo(ioinfo *info)
+{
+ if(info!=&__badioinfo && info->exflag & EF_CRIT_INIT)
LeaveCriticalSection(&info->crit);
}
return &ret->file;
}
-static inline BOOL is_valid_fd(int fd)
-{
- return fd >= 0 && fd < fdend && (get_ioinfo_nolock(fd)->wxflag & WX_OPEN);
-}
-
-/* INTERNAL: Get the HANDLE for a fd
- * This doesn't lock the table, because a failure will result in
- * INVALID_HANDLE_VALUE being returned, which should be handled correctly. If
- * it returns a valid handle which is about to be closed, a subsequent call
- * will fail, most likely in a sane way.
- */
-/*static*/ HANDLE fdtoh(int fd)
-{
- if (!is_valid_fd(fd))
- {
- WARN(":fd (%d) - no handle!\n",fd);
- *__doserrno() = 0;
- *_errno() = EBADF;
- return INVALID_HANDLE_VALUE;
- }
- //if (get_ioinfo_nolock(fd)->handle == INVALID_HANDLE_VALUE)
- //FIXME("returning INVALID_HANDLE_VALUE for %d\n", fd);
- return get_ioinfo_nolock(fd)->handle;
-}
-
/* INTERNAL: free a file entry fd */
static void msvcrt_free_fd(int fd)
{
- ioinfo *fdinfo;
+ ioinfo *fdinfo = get_ioinfo(fd);
- LOCK_FILES();
- fdinfo = get_ioinfo_nolock(fd);
if(fdinfo != &__badioinfo)
{
fdinfo->handle = INVALID_HANDLE_VALUE;
break;
}
}
+ release_ioinfo(fdinfo);
+ LOCK_FILES();
if (fd == fdend - 1)
fdend--;
if (fd < fdstart)
UNLOCK_FILES();
}
-/* INTERNAL: Allocate an fd slot from a Win32 HANDLE, starting from fd */
-/* caller must hold the files lock */
-static int msvcrt_set_fd(HANDLE hand, int flag, int fd)
+static void msvcrt_set_fd(ioinfo *fdinfo, HANDLE hand, int flag)
{
- ioinfo *fdinfo;
-
- if (fd >= MSVCRT_MAX_FILES)
- {
- WARN(":files exhausted!\n");
- *_errno() = ENFILE;
- return -1;
- }
-
- fdinfo = get_ioinfo_nolock(fd);
- if(fdinfo == &__badioinfo) {
- int i;
-
- __pioinfo[fd/MSVCRT_FD_BLOCK_SIZE] = calloc(MSVCRT_FD_BLOCK_SIZE, sizeof(ioinfo));
- if(!__pioinfo[fd/MSVCRT_FD_BLOCK_SIZE]) {
- WARN(":out of memory!\n");
- *_errno() = ENOMEM;
- return -1;
- }
-
- for(i=0; i<MSVCRT_FD_BLOCK_SIZE; i++)
- __pioinfo[fd/MSVCRT_FD_BLOCK_SIZE][i].handle = INVALID_HANDLE_VALUE;
-
- fdinfo = get_ioinfo_nolock(fd);
- }
-
fdinfo->handle = hand;
fdinfo->wxflag = WX_OPEN | (flag & (WX_DONTINHERIT | WX_APPEND | WX_TEXT | WX_PIPE | WX_TTY));
fdinfo->lookahead[0] = '\n';
fdinfo->lookahead[1] = '\n';
fdinfo->lookahead[2] = '\n';
- if(!(fdinfo->exflag & EF_CRIT_INIT))
- InitializeCriticalSection(&fdinfo->crit);
- fdinfo->exflag = EF_CRIT_INIT;
+ fdinfo->exflag &= EF_CRIT_INIT;
- /* locate next free slot */
- if (fd == fdstart && fd == fdend)
- fdstart = fdend + 1;
- else
- while (fdstart < fdend &&
- get_ioinfo_nolock(fdstart)->handle != INVALID_HANDLE_VALUE)
- fdstart++;
- /* update last fd in use */
- if (fd >= fdend)
- fdend = fd + 1;
- TRACE("fdstart is %d, fdend is %d\n", fdstart, fdend);
-
- switch (fd)
+ switch (fdinfo-__pioinfo[0])
{
case 0: SetStdHandle(STD_INPUT_HANDLE, hand); break;
case 1: SetStdHandle(STD_OUTPUT_HANDLE, hand); break;
case 2: SetStdHandle(STD_ERROR_HANDLE, hand); break;
}
-
- return fd;
}
/* INTERNAL: Allocate an fd slot from a Win32 HANDLE */
/*static*/ int msvcrt_alloc_fd(HANDLE hand, int flag)
{
- int ret;
+ ioinfo *info;
+ int fd;
- LOCK_FILES();
- TRACE(":handle (%p) allocating fd (%d)\n",hand,fdstart);
- ret = msvcrt_set_fd(hand, flag, fdstart);
- UNLOCK_FILES();
- return ret;
+ LOCK_FILES();
+ fd = fdstart;
+ TRACE(":handle (%p) allocating fd (%d)\n", hand, fd);
+
+ if (fd >= MSVCRT_MAX_FILES)
+ {
+ UNLOCK_FILES();
+ WARN(":files exhausted!\n");
+ *_errno() = ENFILE;
+ return -1;
+ }
+
+ info = get_ioinfo_alloc_fd(fd);
+ UNLOCK_FILES();
+ if(info == &__badioinfo)
+ return -1;
+
+ msvcrt_set_fd(info, hand, flag);
+ release_ioinfo(info);
+ return fd;
}
/* INTERNAL: Allocate a FILE* for an fd slot */
static int msvcrt_init_fp(FILE* file, int fd, unsigned stream_flags)
{
TRACE(":fd (%d) allocating FILE*\n",fd);
- if (!is_valid_fd(fd))
+ if (!(get_ioinfo_nolock(fd)->wxflag & WX_OPEN))
{
WARN(":invalid fd %d\n",fd);
*__doserrno() = 0;
*/
unsigned create_io_inherit_block(WORD *size, BYTE **block)
{
- int fd;
+ int fd, last_fd;
char* wxflag_ptr;
HANDLE* handle_ptr;
ioinfo* fdinfo;
- *size = sizeof(unsigned) + (sizeof(char) + sizeof(HANDLE)) * fdend;
+ for (last_fd=MSVCRT_MAX_FILES-1; last_fd>=0; last_fd--)
+ if (get_ioinfo_nolock(last_fd)->handle != INVALID_HANDLE_VALUE)
+ break;
+ last_fd++;
+
+ *size = sizeof(unsigned) + (sizeof(char) + sizeof(HANDLE)) * last_fd;
*block = calloc(1, *size);
if (!*block)
{
return FALSE;
}
wxflag_ptr = (char*)*block + sizeof(unsigned);
- handle_ptr = (HANDLE*)(wxflag_ptr + fdend * sizeof(char));
+ handle_ptr = (HANDLE*)(wxflag_ptr + last_fd);
- *(unsigned*)*block = fdend;
- for (fd = 0; fd < fdend; fd++)
+ *(unsigned*)*block = last_fd;
+ for (fd = 0; fd < last_fd; fd++)
{
/* to be inherited, we need it to be open, and that DONTINHERIT isn't set */
- fdinfo = get_ioinfo_nolock(fd);
+ fdinfo = get_ioinfo(fd);
if ((fdinfo->wxflag & (WX_OPEN | WX_DONTINHERIT)) == WX_OPEN)
{
*wxflag_ptr = fdinfo->wxflag;
*wxflag_ptr = 0;
*handle_ptr = INVALID_HANDLE_VALUE;
}
+ release_ioinfo(fdinfo);
wxflag_ptr++; handle_ptr++;
}
return TRUE;
for (i = 0; i < count; i++)
{
if ((*wxflag_ptr & WX_OPEN) && *handle_ptr != INVALID_HANDLE_VALUE)
- msvcrt_set_fd(*handle_ptr, *wxflag_ptr, i);
+ {
+ fdinfo = get_ioinfo_alloc_fd(i);
+ if(fdinfo != &__badioinfo)
+ msvcrt_set_fd(fdinfo, *handle_ptr, *wxflag_ptr);
+ release_ioinfo(fdinfo);
+ }
wxflag_ptr++; handle_ptr++;
}
if (get_ioinfo_nolock(fdstart)->handle == INVALID_HANDLE_VALUE) break;
}
- fdinfo = get_ioinfo_nolock(STDIN_FILENO);
+ fdinfo = get_ioinfo_alloc_fd(STDIN_FILENO);
if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) {
HANDLE h = GetStdHandle(STD_INPUT_HANDLE);
DWORD type = GetFileType(h);
- msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0)
- |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0), STDIN_FILENO);
+ msvcrt_set_fd(fdinfo, h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0)
+ |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0));
}
+ release_ioinfo(fdinfo);
- fdinfo = get_ioinfo_nolock(STDOUT_FILENO);
+ fdinfo = get_ioinfo_alloc_fd(STDOUT_FILENO);
if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) {
HANDLE h = GetStdHandle(STD_OUTPUT_HANDLE);
DWORD type = GetFileType(h);
- msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0)
- |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0), STDOUT_FILENO);
+ msvcrt_set_fd(fdinfo, h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0)
+ |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0));
}
+ release_ioinfo(fdinfo);
- fdinfo = get_ioinfo_nolock(STDERR_FILENO);
+ fdinfo = get_ioinfo_alloc_fd(STDERR_FILENO);
if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) {
HANDLE h = GetStdHandle(STD_ERROR_HANDLE);
DWORD type = GetFileType(h);
- msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0)
- |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0), STDERR_FILENO);
+ msvcrt_set_fd(fdinfo, h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_TTY : 0)
+ |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0));
}
+ release_ioinfo(fdinfo);
TRACE(":handles (%p)(%p)(%p)\n", get_ioinfo_nolock(STDIN_FILENO)->handle,
get_ioinfo_nolock(STDOUT_FILENO)->handle,
*/
int CDECL _dup2(int od, int nd)
{
+ ioinfo *info_od, *info_nd;
int ret;
TRACE("(od=%d, nd=%d)\n", od, nd);
LOCK_FILES();
- if (nd < MSVCRT_MAX_FILES && nd >= 0 && is_valid_fd(od))
+
+ if (od < nd)
+ {
+ info_od = get_ioinfo(od);
+ info_nd = get_ioinfo_alloc_fd(nd);
+ }
+ else
+ {
+ info_nd = get_ioinfo_alloc_fd(nd);
+ info_od = get_ioinfo(od);
+ }
+
+ if (info_nd == &__badioinfo)
+ {
+ ret = -1;
+ }
+ else if (info_od->wxflag & WX_OPEN)
{
HANDLE handle;
- if (DuplicateHandle(GetCurrentProcess(), get_ioinfo_nolock(od)->handle,
+ if (DuplicateHandle(GetCurrentProcess(), info_od->handle,
GetCurrentProcess(), &handle, 0, TRUE, DUPLICATE_SAME_ACCESS))
{
- int wxflag = get_ioinfo_nolock(od)->wxflag & ~_O_NOINHERIT;
+ int wxflag = info_od->wxflag & ~_O_NOINHERIT;
- if (is_valid_fd(nd))
+ if (info_nd->wxflag & WX_OPEN)
_close(nd);
- ret = msvcrt_set_fd(handle, wxflag, nd);
- if (ret == -1)
- {
- CloseHandle(handle);
- *_errno() = EMFILE;
- }
- else
- {
- /* _dup2 returns 0, not nd, on success */
- ret = 0;
- }
+
+ msvcrt_set_fd(info_nd, handle, wxflag);
+ /* _dup2 returns 0, not nd, on success */
+ ret = 0;
}
else
{
*_errno() = EBADF;
ret = -1;
}
+
+ release_ioinfo(info_od);
+ release_ioinfo(info_nd);
UNLOCK_FILES();
return ret;
}
*/
intptr_t CDECL _get_osfhandle(int fd)
{
- HANDLE hand = fdtoh(fd);
+ HANDLE hand = get_ioinfo_nolock(fd)->handle;
TRACE(":fd (%d) handle (%p)\n",fd,hand);
+ if(hand == INVALID_HANDLE_VALUE)
+ *_errno() = EBADF;
return (intptr_t)hand;
}
/*********************************************************************
* (internal) read_utf8
*/
-static int read_utf8(int fd, wchar_t *buf, unsigned int count)
+static int read_utf8(ioinfo *fdinfo, wchar_t *buf, unsigned int count)
{
- ioinfo *fdinfo = get_ioinfo_nolock(fd);
HANDLE hand = fdinfo->handle;
char min_buf[4], *readbuf, lookahead;
DWORD readbuf_size, pos=0, num_read=1, char_len, i, j;
* the file pointer on the \r character while getc() goes on to
* the following \n
*/
-static int read_i(int fd, void *buf, unsigned int count)
+static int read_i(int fd, ioinfo *fdinfo, void *buf, unsigned int count)
{
DWORD num_read, utf16;
char *bufstart = buf;
- HANDLE hand = fdtoh(fd);
- ioinfo *fdinfo = get_ioinfo_nolock(fd);
if (count == 0)
return 0;
}
/* Don't trace small reads, it gets *very* annoying */
if (count > 4)
- TRACE(":fd (%d) handle (%p) buf (%p) len (%d)\n",fd,hand,buf,count);
- if (hand == INVALID_HANDLE_VALUE)
+ TRACE(":fd (%d) handle (%p) buf (%p) len (%d)\n", fd, fdinfo->handle, buf, count);
+ if (fdinfo->handle == INVALID_HANDLE_VALUE)
{
*_errno() = EBADF;
return -1;
}
if((fdinfo->wxflag&WX_TEXT) && (fdinfo->exflag&EF_UTF8))
- return read_utf8(fd, buf, count);
+ return read_utf8(fdinfo, buf, count);
- if (fdinfo->lookahead[0]!='\n' || ReadFile(hand, bufstart, count, &num_read, NULL))
+ if (fdinfo->lookahead[0]!='\n' || ReadFile(fdinfo->handle, bufstart, count, &num_read, NULL))
{
if (fdinfo->lookahead[0] != '\n')
{
fdinfo->lookahead[1] = '\n';
}
- if(count>1+utf16 && ReadFile(hand, bufstart+1+utf16, count-1-utf16, &num_read, NULL))
+ if(count>1+utf16 && ReadFile(fdinfo->handle, bufstart+1+utf16, count-1-utf16, &num_read, NULL))
num_read += 1+utf16;
else
num_read = 1+utf16;
DWORD len;
lookahead[1] = '\n';
- if (ReadFile(hand, lookahead, 1+utf16, &len, NULL) && len)
+ if (ReadFile(fdinfo->handle, lookahead, 1+utf16, &len, NULL) && len)
{
if(lookahead[0]=='\n' && (!utf16 || lookahead[1]==0) && j==0)
{
*/
int CDECL _read(int fd, void *buf, unsigned int count)
{
- int num_read;
- num_read = read_i(fd, buf, count);
- return num_read;
+ ioinfo *info = get_ioinfo(fd);
+ int num_read = read_i(fd, info, buf, count);
+ release_ioinfo(info);
+ return num_read;
}
/*********************************************************************
*/
int CDECL _setmode(int fd,int mode)
{
- int ret = get_ioinfo_nolock(fd)->wxflag & WX_TEXT ? _O_TEXT : _O_BINARY;
- if(ret==_O_TEXT && (get_ioinfo_nolock(fd)->exflag & (EF_UTF8|EF_UTF16)))
+ ioinfo *info = get_ioinfo(fd);
+ int ret = info->wxflag & WX_TEXT ? _O_TEXT : _O_BINARY;
+ if(ret==_O_TEXT && (info->exflag & (EF_UTF8|EF_UTF16)))
ret = _O_WTEXT;
if(mode!=_O_TEXT && mode!=_O_BINARY && mode!=_O_WTEXT
&& mode!=_O_U16TEXT && mode!=_O_U8TEXT) {
*_errno() = EINVAL;
+ release_ioinfo(info);
return -1;
}
if(mode == _O_BINARY) {
- get_ioinfo_nolock(fd)->wxflag &= ~WX_TEXT;
- get_ioinfo_nolock(fd)->exflag &= ~(EF_UTF8|EF_UTF16);
+ info->wxflag &= ~WX_TEXT;
+ info->exflag &= ~(EF_UTF8|EF_UTF16);
+ release_ioinfo(info);
return ret;
}
- get_ioinfo_nolock(fd)->wxflag |= WX_TEXT;
+ info->wxflag |= WX_TEXT;
if(mode == _O_TEXT)
- get_ioinfo_nolock(fd)->exflag &= ~(EF_UTF8|EF_UTF16);
+ info->exflag &= ~(EF_UTF8|EF_UTF16);
else if(mode == _O_U8TEXT)
- get_ioinfo_nolock(fd)->exflag = (get_ioinfo_nolock(fd)->exflag & ~EF_UTF16) | EF_UTF8;
+ info->exflag = (info->exflag & ~EF_UTF16) | EF_UTF8;
else
- get_ioinfo_nolock(fd)->exflag = (get_ioinfo_nolock(fd)->exflag & ~EF_UTF8) | EF_UTF16;
+ info->exflag = (info->exflag & ~EF_UTF8) | EF_UTF16;
+ release_ioinfo(info);
return ret;
}
int CDECL _write(int fd, const void* buf, unsigned int count)
{
DWORD num_written;
- ioinfo *info = get_ioinfo_nolock(fd);
+ ioinfo *info = get_ioinfo(fd);
HANDLE hand = info->handle;
/* Don't trace small writes, it gets *very* annoying */
if (hand == INVALID_HANDLE_VALUE)
{
*_errno() = EBADF;
+ release_ioinfo(info);
return -1;
}
if (((info->exflag&EF_UTF8) || (info->exflag&EF_UTF16)) && count&1)
{
*_errno() = EINVAL;
+ release_ioinfo(info);
return -1;
}
{
if (WriteFile(hand, buf, count, &num_written, NULL)
&& (num_written == count))
+ {
+ release_ioinfo(info);
return num_written;
+ }
TRACE("WriteFile (fd %d, hand %p) failed-last error (%d)\n", fd,
hand, GetLastError());
*_errno() = ENOSPC;
if(!conv_len) {
_dosmaperr(GetLastError());
free(p);
+ release_ioinfo(info);
return -1;
}
if (!WriteFile(hand, q, size, &num_written, NULL))
num_written = -1;
+ release_ioinfo(info);
if(p)
free(p);
if (num_written != size)
return count;
}
+ release_ioinfo(info);
return -1;
}
if(!(file->_flag & (_IOMYBUF | _USERBUF))) {
int r;
- if ((r = read_i(file->_file,&c,1)) != 1) {
+ if ((r = _read(file->_file,&c,1)) != 1) {
file->_flag |= (r == 0) ? _IOEOF : _IOERR;
_unlock_file(file);
return EOF;
_unlock_file(file);
return c;
} else {
- file->_cnt = read_i(file->_file, file->_base, file->_bufsiz);
+ file->_cnt = _read(file->_file, file->_base, file->_bufsiz);
if(file->_cnt<=0) {
file->_flag |= (file->_cnt == 0) ? _IOEOF : _IOERR;
file->_cnt = 0;