6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2024-12-25 02:29:52 +00:00
Code Issues Projects Releases Wiki Activity

Fix return codes

Browse Source 
git-svn-id: svn://svn.cc65.org/cc65/trunk@1204 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz 2002-03-24 13:23:59 +00:00
parent a07e05beb8
commit d4cb713197
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libsrc/common/fread.c
View File

@ -20,7 +20,7 @@ size_t fread (void* buf, size_t size, size_t count, FILE* f)
/* Is the file open? */
if ((f->f_flags & _FOPEN) == 0) {
_errno = EINVAL; /* File not open */
return (size_t) -1;
return 0;
}
/* Did we have an error or EOF? */
@ -33,21 +33,26 @@ size_t fread (void* buf, size_t size, size_t count, FILE* f)
bytes = size * count;
if (bytes) {
/* Read the data. */
bytes = read (f->f_fd, buf, bytes);
if (bytes == -1) {
/* Read error */
f->f_flags |= _FERROR;
return (size_t) -1;
}
if (bytes == 0) {
/* End of file */
f->f_flags |= _FEOF;
return (size_t) -1;
}
/* Unfortunately, we cannot avoid the divide here... */
return bytes / size;
switch (bytes) {
case -1:
/* Read error */
f->f_flags |= _FERROR;
return 0;
case 0:
/* End of file */
f->f_flags |= _FEOF;
/* FALLTHROUGH */
default:
/* Unfortunately, we cannot avoid the divide here... */
return bytes / size;
}
} else {

4
libsrc/common/fwrite.c
View File

@ -20,7 +20,7 @@ size_t fwrite (const void* buf, size_t size, size_t count, FILE* f)
/* Is the file open? */
if ((f->f_flags & _FOPEN) == 0) {
_errno = EINVAL; /* File not open */
return -1;
return 0;
}
/* Did we have an error */
@ -37,7 +37,7 @@ size_t fwrite (const void* buf, size_t size, size_t count, FILE* f)
if (write (f->f_fd, buf, bytes) == -1) {
/* Write error */
f->f_flags |= _FERROR;
return -1;
return 0;
}
}