Attachment #247472 for bug #318661




#endif	
   string->string_t.length = len;

   dst = BSTRING_TO_STRING( BSTRING( string ) );
   for( ; len > 0; len-- )
      *dst++ = *c_string++;
  

      string->string_t.length = len;

      memset( &(string->string_t.char0), c, len );
      STRING_SET( BSTRING( string ), len, '\0' );
		
      return BSTRING( string );
   }

#endif	
   string->string_t.length = len;

   STRING_SET( BSTRING( string ), len, '\0' );
		
   return BSTRING( string );
}

   memcpy( &(dst_string->string_t.char0),
	   &STRING_REF( src_string, min ),
            len );
   STRING_SET( BSTRING( dst_string ), len, '\0' );

   return BSTRING( dst_string );
}

Lines 273-279 typedef union scmobj { Link Here

(-)a/runtime/Include/bigloo.h (-1 / +1 lines)
273	header_t header; /* longueur, la chaine C suit. */	273	header_t header; /* longueur, la chaine C suit. */
274	#endif	274	#endif
275	int length;	275	int length;
276	unsigned char char0;	276	unsigned char char0[ 1 ];
277	} string_t;	277	} string_t;
278		278
279	struct ucs2_string { /* Ucs2 strings: */	279	struct ucs2_string { /* Ucs2 strings: */

Return to bug 318661

Lines 31-37 string_to_bstring_len( char *c_string, i Link Here

(-)a/runtime/Clib/cstring.c (-4 / +4 lines)
31	#endif	31	#endif
32	string->string_t.length = len;	32	string->string_t.length = len;
33		33
34	dst = (char *)&(string->string_t.char0);	34	dst = BSTRING_TO_STRING( BSTRING( string ) );
35	for( ; len > 0; len-- )	35	for( ; len > 0; len-- )
36	dst++ = c_string++;	36	dst++ = c_string++;
37		37
Lines 83-89 make_string( int len, unsigned char c ) Link Here
83	string->string_t.length = len;	83	string->string_t.length = len;
84		84
85	memset( &(string->string_t.char0), c, len );	85	memset( &(string->string_t.char0), c, len );
86	(&(string->string_t.char0))[ len ] = '\0';	86	STRING_SET( BSTRING( string ), len, '\0' );
87		87
88	return BSTRING( string );	88	return BSTRING( string );
89	}	89	}
Lines 105-111 make_string_sans_fill( int len ) { Link Here
105	#endif	105	#endif
106	string->string_t.length = len;	106	string->string_t.length = len;
107		107
108	(&(string->string_t.char0))[ len ] = '\0';	108	STRING_SET( BSTRING( string ), len, '\0' );
109		109
110	return BSTRING( string );	110	return BSTRING( string );
111	}	111	}
Lines 183-189 c_substring( obj_t src_string, int min, Link Here
183	memcpy( &(dst_string->string_t.char0),	183	memcpy( &(dst_string->string_t.char0),
184	&STRING_REF( src_string, min ),	184	&STRING_REF( src_string, min ),
185	len );	185	len );
186	(&(dst_string->string_t.char0))[ len ] = '\0';	186	STRING_SET( BSTRING( dst_string ), len, '\0' );
187		187
188	return BSTRING( dst_string );	188	return BSTRING( dst_string );
189	}	189	}