X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=internals%2F_PDCLIB_int.h;h=f6fedd16405b0090d351a81d5dab7da123d10a02;hb=29510491be6e3e0b95872920c371024ed444c1e5;hp=9019f72b4993b6d83db7f0f14a062148c8bca559;hpb=5bcc00c1b85feff1996e3f34a1a9ebf3b624161e;p=pdclib

diff --git a/internals/_PDCLIB_int.h b/internals/_PDCLIB_int.h
index 9019f72..f6fedd1 100644
--- a/internals/_PDCLIB_int.h
+++ b/internals/_PDCLIB_int.h
@@ -258,11 +258,12 @@ typedef unsigned _PDCLIB_intmax _PDCLIB_uintmax_t;
 #define _PDCLIB_FBIN    128u
 
 /* Internal flags, made to fit the same status field as the flags above. */
-#define _PDCLIB_LIBBUFFER    512u
+#define _PDCLIB_FREEBUFFER   512u
 #define _PDCLIB_ERRORFLAG   1024u
 #define _PDCLIB_EOFFLAG     2048u
 #define _PDCLIB_WIDESTREAM  4096u
 #define _PDCLIB_BYTESTREAM  8192u
+#define _PDCLIB_DELONCLOSE 16384u
 
 /* Position / status structure for getpos() / fsetpos(). */
 struct _PDCLIB_fpos_t
@@ -315,18 +316,18 @@ struct _PDCLIB_memnode_t
 /* Status structure required by _PDCLIB_print(). */
 struct _PDCLIB_status_t
 {
-    int              base;  /* base to which the value shall be converted    */
+    int              base;   /* base to which the value shall be converted   */
     _PDCLIB_int_fast32_t flags; /* flags and length modifiers                */
-    _PDCLIB_size_t   n;     /* print: maximum characters to be written       */
-                            /* scan:  number matched conversion specifiers   */
-    _PDCLIB_size_t   i;     /* number of characters already written          */
-    _PDCLIB_size_t   this;  /* output chars in the current conversion        */
-    char *           s;     /* print: target buffer                          */
-                            /* scan:  source string                          */
-    _PDCLIB_size_t   width; /* width of current field                        */
-    _PDCLIB_size_t   prec;  /* precision of current field                    */
-    struct _PDCLIB_file_t * stream;/* for to-stream output                   */
-    _PDCLIB_va_list  arg;   /* argument stack passed to the printf function  */
+    _PDCLIB_size_t   n;      /* print: maximum characters to be written      */
+                             /* scan:  number matched conversion specifiers  */
+    _PDCLIB_size_t   i;      /* number of characters read/written            */
+    _PDCLIB_size_t   current;/* chars read/written in the CURRENT conversion */
+    char *           s;      /* *sprintf(): target buffer                    */
+                             /* *sscanf():  source string                    */
+    _PDCLIB_size_t   width;  /* specified field width                        */
+    _PDCLIB_size_t   prec;   /* specified field precision                    */
+    struct _PDCLIB_file_t * stream; /* *fprintf() / *fscanf() stream         */
+    _PDCLIB_va_list  arg;    /* argument stack                               */
 };
 
 /* -------------------------------------------------------------------------- */
@@ -356,9 +357,11 @@ const char * _PDCLIB_print( const char * spec, struct _PDCLIB_status_t * status
 /* The worker for all scanf() 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 scanf() function, of which the member stream will be
-   preserved, n, i, and s will be updated; and all others will be trashed by the
-   function.
-   Returns a pointer to the first character not parsed as conversion specifier.
+   preserved; n, i, and s will be updated; and all others will be trashed by
+   the function.
+   Returns a pointer to the first character not parsed as conversion specifier,
+   or NULL in case of error.
+   FIXME: Should distinguish between matching and input error
 */
 const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status );
 
@@ -379,6 +382,9 @@ int _PDCLIB_prepread( struct _PDCLIB_file_t * stream );
 */
 int _PDCLIB_prepwrite( struct _PDCLIB_file_t * stream );
 
+/* Closing all streams on program exit */
+void _PDCLIB_closeall( void );
+
 /* -------------------------------------------------------------------------- */
 /* errno                                                                      */
 /* -------------------------------------------------------------------------- */
@@ -397,4 +403,8 @@ int * _PDCLIB_errno_func( void );
 #define _PDCLIB_EINVAL 5
 /* Used in the example implementation for "I/O retries exceeded". */
 #define _PDCLIB_ERETRY 6
+/* One larger than the largest used errno */
+#define _PDCLIB_EMAX 7
 
+/* TODO: Doing this via a static array is not the way to do it. */
+char const * _PDCLIB_errno_texts[ _PDCLIB_EMAX ];