From: Bruno Haible Date: Wed, 9 Apr 2008 22:56:00 +0000 (+0200) Subject: Port the extended stdio functions to emx+gcc. X-Git-Tag: v0.1~7588 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=cc6492ad1a98f8e0609788ed65dc7d2b874c991e;p=gnulib.git Port the extended stdio functions to emx+gcc. --- diff --git a/ChangeLog b/ChangeLog index 9ec295c68..5dfe4fa29 100644 --- 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 index 52ce917c4..c775fc2e7 100644 --- a/lib/fbufmode.c +++ b/lib/fbufmode.c @@ -46,6 +46,8 @@ fbufmode (FILE *fp) 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 index 7bdc29263..05b58f2a7 100644 --- a/lib/fpurge.c +++ b/lib/fpurge.c @@ -90,6 +90,12 @@ fpurge (FILE *fp) 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 index 9e9cb09da..9ab3c10cd 100644 --- a/lib/freadable.c +++ b/lib/freadable.c @@ -29,6 +29,8 @@ freadable (FILE *fp) 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 index 6c02d75a1..1a8adabef 100644 --- a/lib/freadahead.c +++ b/lib/freadahead.c @@ -43,6 +43,14 @@ freadahead (FILE *fp) 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 index 11c943cdf..8540668f1 100644 --- a/lib/freading.c +++ b/lib/freading.c @@ -35,6 +35,8 @@ freading (FILE *fp) && 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 index 4b170363c..33471a021 100644 --- 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 @@ freadptr (FILE *fp, size_t *sizep) 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 index 82fd64819..bb6a7ad79 100644 --- a/lib/freadseek.c +++ b/lib/freadseek.c @@ -37,6 +37,9 @@ freadptrinc (FILE *fp, size_t increment) #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 index 1ed8921ad..e764cacf8 100644 --- a/lib/fseeko.c +++ b/lib/fseeko.c @@ -70,6 +70,11 @@ rpl_fseeko (FILE *fp, off_t offset, int whence) ? 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 @@ rpl_fseeko (FILE *fp, off_t offset, int whence) 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 index 7b0c68b9f..72560169e 100644 --- a/lib/fseterr.c +++ b/lib/fseterr.c @@ -31,6 +31,8 @@ fseterr (FILE *fp) 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 index 278ef7e3c..f821cfbd2 100644 --- a/lib/fwritable.c +++ b/lib/fwritable.c @@ -29,6 +29,8 @@ fwritable (FILE *fp) 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 index 9f3c1c98b..2ad0d6c29 100644 --- a/lib/fwriting.c +++ b/lib/fwriting.c @@ -29,6 +29,8 @@ fwriting (FILE *fp) 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