Subversion Repositories Kolibri OS

Compare Revisions

Ignore whitespace Rev 9164 → Rev 9165

/programs/develop/ktcc/trunk/libc.obj/include/sys/ksys.h
1304,16 → 1304,12
k.p20 = 0;
k.p21 = name;
int status;
unsigned bytes_read_v;
asm_inline(
"int $0x40"
:"=a"(status), "=b"(bytes_read_v)
:"=a"(status), "=b"(*bytes_read)
:"a"(70), "b"(&k)
:"memory"
);
if (!status) {
*bytes_read = bytes_read_v;
}
return status;
}
 
1343,16 → 1339,12
k.p20 = 0;
k.p21 = name;
int status;
unsigned bytes_written_v;
asm_inline(
"int $0x40"
:"=a"(status), "=b"(bytes_written_v)
:"=a"(status), "=b"(*bytes_written)
:"a"(70), "b"(&k)
:"memory"
);
if (!status) {
*bytes_written = bytes_written_v;
}
return status;
}
 
/programs/develop/ktcc/trunk/libc.obj/source/stdio/fread.c
24,24 → 24,22
return nmemb;
}
 
else{
if(stream->mode & _FILEMODE_R){
if(!stream->__ungetc_emu_buff){
((char*) ptr)[0]=(char)stream->__ungetc_emu_buff;
//debug_printf("Ungetc: %x\n", ((char*) ptr)[0]);
if(stream->mode & _FILEMODE_R){
if(!stream->__ungetc_emu_buff){
((char*) ptr)[0]=(char)stream->__ungetc_emu_buff;
//debug_printf("Ungetc: %x\n", ((char*) ptr)[0]);
}
unsigned status = _ksys_file_read_file(stream->name, stream->position, bytes_count, ptr , &bytes_read);
if (status != KSYS_FS_ERR_SUCCESS) {
if(status == KSYS_FS_ERR_EOF){
stream->eof=1;
}else{
errno = EIO;
stream->error = errno;
return 0;
}
unsigned status = _ksys_file_read_file(stream->name, stream->position, bytes_count, ptr , &bytes_read);
if (status != KSYS_FS_ERR_SUCCESS) {
if(status == KSYS_FS_ERR_EOF){
stream->eof=1;
}else{
errno = EIO;
stream->error = errno;
return 0;
}
}
stream->position+=bytes_read;
}
stream->position+=bytes_read;
}
return bytes_read/size;
}