Changeset 1526 in MondoRescue for branches/2.2.4/mindi/mindi

Timestamp:

Jul 6, 2007, 12:55:59 PM (17 years ago)

Author:

Bruno Cornec

Message:

• Fix a problem in directory link handling in mindi (seen on gentoo 64) with the precious help of Francesco Talamona ti.liame_at_email.it
• Gentoo ebuild are now unmasked on my side

File:

• branches/2.2.4/mindi/mindi (modified) (6 diffs)

branches/2.2.4/mindi/mindi

@@ -297 +297 @@
 
 CopyDependenciesToDirectory() {
-    local outdir incoming fname filesize counter
+    local outdir incoming fname filesize counter d found
     outdir=$1
     mkdir -p $outdir
@@ -303 +303 @@
     counter=0
     while [ "$incoming" != "" ] ; do
-        if [ -d "$incoming" ] ; then
+        # Non absolute file names should not arrive till here => skipped
+        if [ `echo "$incoming" | cut -c1` != '/' ]; then
+            LogIt "Unable to handle $incoming"
+            incoming=`ReadLine`
+            continue
+        fi
+        # no parent directory of incoming should be a link, copy is not possible in that case
+        d=`dirname "$incoming"`
+        found="false"
+        while [ $d != "/" -a $found = "false" ]; do
+            [ -h "$d" ] && found="true"
+            d=`dirname "$d"`
+        done
+        if [ -d "$incoming" ] && [ ! -h "$incoming" ]; then
             find $incoming/* -maxdepth 0 2> /dev/null | CopyDependenciesToDirectory $outdir
-        elif [ -e "$incoming" ] ; then
+        elif [ -e "$incoming" ] && [ $found = "false" ]; then
             filesize=`du -sk $incoming | cut -f1`
             if [ "$filesize" -gt "$(($CHOPSIZE*2))" ] && [ ! -h "$incoming" ] ; then
@@ -992 +1005 @@
             echo "$fname is softlink" >> $LOGFILE
         else
-            ldd $fname 2> /dev/null | ProcessLDD $fname
+            ldd $fname 2> /dev/null | ProcessLDD
         fi
     done
@@ -1023 +1036 @@
     local i path fname_to_find location output resolved tmp stub cache_id loclist
     fname_to_find="$1"
+    # It's an absolute path
     if echo "$fname_to_find" | grep -x "/.*" ; then
         output="$fname_to_find"
@@ -1031 +1045 @@
         return 0
     fi
+    # It's not an absolute path
     output=""
-    #for path in /etc /usr /usr/bin /usr/sbin /bin /usr/X11R6/bin /sbin /usr/local/bin /usr/local/sbin /usr/lib /usr/lib64 /lib /lib64 /usr/local/lib /usr/local/lib64 /usr/X11R6/lib /usr/X11R6/lib64 `find /usr/lib64 /lib64 /usr/local/lib64 /usr/X11R6/lib64 -type d` ; do
-    for path in /etc /usr /usr/bin /usr/sbin /bin /usr/X11R6/bin /sbin /usr/local/bin /usr/local/sbin /usr/lib /usr/lib64 /usr/lib64/* /lib /lib64 /lib64/* /usr/local/lib /usr/local/lib64 /usr/local/lib64/* /usr/X11R6/lib /usr/X11R6/lib64 /usr/X11R6/lib64/* ; do
-        [ ! -d "$path" ] && continue
-        for location in "$path/$fname_to_find" ; do
-            [ ! -e "$location" ] && continue
-            output="$location $output"
-            if [ -h "$location" ] ; then
-                output="`ReadAllLink $location` $output"
-            fi
-        done
+    for path in /etc /usr /usr/bin /usr/sbin /bin /usr/X11R6/bin /sbin /usr/local/bin /usr/local/sbin `find /usr/lib /lib /usr/local/lib /usr/X11R6/lib /usr/lib64 /lib64 /usr/local/lib64 /usr/X11R6/lib64 -type d -maxdepth 1 2> /dev/null` ; do
+    #for path in /etc /usr /usr/bin /usr/sbin /bin /usr/X11R6/bin /sbin /usr/local/bin /usr/local/sbin /usr/lib /usr/lib64 /usr/lib64/* /lib /lib64 /lib64/* /usr/local/lib /usr/local/lib64 /usr/local/lib64/* /usr/X11R6/lib /usr/X11R6/lib64 /usr/X11R6/lib64/* ; do
+        [ -h "$path" ] && continue
+        [ ! -e "$path/$fname_to_find" ] && continue
+        output="$path/$fname_to_find $output"
+        if [ -h "$path/$fname_to_find" ] ; then
+            output="`ReadAllLink $path/$fname_to_find` $output"
+        fi
     done
     if [ "$output" = "" ] ; then
@@ -2218 +2231 @@
 
 ProcessLDD() {
-    local main_fname incoming j i fname f newf
-    main_fname=$1
+    local incoming f
     read incoming
     while [ "$incoming" != "" ] ; do
         # We take the full path name of the dyn. lib. we want
-        incoming=`echo "$incoming" | sed '/[[:blank:]]*.*[[:blank:]]*=>[[:blank:]]*(.*/d ; s/[[:blank:]]*.*[[:blank:]]*=>[[:blank:]]*\(\/.*\)/\1/ ; s/[[:blank:]]*\(\/.*\)[[:blank:]]*(.*/\1/'`
-        for f in `echo "$incoming"` ; do
+        incoming=`echo "$incoming" | awk '{if (match($1,/\//)) {print $1} else {if (match($3,/\//)) print $3} fi}'`
+        for f in $incoming ; do
             echo "$f `ReadAllLink $f`"
         done