ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: _flsbuf zeroes _cnt.

This commit is contained in:
Dan Kegel 2009-01-28 21:42:01 -08:00 committed by Alexandre Julliard
parent c2c564db9d
commit 5bf1ae82f1
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/msvcrt/file.c
View File

@ -2592,6 +2592,8 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file)
} else {
unsigned char cc=c;
int len;
/* set _cnt to 0 for unbuffered FILEs */
file->_cnt = 0;
len = MSVCRT__write(file->_file, &cc, 1);
if (len == 1) return c & 0xff;
file->_flag |= MSVCRT__IOERR;

23
dlls/msvcrt/tests/file.c
View File

@ -471,9 +471,10 @@ static void test_flsbuf( void )
{
char* tempf;
FILE *tempfh;
int c;
int ret;
int bufmode;
int bufmodes[] = {_IOFBF,_IONBF};
static const int bufmodes[] = {_IOFBF,_IONBF};
tempf=_tempnam(".","wne");
for (bufmode=0; bufmode < sizeof(bufmodes)/sizeof(bufmodes[0]); bufmode++)
@ -497,6 +498,26 @@ static void test_flsbuf( void )
ok(EOF == ret, "_flsbuf(0,tempfh) on r/o file expected %x got %x\n", EOF, ret);
fclose(tempfh);
/* See bug 17123, exposed by WinAVR's make */
tempfh = fopen(tempf,"w");
ok(tempfh->_cnt == 0, "_cnt on freshly opened file was %d\n", tempfh->_cnt);
setbuf(tempfh, NULL);
ok(tempfh->_cnt == 0, "_cnt on unbuffered file was %d\n", tempfh->_cnt);
/* Inlined putchar sets _cnt to -1. Native seems to ignore the value... */
tempfh->_cnt = 1234;
ret = _flsbuf('Q',tempfh);
ok('Q' == ret, "_flsbuf('Q',tempfh) expected %x got %x\n", 'Q', ret);
/* ... and reset it to zero */
ok(tempfh->_cnt == 0, "after unbuf _flsbuf, _cnt was %d\n", tempfh->_cnt);
fclose(tempfh);
/* And just for grins, make sure the file is correct */
tempfh = fopen(tempf,"r");
c = fgetc(tempfh);
ok(c == 'Q', "first byte should be 'Q'\n");
c = fgetc(tempfh);
ok(c == EOF, "there should only be one byte\n");
fclose(tempfh);
unlink(tempf);
}