Fix prepstrip split-debug paths for bug #133628. Thanks to kevquinn for this patch.

svn path=/main/trunk/; revision=3373

diff --git a/bin/prepstrip b/bin/prepstrip
index 0a296b3481f573255729166f79d89a7f6354a4d0..bfee455242bf7c572049ffdf1f52691c0f10015a 100755 (executable)
--- a/bin/prepstrip
+++ b/bin/prepstrip
@@ -22,7 +22,7 @@ banner=1
 
 save_elf_debug() {
        local x=$1
-       local y="${D}usr/lib/debug/${x:${#D}+1}.debug"
+       local y="${D}usr/lib/debug/${x:${#D}}.debug"
 
        hasq splitdebug ${FEATURES} || return 0
 
@@ -45,7 +45,7 @@ save_elf_debug() {
        fi
 }
 
-for x in $(scanelf -yRBF%F "$@") $(for y in "$@"; do find "${y}" -type f -name '*.a' -print0 ; done); do
+for x in $(scanelf -yRBF%F "$@") $(for y in "$@"; do find "${y}" -type f -name '*.a' -print ; done); do
        if [[ ${banner} -eq 1 ]] ; then
                vecho "strip: ${STRIP} ${PORTAGE_STRIP_FLAGS}"
                banner=0
@@ -65,11 +65,11 @@ for x in $(scanelf -yRBF%F "$@") $(for y in "$@"; do find "${y}" -type f -name '
        set +o noglob
 
        if [[ ${f} == *"current ar archive"* ]] ; then
-               vecho "   ${x:${#D}+1}"
+               vecho "   ${x:${#D}}"
                [[ ${stripitbaby} -eq 1 ]] && ${STRIP} -g "${x}"
        fi
        if [[ ${f} == *"SB executable"* || ${f} == *"SB shared object"* ]] ; then
-               vecho "   ${x:${#D}+1}"
+               vecho "   ${x:${#D}}"
                save_elf_debug "${x}"
                [[ ${stripitbaby} -eq 1 ]] && ${STRIP} ${PORTAGE_STRIP_FLAGS} "${x}"
        fi