mirror of
https://github.com/cc65/cc65.git
synced 2024-12-23 04:30:10 +00:00
Make fseek support ungetc, fix non standard compliant behaviour
git-svn-id: svn://svn.cc65.org/cc65/trunk@3035 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
parent
51752caa56
commit
f36b52f2aa
@ -1,7 +1,8 @@
|
|||||||
/*
|
/*
|
||||||
* fseek.c
|
* fseek.c
|
||||||
*
|
*
|
||||||
* Christian Groessler, 07-Aug-2000
|
* Christian Groessler, 2000-08-07
|
||||||
|
* Ullrich von Bassewitz, 2004-05-12
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
@ -11,7 +12,7 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include "_file.h"
|
#include "_file.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/* Code */
|
/* Code */
|
||||||
@ -19,7 +20,7 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
int __fastcall__ fseek (FILE* f, long offset, int whence)
|
int __fastcall__ fseek (register FILE* f, long offset, int whence)
|
||||||
{
|
{
|
||||||
long res;
|
long res;
|
||||||
|
|
||||||
@ -29,8 +30,31 @@ int __fastcall__ fseek (FILE* f, long offset, int whence)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* If we have a pushed back character, and whence is relative to the
|
||||||
|
* current position, correct the offset.
|
||||||
|
*/
|
||||||
|
if ((f->f_flags & _FPUSHBACK) && whence == SEEK_CUR) {
|
||||||
|
--offset;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Do the seek */
|
||||||
res = lseek(f->f_fd, offset, whence);
|
res = lseek(f->f_fd, offset, whence);
|
||||||
if (res == -1L) return -1;
|
|
||||||
|
/* If we had an error, set the error indicator on the stream, and
|
||||||
|
* return -1. We will check for < 0 here, because that saves some code,
|
||||||
|
* and we don't have files with 2 gigabytes in size anyway:-)
|
||||||
|
*/
|
||||||
|
if (res < 0) {
|
||||||
|
f->f_flags |= _FERROR;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* The seek was successful. Discard any effects of the ungetc function,
|
||||||
|
* and clear the end-of-file indicator.
|
||||||
|
*/
|
||||||
|
f->f_flags &= ~(_FEOF | _FPUSHBACK);
|
||||||
|
|
||||||
|
/* Done */
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user