[gentoo-commits] proj/libbash:master commit in: scripts/, src/builtins/

[Petteri Räty]

commit:     f2cf06bb14022d693a21b6f2763314770b912034
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 14:11:47 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Thu May 26 08:20:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=f2cf06bb

Builtin: fix a bug in echo built-in

The echo built-in should print an empty line if no argument is
provided. Now this is supported.

---
 scripts/function_def.bash.result |    1 +
 src/builtins/echo_builtin.cpp    |    6 ++++++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/scripts/function_def.bash.result b/scripts/function_def.bash.result
index 41e19ca..cebbfae 100644
--- a/scripts/function_def.bash.result
+++ b/scripts/function_def.bash.result
@@ -1,4 +1,5 @@
 hi 1 1
+
 overloaded let
 1 2 3
 1 2 3

diff --git a/src/builtins/echo_builtin.cpp b/src/builtins/echo_builtin.cpp
index 28b4d65..0e21707 100644
--- a/src/builtins/echo_builtin.cpp
+++ b/src/builtins/echo_builtin.cpp
@@ -42,6 +42,12 @@ int echo_builtin::exec(const std::vector<std::string>& bash_args)
   bool enable_escapes = false;
   bool options_parsed = false;
 
+  if(bash_args.empty())
+  {
+    this->out_buffer() << std::endl;
+    return 0;
+  }
+
   for(auto i = bash_args.begin(); i != bash_args.end(); i++)
   {
     const std::string& str = *i;