Changeset 100 in MondoRescue

Timestamp:

Nov 5, 2005, 12:54:17 AM (18 years ago)

Author:

bcornec

Message:

svn merge -r77:78 of trunk (andree) :
The output of ldd coming with libc6 2.3.4 and higher has changed and
breaks mindi's library inclusion code.

The change makes it so that the code in ProcessLDD() wroks for both
libc6 < 2.3.4 and >= 2.3.4.

File:

• branches/2.04_berlios/mindi/mindi (modified) (1 diff)

branches/2.04_berlios/mindi/mindi

@@ -2261 +2261 @@
     read incoming
     while [ "$incoming" != "" ] ; do
-    incoming=`echo "$incoming" | tr -s ' ' '\t'`
-    i=`echo "$incoming" | cut -f2`
-    if [ "$i" = "=>" ] ; then
-# was cut -f1,3
-        for fname in `echo "$incoming" | cut -f1,3` ; do
-        fname=`LocateFile $fname`
-        for f in $fname ; do
-            [ -e "$f" ] && echo $f
-        done
-        done
-    fi
-    read incoming
+        incoming=`echo "$incoming" | sed '/[[:blank:]]*.*[[:blank:]]*=>[[:blank:]]*(.*/d ; s/[[:blank:]]*\(.*\)[[:blank:]]*=>[[:blank:]]*\/.*/\1/ ; s/[[:blank:]]*\(\/.*\)[[:blank:]]*(.*/\1/'`
+        for fname in `echo "$incoming"` ; do
+            fname=`LocateFile $fname`
+            for f in $fname ; do
+                [ -e "$f" ] && echo $f
+            done
+        done
+        read incoming
     done
 }