Usermode/libc - C++ wrapping in headers, time rework

[tpg/acess2.git] / Usermode / Libraries / libc.so_src / stdio.c

diff --git a/Usermode/Libraries/libc.so_src/stdio.c b/Usermode/Libraries/libc.so_src/stdio.c
index 372c489..a944f9b 100644 (file)
--- a/Usermode/Libraries/libc.so_src/stdio.c
+++ b/Usermode/Libraries/libc.so_src/stdio.c
@@ -223,6 +223,33 @@ EXPORT FILE *open_memstream(char **bufferptr, size_t *lengthptr)
        return ret;\r
 }\r
 \r
+EXPORT FILE *fdopen(int fd, const char *mode)\r
+{\r
+       FILE    *ret;\r
+       \r
+       if( fd < 0 || !mode )   return NULL;\r
+       \r
+       ret = get_file_struct();\r
+       \r
+       ret->FD = fd;\r
+       ret->Flags = _fopen_modetoflags(mode);\r
+       if(ret->Flags == -1) {\r
+               ret->Flags = 0;\r
+               return NULL;\r
+       }\r
+       \r
+       ret->Buffer = NULL;\r
+       ret->BufferPos = 0;\r
+       ret->BufferSpace = 0;\r
+       \r
+       return ret;\r
+}\r
+\r
+EXPORT FILE *tmpfile(void)\r
+{\r
+       return NULL;\r
+}\r
+\r
 EXPORT int fclose(FILE *fp)\r
 {\r
        if( !(fp->Flags & FILE_FLAG_ALLOC) )\r
@@ -452,7 +479,7 @@ int _fseek_memstream(FILE *fp, long int amt, int whence)
        return 0;\r
 }\r
 \r
-EXPORT int fseek(FILE *fp, long int amt, int whence)\r
+EXPORT int fseeko(FILE *fp, off_t amt, int whence)\r
 {\r
        if(!fp || fp->FD == FD_NOTOPEN) {\r
                errno = EBADF;\r
@@ -473,6 +500,11 @@ EXPORT int fseek(FILE *fp, long int amt, int whence)
        }\r
 }\r
 \r
+EXPORT int fseek(FILE *fp, long int amt, int whence)\r
+{\r
+       return fseeko(fp, amt, whence);\r
+}\r
+\r
 size_t _fwrite_unbuffered(FILE *fp, size_t size, size_t num, const void *data)\r
 {\r
        size_t  ret = 0, bytes;\r
@@ -612,12 +644,12 @@ size_t _fread_memstream(void *ptr, size_t size, size_t num, FILE *fp)
 \r
 size_t _fread_buffered(void *ptr, size_t size, FILE *fp)\r
 {\r
-       _SysDebug("%p: %i-%i <= %i", fp,\r
-               (int)fp->Pos, (int)fp->BufferOfs, (int)fp->BufferPos);\r
+       //_SysDebug("%p: %i-%i <= %i", fp,\r
+       //      (int)fp->Pos, (int)fp->BufferOfs, (int)fp->BufferPos);\r
        if( fp->BufferPos > 0 ) {\r
-               assert( fp->Pos - fp->BufferOfs <= fp->BufferPos );\r
+               assert( fp->Pos - fp->BufferOfs <= (int)fp->BufferPos );\r
        }\r
-       if( fp->BufferPos == 0 || fp->Pos - fp->BufferOfs == fp->BufferPos )\r
+       if( fp->BufferPos == 0 || fp->Pos - fp->BufferOfs == (int)fp->BufferPos )\r
        {\r
                int rv = _SysRead(fp->FD, fp->Buffer, fp->BufferSpace);\r
                if( rv <= 0 ) {\r
@@ -627,15 +659,15 @@ size_t _fread_buffered(void *ptr, size_t size, FILE *fp)
                \r
                fp->BufferPos = rv;\r
                fp->BufferOfs = fp->Pos;\r
-               _SysDebug("%p: Buffered %i at %i", fp, rv, fp->Pos);\r
+               //_SysDebug("%p: Buffered %i at %i", fp, rv, fp->Pos);\r
        }\r
        \r
        size_t  inner_ofs = fp->Pos - fp->BufferOfs;\r
        if(size > fp->BufferPos - inner_ofs)\r
                size = fp->BufferPos - inner_ofs;\r
        \r
-       _SysDebug("%p: Read %i from %i+%i", fp, size,\r
-               (int)fp->BufferOfs, inner_ofs);\r
+       //_SysDebug("%p: Read %i from %i+%i", fp, size,\r
+       //      (int)fp->BufferOfs, inner_ofs);\r
        memcpy(ptr, fp->Buffer + inner_ofs, size);\r
        fp->Pos += size;\r
        return size;\r
@@ -774,6 +806,7 @@ EXPORT int fgetc(FILE *fp)
 \r
 EXPORT int getchar(void)\r
 {\r
+       fflush(stdout);\r
        return fgetc(stdin);\r
 }\r
 \r