X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=internals%2F_PDCLIB_int.h;h=02e122eb3ada87dfa4f09e2a21712370a72bcadb;hb=393020b6e48719d27699dea6b29e53025bbd5123;hp=0ce2c99fc383ab9c700ceb42482203a3cc0da7fe;hpb=d9e48b611b63bcfc55727463cb9d9d0e87a7a405;p=pdclib diff --git a/internals/_PDCLIB_int.h b/internals/_PDCLIB_int.h index 0ce2c99..02e122e 100644 --- a/internals/_PDCLIB_int.h +++ b/internals/_PDCLIB_int.h @@ -118,8 +118,6 @@ typedef unsigned char _PDCLIB_uint8_t; #define _PDCLIB_INT8_MAX _PDCLIB_CHAR_MAX #define _PDCLIB_INT8_MIN _PDCLIB_CHAR_MIN #define _PDCLIB_UINT8_MAX _PDCLIB_UCHAR_MAX -#define _PDCLIB_INT8_LITERAL -#define _PDCLIB_UINT8_LITERAL #else #error Unsupported width of char (not 8 bits). #endif @@ -131,16 +129,12 @@ typedef unsigned int _PDCLIB_uint16_t; #define _PDCLIB_INT16_MAX _PDCLIB_INT_MAX #define _PDCLIB_INT16_MIN _PDCLIB_INT_MIN #define _PDCLIB_UINT16_MAX _PDCLIB_UINT_MAX -#define _PDCLIB_INT16_LITERAL -#define _PDCLIB_UINT16_LITERAL #elif _PDCLIB_SHRT_BYTES == 2 typedef signed short _PDCLIB_int16_t; typedef unsigned short _PDCLIB_uint16_t; #define _PDCLIB_INT16_MAX _PDCLIB_SHRT_MAX #define _PDCLIB_INT16_MIN _PDCLIB_SHRT_MIN #define _PDCLIB_UINT16_MAX _PDCLIB_USHRT_MAX -#define _PDCLIB_INT16_LITERAL s -#define _PDCLIB_UINT16_LITERAL us #else #error Neither 'short' nor 'int' are 16-bit. #endif @@ -257,29 +251,41 @@ typedef unsigned _PDCLIB_intmax _PDCLIB_uintmax_t; /* Flags for representing mode (see fopen()). Note these must fit the same status field as the _IO?BF flags in and the internal flags below. */ -#define _PDCLIB_FREAD 8u +#define _PDCLIB_FREAD 8u #define _PDCLIB_FWRITE 16u #define _PDCLIB_FAPPEND 32u #define _PDCLIB_FRW 64u #define _PDCLIB_FBIN 128u /* Internal flags, made to fit the same status field as the flags above. */ -#define _PDCLIB_WROTELAST 256u -#define _PDCLIB_LIBBUFFER 512u -#define _PDCLIB_VIRGINSTR 1024u -#define _PDCLIB_ERRORFLAG 2048u -#define _PDCLIB_EOFFLAG 4096u +#define _PDCLIB_LIBBUFFER 512u +#define _PDCLIB_ERRORFLAG 1024u +#define _PDCLIB_EOFFLAG 2048u +#define _PDCLIB_WIDESTREAM 4096u +#define _PDCLIB_BYTESTREAM 8192u + +/* Position / status structure for getpos() / fsetpos(). */ +struct _PDCLIB_fpos_t +{ + _PDCLIB_uint64_t offset; /* File position offset */ + int status; /* Multibyte parsing state (unused, reserved) */ +}; +/* FILE structure */ struct _PDCLIB_file_t { - _PDCLIB_fd_t handle; /* OS-specific file descriptor */ - _PDCLIB_fpos_t position; /* file position indicator */ - char * buffer; /* file buffer */ - _PDCLIB_size_t bufsize; /* size of buffer */ - _PDCLIB_size_t bufidx; /* pointer into buffer */ - unsigned int status; /* misc. status bits */ - /*mbstate_t mbstate; multibyte parse state - TODO: Unmask. */ - struct _PDCLIB_file_t * next; /* provisions for linked list handling */ + _PDCLIB_fd_t handle; /* OS file handle */ + char * buffer; /* Pointer to buffer memory */ + _PDCLIB_size_t bufsize; /* Size of buffer */ + _PDCLIB_size_t bufidx; /* Index of current position in buffer */ + _PDCLIB_size_t bufend; /* Index of last pre-read character in buffer */ + struct _PDCLIB_fpos_t pos; /* Offset and multibyte parsing state */ + _PDCLIB_size_t ungetidx; /* Number of ungetc()'ed characters */ + unsigned char * ungetbuf; /* ungetc() buffer */ + unsigned int status; /* Status flags; see above */ + /* multibyte parsing status to be added later */ + char * filename; /* Name the current stream has been opened with */ + struct _PDCLIB_file_t * next; /* Pointer to next struct (internal) */ }; /* -------------------------------------------------------------------------- */ @@ -330,7 +336,7 @@ _PDCLIB_intmax_t _PDCLIB_atomax( const char * s ); /* Two helper functions used by strtol(), strtoul() and long long variants. */ const char * _PDCLIB_strtox_prelim( const char * p, char * sign, int * base ); -_PDCLIB_uintmax_t _PDCLIB_strtox_main( const char ** p, unsigned int base, _PDCLIB_uintmax_t error, _PDCLIB_uintmax_t limval, _PDCLIB_uintmax_t limdigit, char * sign ); +_PDCLIB_uintmax_t _PDCLIB_strtox_main( const char ** p, unsigned int base, _PDCLIB_uintmax_t error, _PDCLIB_uintmax_t limval, int limdigit, char * sign ); /* Digits arrays used by various integer conversion functions */ extern char _PDCLIB_digits[]; @@ -347,3 +353,37 @@ const char * _PDCLIB_print( const char * spec, struct _PDCLIB_status_t * status /* Parsing any fopen() style filemode string into a number of flags. */ unsigned int _PDCLIB_filemode( const char * mode ); + +/* Sanity checking and preparing of read buffer, should be called first thing + by any stdio read-data function. + Returns 0 on success, EOF on error. + On error, EOF / error flags and errno are set appropriately. +*/ +int _PDCLIB_prepread( struct _PDCLIB_file_t * stream ); + +/* Sanity checking, should be called first thing by any stdio write-data + function. + Returns 0 on success, EOF on error. + On error, error flags and errno are set appropriately. +*/ +int _PDCLIB_prepwrite( struct _PDCLIB_file_t * stream ); + +/* -------------------------------------------------------------------------- */ +/* errno */ +/* -------------------------------------------------------------------------- */ + +extern int _PDCLIB_errno; +int * _PDCLIB_errno_func( void ); + +/* ERANGE and EDOM are specified by the standard. */ +#define _PDCLIB_ERANGE 1 +#define _PDCLIB_EDOM 2 +/* Used in the example implementation for any kind of I/O error. */ +#define _PDCLIB_EIO 3 +/* Used in the example implementation for "unknown error". */ +#define _PDCLIB_EUNKNOWN 4 +/* Used in the example implementation for "invalid parameter value". */ +#define _PDCLIB_EINVAL 5 +/* Used in the example implementation for "I/O retries exceeded". */ +#define _PDCLIB_ERETRY 6 +