From cfc2ab9cff9f7ef281293efeeb8cdbe1e03ac499 Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Wed, 30 Mar 2011 22:33:08 +0000 Subject: Build was still using the old trimBack function, which no longer exists. I went and added a trimWhitespace function to Bu::String, very nice. --- src/context.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/context.cpp b/src/context.cpp index dc2e6a1..ce1dfee 100644 --- a/src/context.cpp +++ b/src/context.cpp @@ -219,7 +219,9 @@ Bu::String Context::expand( const Bu::String &sInS ) try { //sio << "Executing command: >>>" << sCmd << "<<<" << sio.nl; - Process p( Process::StdOut, "/bin/bash", "/bin/bash", "-c", sCmd.getStr(), NULL ); + Process p( Process::StdOut, + "/bin/bash", "/bin/bash", "-c", sCmd.getStr(), NULL + ); char buf[4096]; do { @@ -227,8 +229,8 @@ Bu::String Context::expand( const Bu::String &sInS ) } while( p.isRunning() ); sBuf.append( buf, p.read( buf, 4096 ) ); - sBuf = sBuf.replace("\n", " ").replace("\r", " "); - sBuf.trimBack(' '); + sBuf = sBuf.replace("\n", " ").replace("\r", " "). + trimWhitespace(); sRet.append( sBuf ); } catch(...) { -- cgit v1.2.3