resolve merge

[lilypond.git] / flower / std-string.cc

diff --git a/flower/std-string.cc b/flower/std-string.cc
index 285c51883c5d1fc0a7727816a3e99ab0e5da2e03..18ee4a832e4cad28bbfb0f562aec4a6bc165a667 100644 (file)
--- a/flower/std-string.cc
+++ b/flower/std-string.cc
@@ -1,9 +1,20 @@
 /*
-  std-string.cc -- implement external interface for Std_String
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2006--2011  Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 2006--2009  Jan Nieuwenhuizen <janneke@gnu.org>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "std-string.hh"
@@ -80,7 +91,8 @@ string &
 replace_all (string *str, string const &find, string const &replace)
 {
   ssize len = find.length ();
-  for (ssize i = str->find (find); i != NPOS; i = str->find (find, i + len))
+  ssize replen = replace.length ();
+  for (ssize i = str->find (find); i != NPOS; i = str->find (find, i + replen))
     *str = str->replace (i, len, replace);
   return *str;
 }