[prev in list] [next in list] [prev in thread] [next in thread]
List: wine-patches
Subject: msvcrt2 [1/3]: remove read_i loop and fix fread
From: Duane Clark <fpga () pacbell ! net>
Date: 2006-07-31 19:12:02
Message-ID: 44CE5602.6070801 () pacbell ! net
[Download RAW message or body]
Was there a reason the "take 2" version of "Fix _read and fgetc" wasn't
used? If it was just missed, then here is the diff. While this does not
actually function differently, it seems a bit confusing to leave in a
loop that will only be executed once.
This also includes the removal of a redundant test in fgetc and fixes
the break from the loop in fread, also part of the "take 2" patch.
Changelog: remove read_i loop and fix fread
["file08.diff" (text/x-patch)]
Index: dlls/msvcrt/file.c
===================================================================
RCS file: /home/wine/wine/dlls/msvcrt/file.c,v
retrieving revision 1.105
diff -u -p -r1.105 file.c
--- dlls/msvcrt/file.c 31 Jul 2006 09:33:09 -0000 1.105
+++ dlls/msvcrt/file.c 31 Jul 2006 15:47:29 -0000
@@ -1619,7 +1619,7 @@ static unsigned int remove_cr(char *buf,
*/
static int read_i(int fd, void *buf, unsigned int count)
{
- DWORD num_read, all_read = 0;
+ DWORD num_read;
char *bufstart = buf;
HANDLE hand = msvcrt_fdtoh(fd);
@@ -1630,34 +1630,25 @@ static int read_i(int fd, void *buf, uns
return -1;
/* Reading single bytes in O_TEXT mode makes things slow
- * So read big chunks, then remove the \r in memory and try reading
- * the rest until the request is satisfied or EOF is met
+ * So read big chunks
*/
- while (all_read < count)
- {
- if (ReadFile(hand, bufstart+all_read, count - all_read, &num_read, NULL))
- {
- if (num_read != (count - all_read))
- {
- TRACE(":EOF\n");
- MSVCRT_fdesc[fd].wxflag |= WX_ATEOF;
- all_read += num_read;
- if (count > 4)
- TRACE("%s\n",debugstr_an(buf,all_read));
- return all_read;
- }
- all_read += num_read;
- }
- else
- {
- TRACE(":failed-last error (%ld)\n",GetLastError());
- return -1;
- }
- }
+ if (ReadFile(hand, bufstart, count, &num_read, NULL))
+ {
+ if (num_read != count)
+ {
+ MSVCRT_fdesc[fd].wxflag |= WX_ATEOF;
+ TRACE(":EOF %s\n",debugstr_an(buf,num_read));
+ }
+ }
+ else
+ {
+ TRACE(":failed-last error (%ld)\n",GetLastError());
+ return -1;
+ }
if (count > 4)
- TRACE("(%lu), %s\n",all_read,debugstr_an(buf, all_read));
- return all_read;
+ TRACE("(%lu), %s\n",num_read,debugstr_an(buf, num_read));
+ return num_read;
}
/*********************************************************************
@@ -2132,11 +2123,8 @@ int CDECL MSVCRT_fgetc(MSVCRT_FILE* file
file->_cnt--;
i = file->_ptr++;
j = *i;
- } else {
+ } else
j = MSVCRT__filbuf(file);
- if (j == MSVCRT_EOF)
- return j;
- }
if (!(MSVCRT_fdesc[file->_file].wxflag & WX_TEXT) || (j != '\r'))
return j;
} while(1);
@@ -2508,7 +2496,6 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *p
while(rcnt>0)
{
int i = _read(file->_file,ptr, rcnt);
- if (i==0) break;
pread += i;
rcnt -= i;
/* expose feof condition in the flags
@@ -2522,6 +2509,7 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *p
pread = 0;
rcnt = 0;
}
+ if (i < 1) break;
}
read+=pread;
return read / size;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic