Changeset 860 in MondoRescue for branches

Timestamp:

Sep 30, 2006, 12:53:33 AM (18 years ago)

Author:

Bruno Cornec

Message:

Create function ReadAllLink in mindi used by LocateFile now to try to optimize it. Hope mindi will now get all libraries correctly

Location:

branches/stable/mindi

Files:

• deplist.txt (modified) (1 diff)
• mindi (modified) (8 diffs)

branches/stable/mindi/deplist.txt

@@ -9 +9 @@
 # 4. If you want to add something, just add it on its own line. K.I.S.S.
 # 5. You must _not_ put a semicolon & comment after an entry. e.g. 'foo; #bar'.
-# 6. All these worlds are yours except Europa. Attempt no landing there.
 
 #------------------------- STUFF ADDED BY THE USER ----------------------------

branches/stable/mindi/mindi

@@ -1103 +1103 @@
         elif [ -h "$fname" ] && [ -x "$fname" ] ; then
             echo "$fname is softlink" >> $LOGFILE
-#            echo "$fname will not be LDD'd. It is a softlink to `WhatSoftlinkPointsTo $fname`, which should already be in queue to be analyzed." >> $LOGFILE
-#            echo "$fname"
         else
             ldd $fname 2> /dev/null | ProcessLDD $fname
@@ -1111 +1109 @@
 }
 
+# Give all symlinks recursively of a full path name
+ReadAllLink() {
+    file="$1"
+
+    if [ ! -h $file ]; then
+        echo "$file"
+        return 0
+    fi
+
+    link=`readlink $file`
+    if [ "`dirname $link | cut -c1`" = "/" ]; then
+        echo "$link `ReadAllLink $link`"
+    else
+            echo "$link `dirname $file`/`ReadAllLink $link`"
+    fi  
+}
 
 
@@ -1116 +1130 @@
     local i path fname_to_find location output resolved tmp stub cache_id loclist
     fname_to_find="$1"
-    if [ "$FILE_CACHE" ] ; then
-        touch $FILE_CACHE
-        output=""; cache_id=`echo $fname_to_find | md5sum`
-        output=`sed -n -e "s/^$cache_id //p" $FILE_CACHE`
-        if [ ! "$output" = "" ] ; then
-            echo "$output"
-            return 0
-        fi
-    fi
     if echo "$fname_to_find" | grep -x "/.*" ; then
         output="$fname_to_find"
-        location="$fname_to_find"
-        while [ -h "$location" ] ; do
-            resolved=`WhatSoftlinkPointsTo $location`
-            location=$resolved
-            output="$location $output"
-        done
+        if [ -h "$output" ] ; then
+            output="`ReadAllLink $output` $output"
+        fi
         echo "$output"
         return 0
@@ -1139 +1141 @@
     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
-        location=`echo "$path/$fname_to_find" | tr -s '/' '/'`
-        if echo "$location" | grep "lib/lib" 2> /dev/null ; then
-            loclist=`find $path -maxdepth 1 | grep -F "$fname_to_find"`
-        else
-            loclist=$location
-        fi
-        for location in $loclist ; do
+        for location in "$path/$fname_to_find" ; do
             [ ! -e "$location" ] && continue
             output="$location $output"
-            copies_found=$(($copies_found+1))
-            while [ -h "$location" ] ; do
-                resolved=`WhatSoftlinkPointsTo $location`
-                location=$resolved
-                output="$location $output"
-            done
-#       resolved=`file $location | $AWK '{print $NF;}'`
-#       if [ "`echo "$resolved" | grep -F "/"`" = "" ] ; then
-#           stub=`dirname $location`
-#           output="/$stub/$resolved $output"
-#       fi
-#       fi
+            if [ -h "$location" ] ; then
+                output="`ReadAllLink $location` $location $output"
+            fi
         done
     done
     if [ "$output" = "" ] ; then
-#   echo "$fname_to_find not found" >> /dev/stderr
-    return 1
+        return 1
     fi
     echo "$output"
-    [ "$FILE_CACHE" ] && echo -ne "$cache_id $output\n" >> $FILE_CACHE
     return 0
 }
@@ -2347 +2332 @@
         incoming=`echo "$incoming" | sed '/[[:blank:]]*.*[[:blank:]]*=>[[:blank:]]*(.*/d ; s/[[:blank:]]*.*[[:blank:]]*=>[[:blank:]]*\(\/.*\)/\1/ ; s/[[:blank:]]*\(\/.*\)[[:blank:]]*(.*/\1/'`
         for f in `echo "$incoming"` ; do
+            echo "$f"
             if [ -h "$f" ]; then 
                 g=`readlink $f`
                 if [ -e "$g" ]; then
-                    echo "$f $g"
+                    echo "$g"
                 else
-                    echo "Problem with ldd on $f"
-                    echo "$f"
+                    if [ "`echo $g | cut -c1`" != "/" ] ; then
+                        # that link is in the same dir
+                        g="`dirname $f`/$g"
+                        if -e "$g" ]; then
+                            echo "$g"
+                        else
+                            echo "Problem with ldd on $f" >> $LOGFILE
+                        fi
+                    else
+                        echo "Problem with ldd on $f" >> $LOGFILE
+                    fi
                 fi
             else
-                if [ -e "$f" ]; then
-                    echo "$f"
-                else
-                    echo "Problem with ldd on $f"
+                if [ ! -e "$f" ]; then
+                    echo "Problem with ldd on $f" >> $LOGFILE
                 fi
             fi
@@ -2426 +2419 @@
     cd $old_pwd
 }
-
-
-
-EliminateRelatives() {
-# eliminate /../../..... from path string
-    local orig i old_i newo
-    newo=$1
-    while [ "`echo "$newo" | grep "\.\."`" ] ; do
-        orig="`echo "$newo" | tr -s '/' '/'`"
-#        echo "orig=$orig"
-        newo="/"
-        old_i=""
-        for i in `echo "$orig" | tr '/' ' '` ; do
-            if [ ! "$old_i" ] ; then
-                old_i=$i
-                continue
-            fi
-            if [ "$old_i" ] && [ "$i" = ".." ] ; then
-                if [ "$old_i" = ".." ] ; then
-                    newo="$newo"$old_i/
-#                    echo "two --- $old_i $i"
-                    old_i="$i"
-                    continue
-#                else
-#                    echo "swallowing ($old_i $i)"
-                fi
-            elif [ "$old_i" != ".." ] ; then
-                newo="$newo"$old_i/
-            fi
-            old_i=$i
-        done
-        newo="$newo"$i
-    done
-    echo "$newo"
-}
-
-
-WhatSoftlinkPointsTo() {
-    local orig new resolved
-        orig=$1
-        new=`ls -l $orig | tr -s ' ' '\t' | $AWK '{printf $NF;}'`
-        if [ "`echo "$new" | cut -d'/' -f1`" ] ; then
-            resolved=`dirname $orig`/$new
-        else
-            resolved=$new
-        fi
-    EliminateRelatives $resolved
-}
-
-
-
 
 
@@ -2510 +2452 @@
     resolved=$1
     while [ -h "$resolved" ] ; do
-        resolved=`WhatSoftlinkPointsTo $resolved`
+        resolved=`readlink -f $resolved`
     done
     echo "$resolved"
@@ -3245 +3187 @@
 done
 
-FILE_CACHE=$TMP_ROOT/mindi-file-loc-cache
 KERN_DISK_MADE=""