Ticket #4470: shell.patch

builtins.c

@@ -25 +25 @@
 # include "variable.h"
 # include "timestamp.h"
 # include <ctype.h>
+# include <sys/types.h>
+# include <sys/wait.h>
 
 /*
  * builtins.c - builtin jam rules
@@ -1724 +1726 @@
     #define pclose _pclose
 #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 );
@@ -1735 +1745 @@
     int exit_status = -1;
     int exit_status_opt = 0;
     int no_output_opt = 0;
+    int strip_eol_opt = 0;
     
     /* Process the variable args options. */
     {
@@ -1750 +1761 @@
             {
                 no_output_opt = 1;
             }
+            else if ( strcmp("strip-eol", arg->string) == 0 )
+            {
+                strip_eol_opt = 1;
+            }
             arg = lol_get( frame->args, ++a );
         }
     }
@@ -1767 +1782 @@
         buffer[ret] = 0;
         if ( ! no_output_opt )
         {
+            if ( strip_eol_opt )
+                rtrim(buffer);
             string_append( &s, buffer );
         }
     }
@@ -1780 +1797 @@
     /* 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 ) );
     }