Changeset e7a8f65 for libcfa/src/iostream.cfa

Timestamp:

Aug 9, 2023, 5:34:21 PM (11 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

74c6748

Parents:

3318dff

Message:

force all input of C strings to specify a maximum length for the string target

File:

• libcfa/src/iostream.cfa (modified) (9 diffs)

libcfa/src/iostream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Aug  7 08:59:29 2023
-// Update Count     : 1407
+// Last Modified On : Wed Aug  9 10:10:56 2023
+// Update Count     : 1432
 //
 
@@ -271 +271 @@
         OSTYPE_VOID_IMPL( const char * )
 
-//      ostype & ?|?( ostype & os, const char16_t * s ) {
+//      ostype & ?|?( ostype & os, const char16_t s[] ) {
 //              if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
 //              fmt( os, "%ls", s );
@@ -278 +278 @@
 
 // #if ! ( __ARM_ARCH_ISA_ARM == 1 && __ARM_32BIT_STATE == 1 ) // char32_t == wchar_t => ambiguous
-//      ostype & ?|?( ostype & os, const char32_t * s ) {
+//      ostype & ?|?( ostype & os, const char32_t s[] ) {
 //              if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
 //              fmt( os, "%ls", s );
@@ -285 +285 @@
 // #endif // ! ( __ARM_ARCH_ISA_ARM == 1 && __ARM_32BIT_STATE == 1 )
 
-//      ostype & ?|?( ostype & os, const wchar_t * s ) {
+//      ostype & ?|?( ostype & os, const wchar_t s[] ) {
 //              if ( sepPrt$( os ) ) fmt( os, "%s", sepGetCur$( os ) );
 //              fmt( os, "%ls", s );
@@ -917 +917 @@
         // } // ?|?
 
-        istype & ?|?( istype & is, char s[] ) {
-                fmt( is, "%s", s );
-                return is;
-        } // ?|?
-        ISTYPE_VOID_IMPL( char * )
+        // istype & ?|?( istype & is, char s[] ) {
+        //      fmt( is, "%s", s );
+        //      return is;
+        // } // ?|?
+        // ISTYPE_VOID_IMPL( char * )
 
         // manipulators
@@ -934 +934 @@
         istype & nl( istype & is ) {
                 fmt( is, "%*[^\n]" );                                                   // ignore characters to newline
+                if ( ! eof( is ) && getANL$( is ) ) fmt( is, "%*c" ); // read newline
                 return is;
         } // nl
@@ -952 +953 @@
 forall( istype & | basic_istream( istype ) ) {
         istype & ?|?( istype & is, _Istream_Cstr f ) {
-                // skip xxx
+                // skip
                 if ( ! f.s ) {
                         // printf( "skip %s %d\n", f.scanset, f.wd );
-                        if ( f.wd == -1 ) fmt( is, f.scanset, "" );             // no input arguments
+                        if ( f.wd == -1 ) fmt( is, f.scanset, "" );     // no input arguments
                         else for ( f.wd ) fmt( is, "%*c" );
                         return is;
                 } // if
+
+                // getline
+                if ( f.flags.delimit ) {
+                        char fmtstr[] = "%[^ ]s";                                       // delimit inserted into space
+                        fmtstr[3] = f.delimit;
+                        fmt( is, fmtstr, f.s );                                         // read upto delimiter
+                        fmt( is, "%*c" );                                                       // ignore delimiter
+                        return is;
+                } // if
+
+                // incl/excl
                 size_t len = 0;
                 if ( f.scanset ) len = strlen( f.scanset );
@@ -977 +989 @@
                 fmtstr[start] = '['; start += 1;
                 if ( f.flags.inex ) { fmtstr[start] = '^'; start += 1; }
-                strcpy( &fmtstr[start], f.scanset );                            // copy includes '\0'
+                strcpy( &fmtstr[start], f.scanset );                    // copy includes '\0'
                 len += start;
                 fmtstr[len] = ']'; fmtstr[len + 1] = '\0';
@@ -987 +999 @@
 
         istype & ?|?( istype & is, _Istream_Char f ) {
-                fmt( is, "%*c" );                                                                       // argument variable unused
+                fmt( is, "%*c" );                                                               // argument variable unused
                 return is;
         } // ?|?