Improved testdrivers.

[pdclib] / internals / _PDCLIB_int.h

diff --git a/internals/_PDCLIB_int.h b/internals/_PDCLIB_int.h
index a0a63704f889bc033c2b8aee4b2d8ce672f1ac0c..0ce2c99fc383ab9c700ceb42482203a3cc0da7fe 100644 (file)
--- a/internals/_PDCLIB_int.h
+++ b/internals/_PDCLIB_int.h
@@ -254,23 +254,29 @@ typedef unsigned _PDCLIB_intmax _PDCLIB_uintmax_t;
 /* Various <stdio.h> internals                                                */
 /* -------------------------------------------------------------------------- */
 
-/* Flags for representing mode (see fopen()). */
-#define _PDCLIB_FREAD    1u
-#define _PDCLIB_FWRITE   2u
-#define _PDCLIB_FAPPEND  4u 
-#define _PDCLIB_FRW      8u
-#define _PDCLIB_FBIN    16u
+/* 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_WROTELAST 32u
-#define _PDCLIB_LIBBUFFER 64u
+#define _PDCLIB_WROTELAST  256u
+#define _PDCLIB_LIBBUFFER  512u
+#define _PDCLIB_VIRGINSTR 1024u
+#define _PDCLIB_ERRORFLAG 2048u
+#define _PDCLIB_EOFFLAG   4096u
 
 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 */
+    _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 */
@@ -338,3 +344,6 @@ extern char _PDCLIB_Xdigits[];
    Returns a pointer to the first character not parsed as conversion specifier.
 */
 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 );