badpork/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

libc.obj:

Browse Source 
- fixed return fwrite and fread as well as eof

git-svn-id: svn://kolibrios.org@9156 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
turbocat 2021-08-26 20:35:11 +00:00
parent e5501138fe
commit 785dcb3341
2 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
programs/develop/ktcc/trunk/libc.obj/source/stdio/fread.c
View File

@ -12,6 +12,12 @@ size_t fread(void *restrict ptr, size_t size, size_t nmemb, FILE *restrict strea
return 0; return 0;
} }
if(size<=0 || nmemb<=0){
errno = EINVAL;
stream->error=errno;
return 0;
}
if(stream==stdin){ if(stream==stdin){
con_init(); con_init();
con_gets((char*)ptr, bytes_count+1); con_gets((char*)ptr, bytes_count+1);
@ -25,14 +31,17 @@ size_t fread(void *restrict ptr, size_t size, size_t nmemb, FILE *restrict strea
//debug_printf("Ungetc: %x\n", ((char*) ptr)[0]); //debug_printf("Ungetc: %x\n", ((char*) ptr)[0]);
} }
unsigned status = _ksys_file_read_file(stream->name, stream->position, bytes_count, ptr , &bytes_read); unsigned status = _ksys_file_read_file(stream->name, stream->position, bytes_count, ptr , &bytes_read);
if (status) { if (status != KSYS_FS_ERR_SUCCESS) {
errno = EIO; if(status == KSYS_FS_ERR_EOF){
stream->error = errno; stream->eof=1;
return 0; }else{
}else { errno = EIO;
stream->position+=bytes_read; stream->error = errno;
return 0;
}
} }
stream->position+=bytes_read;
} }
} }
return bytes_read; return bytes_read/size;
} }

32
programs/develop/ktcc/trunk/libc.obj/source/stdio/fwrite.c
View File

@ -12,28 +12,34 @@ size_t fwrite(const void *restrict ptr, size_t size, size_t nmemb, FILE *restric
return 0; return 0;
} }
if(size<=0 || nmemb<=0){
errno = EINVAL;
stream->error=errno;
return 0;
}
if(stream==stdout){ if(stream==stdout){
con_init(); con_init();
con_write_string((char*)ptr, bytes_count); con_write_string((char*)ptr, bytes_count);
return nmemb; return nmemb;
} }
else if(stream==stderr){
if(stream==stderr){
for (size_t i = 0; i < bytes_count; i++) { for (size_t i = 0; i < bytes_count; i++) {
char c = *(char*)(ptr+i); char c = *(char*)(ptr+i);
_ksys_debug_putc(c); _ksys_debug_putc(c);
} }
return nmemb;
} }
else{
if(stream->mode != _FILEMODE_R){ if(stream->mode != _FILEMODE_R){
unsigned status = _ksys_file_write_file(stream->name, stream->position, bytes_count, ptr, &bytes_written); unsigned status = _ksys_file_write_file(stream->name, stream->position, bytes_count, ptr, &bytes_written);
if (status != KSYS_FS_ERR_SUCCESS) { if (status != KSYS_FS_ERR_SUCCESS) {
errno = EIO; errno = EIO;
stream->error = errno; stream->error = errno;
return 0; return 0;
}else {
stream->position+=bytes_written;
}
} }
stream->position+=bytes_written;
} }
return bytes_written; return bytes_written/size;
} }