boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-14 12:42:11 +00:00
Code Issues Projects Releases Wiki Activity

Add 'strip-eol' option to SHELL. Also, return actual exit status.

Browse Source 
Previously, with the 'exit-code' option SHELL would return raw
value from waitXXX, with exit status shifted 8 bits to the left.

Fixes #4470.


[SVN r65232]
This commit is contained in:
Vladimir Prus
2010-09-04 10:10:34 +00:00
parent f3f452d370
commit 4e316485e2
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/engine/src/builtins.c
View File

@@ -26,6 +26,8 @@
#include "timestamp.h"
#include "md5.h"
#include <ctype.h>
# include <sys/types.h>
# include <sys/wait.h>
/*
@@ -2170,6 +2172,14 @@ PyObject * bjam_caller( PyObject * self, PyObject * args )
#endif
static char * rtrim(char *s)
{
char *p = s;
while(*p) ++p;
for(--p; p >= s && isspace(*p); *p-- = 0);
return s;
}
LIST * builtin_shell( PARSE * parse, FRAME * frame )
{
LIST * command = lol_get( frame->args, 0 );
@@ -2181,6 +2191,7 @@ LIST * builtin_shell( PARSE * parse, FRAME * frame )
int exit_status = -1;
int exit_status_opt = 0;
int no_output_opt = 0;
int strip_eol_opt = 0;
/* Process the variable args options. */
{
@@ -2196,6 +2207,10 @@ LIST * builtin_shell( PARSE * parse, FRAME * frame )
{
no_output_opt = 1;
}
else if ( strcmp("strip-eol", arg->string) == 0 )
{
strip_eol_opt = 1;
}
arg = lol_get( frame->args, ++a );
}
}
@@ -2217,6 +2232,8 @@ LIST * builtin_shell( PARSE * parse, FRAME * frame )
buffer[ret] = 0;
if ( !no_output_opt )
{
if ( strip_eol_opt )
rtrim(buffer);
string_append( &s, buffer );
}
}
@@ -2230,6 +2247,10 @@ LIST * builtin_shell( PARSE * parse, FRAME * frame )
/* The command exit result next. */
if ( exit_status_opt )
{
if ( WIFEXITED(exit_status) )
exit_status = WEXITSTATUS(exit_status);
else
exit_status = -1;
sprintf( buffer, "%d", exit_status );
result = list_new( result, newstr( buffer ) );
}