#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
#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
/* Various <stdio.h> internals */
/* -------------------------------------------------------------------------- */
-/* Flags for representing mode (see fopen()). */
-#define _PDCLIB_FREAD 1
-#define _PDCLIB_FWRITE 2
-#define _PDCLIB_FAPPEND 4
-#define _PDCLIB_FRW 8
-#define _PDCLIB_FBIN 16
+/* Flags for representing mode (see fopen()). Note these must fit the same
+ status field as the _IO?BF flags in <stdio.h> and the internal flags below.
+*/
+#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_LIBBUFFER 512u
+#define _PDCLIB_VIRGINSTR 1024u
+#define _PDCLIB_ERRORFLAG 2048u
+#define _PDCLIB_EOFFLAG 4096u
+#define _PDCLIB_WIDESTREAM 8192u
+#define _PDCLIB_BYTESTREAM 16384u
struct _PDCLIB_file_t
{
_PDCLIB_fd_t handle; /* OS-specific file descriptor */
_PDCLIB_fpos_t position; /* file position indicator */
- void * buffer; /* file buffer */
+ char * buffer; /* file buffer */
_PDCLIB_size_t bufsize; /* size of buffer */
- int status; /* misc. status bits */
- /*mbstate_t mbstate; multibyte parse state - TODO: Unmask. */
+ _PDCLIB_size_t bufidx; /* index to point of action in buffer */
+ _PDCLIB_size_t bufend; /* index to end of pre-read buffer */
+ unsigned int status; /* misc. status bits */
+ char * filename; /* name used in fopen() / freopen() */
struct _PDCLIB_file_t * next; /* provisions for linked list handling */
};
_PDCLIB_va_list arg; /* argument stack passed to the printf function */
};
-#if 0
-
-/* fpos_t, an object type (not an array!) capable of storing any position
- information of a file.
-*/
-typedef unsigned long long int _PDCLIB_fpos_t;
-
-/* file descriptor - a type used by the OS to identify a stream */
-typedef int _PDCLIB_fd_t;
-
-#endif
-
/* -------------------------------------------------------------------------- */
/* Declaration of helper functions (implemented in functions/_PDCLIB). */
/* -------------------------------------------------------------------------- */
/* 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 array used by various integer conversion functions in <stdlib.h> */
+/* Digits arrays used by various integer conversion functions */
extern char _PDCLIB_digits[];
-
-/* The worker for all printf() type of functions. */
+extern char _PDCLIB_Xdigits[];
+
+/* The worker for all printf() type of functions. The pointer spec should point
+ to the introducing '%' of a conversion specifier. The status structure is to
+ be that of the current printf() function, of which the members n, s, stream
+ and arg will be preserved, i will be updated, and all others will be trashed
+ by the function.
+ Returns a pointer to the first character not parsed as conversion specifier.
+*/
const char * _PDCLIB_print( const char * spec, struct _PDCLIB_status_t * status );
+
+/* Common denominator of puts() and fputs() */
+int _PDCLIB_puts( const char * s, const char * endl, struct _PDCLIB_file_t * stream );
+
+/* Parsing any fopen() style filemode string into a number of flags. */
+unsigned int _PDCLIB_filemode( const char * mode );
+
+/* Writing out unwritten buffers of a specific stream. A NULL parameter (as is
+ possible with standard fflush()) is not supported.
+ Return 0 if successful, EOF if error occured. Set error flag of stream and
+ errno as appropriate in case of error.
+*/
+_PDCLIB_size_t _PDCLIB_flushbuffer( struct _PDCLIB_file_t * stream, _PDCLIB_size_t written, int retries );
+