[PATCH] str_replace() fix

[PATCH] str_replace() fix

[Michal Soltys]

Whitespace removal in:

	out="${out}${chop# }$r"

will damage certain strings, for example the following call:

	str_replace ' aax aaxaa' x y

would return 'aayaayaa' instead of ' aay aayaa'.

Signed-off-by: Michal Soltys <soltys-R61QfzASbfY@public.gmane.org>
---
 modules.d/99base/dracut-lib.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index 50b1ed2..62c3bf5 100755
--- a/modules.d/99base/dracut-lib.sh
+++ b/modules.d/99base/dracut-lib.sh
@@ -24,7 +24,7 @@ str_replace() {
 
     while strstr "${in}" "$s"; do
         chop="${in%%$s*}"
-        out="${out}${chop# }$r"
+        out="${out}${chop}$r"
         in="${in#*$s}"
     done
     echo "${out}${in}"
-- 
1.7.5.3

Re: [PATCH] str_replace() fix

[Harald Hoyer]

On 15.09.2011 08:45, Michal Soltys wrote:
> Whitespace removal in:
> 
> 	out="${out}${chop# }$r"
> 
> will damage certain strings, for example the following call:
> 
> 	str_replace ' aax aaxaa' x y
> 
> would return 'aayaayaa' instead of ' aay aayaa'.
> 
> Signed-off-by: Michal Soltys <soltys-R61QfzASbfY@public.gmane.org>
> ---
>  modules.d/99base/dracut-lib.sh |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
> index 50b1ed2..62c3bf5 100755
> --- a/modules.d/99base/dracut-lib.sh
> +++ b/modules.d/99base/dracut-lib.sh
> @@ -24,7 +24,7 @@ str_replace() {
>  
>      while strstr "${in}" "$s"; do
>          chop="${in%%$s*}"
> -        out="${out}${chop# }$r"
> +        out="${out}${chop}$r"
>          in="${in#*$s}"
>      done
>      echo "${out}${in}"

pushed to temporary git: http://git.surfsite.org/dracut.git