boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-20 02:32:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'vmrob-fix-eol-stripping' into develop

Browse Source
This commit is contained in:
Edward Diener
2017-05-08 23:00:14 -04:00
parent 68d3b9721f f11d57f633
commit c6b219507a
4 changed files with 56 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/engine/builtins.c
View File

@@ -451,7 +451,7 @@ void load_builtins()
char const * args [] = { "path", 0 };
bind_builtin( "MAKEDIR", builtin_makedir, 0, args );
}
{
const char * args [] = { "path", 0 };
bind_builtin( "READLINK", builtin_readlink, 0, args );
@@ -1992,7 +1992,7 @@ LIST *builtin_readlink( FRAME * frame, int flags )
bufsize *= 2;
buf = BJAM_MALLOC( bufsize );
}
if ( buf != static_buf )
BJAM_FREE( buf );
@@ -2480,15 +2480,6 @@ PyObject * bjam_caller( PyObject * self, PyObject * args )
#endif /* defined(_MSC_VER) || defined(__BORLANDC__) */
static char * rtrim( char * const s )
{
char * p = s;
while ( *p ) ++p;
for ( --p; p >= s && isspace( *p ); *p-- = 0 );
return s;
}
LIST * builtin_shell( FRAME * frame, int flags )
{
LIST * command = lol_get( frame->args, 0 );
@@ -2535,8 +2526,6 @@ LIST * builtin_shell( FRAME * frame, int flags )
buffer[ ret ] = 0;
if ( !no_output_opt )
{
if ( strip_eol_opt )
rtrim( buffer );
string_append( &s, buffer );
}
@@ -2544,6 +2533,9 @@ LIST * builtin_shell( FRAME * frame, int flags )
if ( feof( p ) ) break;
}
if ( strip_eol_opt )
string_rtrim( &s );
exit_status = pclose( p );
/* The command output is returned first. */

26
src/engine/strings.c
View File

@@ -189,6 +189,12 @@ char string_back( string * self )
return self->value[ self->size - 1 ];
}
void string_rtrim( string * self )
{
assert_invariants( self );
char * p = self->value + self->size - 1;
for ( p; p >= self->value && ( *p == '\0' || isspace( *p ) ); *p-- = 0 );
}
#ifndef NDEBUG
void string_unit_test()
@@ -219,5 +225,25 @@ void string_unit_test()
assert( copy->size == strlen( original ) );
string_free( copy );
}
{
char * const foo = "Foo ";
string foo_copy[ 1 ];
string_copy( foo_copy, foo );
string_rtrim( foo_copy );
assert( !strcmp( foo_copy->value, "Foo" ) );
string_rtrim( foo_copy );
assert( !strcmp( foo_copy->value, "Foo" ) );
char * const bar = "Bar\0\0\0";
string bar_copy[ 1 ];
string_copy( bar_copy, bar );
string_rtrim( bar_copy );
assert( !strcmp( bar_copy->value, "Bar" ) );
string_rtrim( bar_copy );
assert( !strcmp( bar_copy->value, "Bar" ) );
}
}
#endif

1
src/engine/strings.h
View File

@@ -31,6 +31,7 @@ void string_reserve( string *, size_t );
void string_truncate( string *, size_t );
void string_pop_back( string * );
char string_back( string * );
void string_rtrim( string * );
void string_unit_test();
#endif

26
test/core-language/test.jam
View File

@@ -1239,7 +1239,7 @@ for y in $(values)
}
check-order break-for-exec : r1-v1 ;
check-equal break-for-cleanup : $(z) : original ;
check-equal break-for-cleanup : $(z) : original ;
for local y in $(values)
{
@@ -1250,7 +1250,7 @@ for local y in $(values)
}
check-order break-for-local-exec : r1-v1 ;
check-equal break-for-local-cleanup : $(z) : original ;
check-equal break-for-local-cleanup : $(z) : original ;
local z1 = z1val ;
local z2 = z2val ;
@@ -1505,11 +1505,33 @@ check-equal shell : "value\n" : [ SHELL $(c) ] ;
check-equal shell : "" : [ SHELL $(c) : no-output ] ;
check-equal shell : "value\n" 0 : [ SHELL $(c) : exit-status ] ;
check-equal shell : "" 0 : [ SHELL $(c) : no-output : exit-status ] ;
check-equal shell : "" 0 : [ SHELL $(c) : no-output : exit-status : strip-eol ] ;
check-equal command : "value\n" : [ COMMAND $(c) ] ;
check-equal command : "" : [ COMMAND $(c) : no-output ] ;
check-equal command : "value\n" 0 : [ COMMAND $(c) : exit-status ] ;
check-equal command : "" 0 : [ COMMAND $(c) : no-output : exit-status ] ;
# buffered output
local expected = "When the shell output buffer splits on whitespace, the whitespace shouldn't be trimmed. end." ;
local buffered = "echo \"$(expected)\"" ;
if $(OS) = VMS { buffered = "PIPE WRITE SYS$OUTPUT \"$(expected)\"" ; }
if $(OS) = NT { buffered = "echo $(expected)" ; }
check-equal shell : "$(expected)\n" : [ SHELL $(buffered) ] ;
check-equal shell : "" : [ SHELL $(buffered) : no-output ] ;
check-equal shell : "$(expected)\n" 0 : [ SHELL $(buffered) : exit-status ] ;
check-equal shell : "$(expected)" 0 : [ SHELL $(buffered) : strip-eol : exit-status ] ;
check-equal shell : "" 0 : [ SHELL $(buffered) : no-output : exit-status ] ;
check-equal shell : "" 0 : [ SHELL $(buffered) : no-output : exit-status : strip-eol ] ;
check-equal shell : "$(expected)" 0 : [ SHELL $(buffered) : strip-eol : exit-status ] ;
check-equal command : "$(expected)\n" : [ COMMAND $(buffered) ] ;
check-equal command : "" : [ COMMAND $(buffered) : no-output ] ;
check-equal command : "$(expected)\n" 0 : [ COMMAND $(buffered) : exit-status ] ;
check-equal command : "$(expected)" 0 : [ COMMAND $(buffered) : strip-eol : exit-status ] ;
check-equal command : "" 0 : [ COMMAND $(buffered) : no-output : exit-status ] ;
}
# Test SUBST