# HG changeset patch # User Bruno Haible # Date 1207781760 -7200 # Node ID e212112104184fec93faecf12168e0b5c58e5f08 # Parent 08e89df211562a1b21c4a9ebe7f099d8558d9396 Port the extended stdio functions to emx+gcc. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2008-04-08 Bruno Haible + + Add tentative support for emx+gcc. + * lib/fbufmode.c (fbufmode) [__EMX__]: Add conditional code. + * lib/fpurge.c (fpurge): Likewise. + * lib/freadable.c (freadable): Likewise. + * lib/freadahead.c (freadahead): Likewise. + * lib/freading.c (freading): Likewise. + * lib/freadptr.c (freadptr): Likewise. + * lib/freadseek.c (freadptrinc): Likewise. + * lib/fseeko.c (rpl_fseeko): Likewise. + * lib/fseterr.c (fseterr): Likewise. + * lib/fwritable.c (fwritable): Likewise. + * lib/fwriting.c (fwriting): Likewise. + 2008-04-09 Eric Blake Avoid some autoconf warnings. diff --git a/lib/fbufmode.c b/lib/fbufmode.c --- a/lib/fbufmode.c +++ b/lib/fbufmode.c @@ -46,6 +46,8 @@ if (fp->_flags & __SNBF) return _IONBF; return _IOFBF; +#elif defined __EMX__ /* emx+gcc */ + return fp->_flags & (_IOLBF | _IONBF | _IOFBF); #elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */ # if HAVE___FLBF /* Solaris >= 7 */ if (__flbf (fp)) diff --git a/lib/fpurge.c b/lib/fpurge.c --- a/lib/fpurge.c +++ b/lib/fpurge.c @@ -90,6 +90,12 @@ fp_ub._base = NULL; } return 0; +# elif defined __EMX__ /* emx+gcc */ + fp->_ptr = fp->_buffer; + fp->_rcount = 0; + fp->_wcount = 0; + fp->_ungetc_count = 0; + return 0; # elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */ # if defined _SCO_DS /* OpenServer */ # define _base __base diff --git a/lib/freadable.c b/lib/freadable.c --- a/lib/freadable.c +++ b/lib/freadable.c @@ -29,6 +29,8 @@ return (fp->_flags & _IO_NO_READS) == 0; #elif defined __sferror /* FreeBSD, NetBSD, OpenBSD, MacOS X, Cygwin */ return (fp->_flags & (__SRW | __SRD)) != 0; +#elif defined __EMX__ /* emx+gcc */ + return (fp->_flags & (_IORW | _IOREAD)) != 0; #elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */ # if defined _SCO_DS /* OpenServer */ # define _flag __flag diff --git a/lib/freadahead.c b/lib/freadahead.c --- a/lib/freadahead.c +++ b/lib/freadahead.c @@ -43,6 +43,14 @@ return 0; return fp->_r + (HASUB (fp) ? fp->_ur : 0); +#elif defined __EMX__ /* emx+gcc */ + if ((fp->_flags & _IOWRT) != 0) + return 0; + /* Note: fp->_ungetc_count > 0 implies fp->_rcount <= 0, + fp->_ungetc_count = 0 implies fp->_rcount >= 0. */ + /* equivalent to + (fp->_ungetc_count == 0 ? fp->_rcount : fp->_ungetc_count - fp->_rcount) */ + return (fp->_rcount > 0 ? fp->_rcount : fp->_ungetc_count - fp->_rcount); #elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */ # if defined __sun && defined _LP64 /* Solaris/{SPARC,AMD64} 64-bit */ # define fp_ ((struct { unsigned char *_ptr; \ diff --git a/lib/freading.c b/lib/freading.c --- a/lib/freading.c +++ b/lib/freading.c @@ -35,6 +35,8 @@ && fp->_IO_read_base != NULL)); #elif defined __sferror /* FreeBSD, NetBSD, OpenBSD, MacOS X, Cygwin */ return (fp->_flags & __SRD) != 0; +#elif defined __EMX__ /* emx+gcc */ + return (fp->_flags & _IOREAD) != 0; #elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */ # if defined _SCO_DS /* OpenServer */ # define _flag __flag diff --git a/lib/freadptr.c b/lib/freadptr.c --- a/lib/freadptr.c +++ b/lib/freadptr.c @@ -19,6 +19,8 @@ /* Specification. */ #include "freadptr.h" +#include + const char * freadptr (FILE *fp, size_t *sizep) { @@ -41,6 +43,17 @@ return NULL; *sizep = size; return (const char *) fp->_p; +#elif defined __EMX__ /* emx+gcc */ + if ((fp->_flags & _IOWRT) != 0) + return NULL; + /* Note: fp->_ungetc_count > 0 implies fp->_rcount <= 0, + fp->_ungetc_count = 0 implies fp->_rcount >= 0. */ + if (fp->_rcount <= 0) + return NULL; + if (fp->_ungetc_count == 0) + abort (); + *sizep = fp->_rcount; + return fp->_ptr; #elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */ # if defined __sun && defined _LP64 /* Solaris/{SPARC,AMD64} 64-bit */ # define fp_ ((struct { unsigned char *_ptr; \ diff --git a/lib/freadseek.c b/lib/freadseek.c --- a/lib/freadseek.c +++ b/lib/freadseek.c @@ -37,6 +37,9 @@ #elif defined __sferror /* FreeBSD, NetBSD, OpenBSD, MacOS X, Cygwin */ fp->_p += increment; fp->_r -= increment; +#elif defined __EMX__ /* emx+gcc */ + fp->_ptr += increment; + fp->_rcount -= increment; #elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */ # if defined __sun && defined _LP64 /* Solaris/{SPARC,AMD64} 64-bit */ # define fp_ ((struct { unsigned char *_ptr; \ diff --git a/lib/fseeko.c b/lib/fseeko.c --- a/lib/fseeko.c +++ b/lib/fseeko.c @@ -70,6 +70,11 @@ ? fp->_bf._size : 0) && fp_ub._base == NULL) +#elif defined __EMX__ /* emx+gcc */ + if (fp->_ptr == fp->_buffer + && fp->_rcount == 0 + && fp->_wcount == 0 + && fp->_ungetc_count == 0) #elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */ # if defined __sun && defined _LP64 /* Solaris/{SPARC,AMD64} 64-bit */ # define fp_ ((struct { unsigned char *_ptr; \ @@ -117,6 +122,8 @@ fp->_offset = pos; fp->_flags |= __SOFF; fp->_flags &= ~__SEOF; +#elif defined __EMX__ /* emx+gcc */ + fp->_flags &= ~_IOEOF; #elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */ # if defined _SCO_DS /* OpenServer */ # define _flag __flag diff --git a/lib/fseterr.c b/lib/fseterr.c --- a/lib/fseterr.c +++ b/lib/fseterr.c @@ -31,6 +31,8 @@ fp->_flags |= _IO_ERR_SEEN; #elif defined __sferror /* FreeBSD, NetBSD, OpenBSD, MacOS X, Cygwin */ fp->_flags |= __SERR; +#elif defined __EMX__ /* emx+gcc */ + fp->_flags |= _IOERR; #elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */ # if defined __sun && defined _LP64 /* Solaris/{SPARC,AMD64} 64-bit */ # define fp_ ((struct { unsigned char *_ptr; \ diff --git a/lib/fwritable.c b/lib/fwritable.c --- a/lib/fwritable.c +++ b/lib/fwritable.c @@ -29,6 +29,8 @@ return (fp->_flags & _IO_NO_WRITES) == 0; #elif defined __sferror /* FreeBSD, NetBSD, OpenBSD, MacOS X, Cygwin */ return (fp->_flags & (__SRW | __SWR)) != 0; +#elif defined __EMX__ /* emx+gcc */ + return (fp->_flags & (_IORW | _IOWRT)) != 0; #elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */ # if defined _SCO_DS /* OpenServer */ # define _flag __flag diff --git a/lib/fwriting.c b/lib/fwriting.c --- a/lib/fwriting.c +++ b/lib/fwriting.c @@ -29,6 +29,8 @@ return (fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) != 0; #elif defined __sferror /* FreeBSD, NetBSD, OpenBSD, MacOS X, Cygwin */ return (fp->_flags & __SWR) != 0; +#elif defined __EMX__ /* emx+gcc */ + return (fp->_flags & _IOWRT) != 0; #elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw */ # if defined _SCO_DS /* OpenServer */ # define _flag __flag