Changeset 3292 in MondoRescue for branches/3.2/mindi/mindi

Timestamp:

May 27, 2014, 5:53:14 PM (10 years ago)

Author:

Bruno Cornec

Message:

• Remove from mindi 2 functions replaced by perl code (ReadAllLink by mr-read-all-link and ProcessLDD by mr-process-ldd)
• Redirect mindi execution to mondo log on the fly to try to improve percentage display with newt (not finished yet)
• Introduce a new global var MINDI_LOGFILE and use it everywhere
• Fix some memory free mising (thanks valgrind)
• Remove a call to rpm to log packages - not portable
• Works with valgrind locally to create images in dir

File:

• branches/3.2/mindi/mindi (modified) (2 diffs)

branches/3.2/mindi/mindi

@@ -874 +874 @@
 
 
-# Give all symlinks recursively of a full path name
-ReadAllLink() {
-    file="$1"
-
-    while [ `echo $file | grep -Ec '\.\./'` -ne 0 ]; do
-        # We need to normalise the path with .. in it
-        file=`echo $file | perl -p -e 's|([^/]*)/([^/]+)/\.\./([^/]+)|$1/$3|g'`
-    done
-    echo "$file"
-    if [ ! -h $file ]; then
-        return 0
-    fi
-
-    link=`readlink $file`
-    d=`dirname $file`
-    # Is link a relative or full path name
-    fchar=`echo $link | cut -c1`
-    # If mother dir is a link print it
-    if [ -h "$d" ]; then
-        echo "$d"
-        d2=`readlink $d`
-        c2=`echo $d2 | cut -c1`
-        if [ "$c2" != "/" ]; then
-            if [ "$c2" != "." ]; then
-                d="/$d2"
-            else
-                d="$d/$d2"
-            fi
-        fi
-        echo "$d/`basename $file`"
-    fi
-    if [ "$fchar" != "/" ]; then
-        # Relative or local link
-        ReadAllLink "$d/$link" 
-    else
-        # Absolute path
-        ReadAllLink $link 
-    fi
-}
-
-
 LocateFile() {
     local i j path fname_to_find location output resolved tmp stub cache_id loclist
@@ -2194 +2153 @@
     rm -rf $bigdir
     rm -f $needlist
-}
-
-
-ProcessLDD() {
-    local incoming f d nd bd bnd
-    read incoming
-    while [ "$incoming" != "" ]; do
-        # We take the full path name of the dyn. lib. we want
-        incoming=`echo "$incoming" | $AWK '{if (match($1,/\//)) {print $1} else {if (match($3,/\//)) print $3} fi}'`
-        for f in $incoming ; do
-            # echo modified file name if one of the parent dir is a link
-            # by replacing the original dirname by the destination of the link
-            d="`dirname $f`"
-            found="false"
-            while [ "$d" != "/" ]; do
-                if [ -h "$d" ]; then
-                    nd=`readlink -f $d`
-                    bd=`basename $d`
-                    bnd=`basename $nd`
-                    f=`echo $f | sed "s~/$bd/~/$bnd/~"`
-                    echo $d
-                fi
-                d="`dirname $d`"
-            done
-
-            echo "$f"
-            echo "`ReadAllLink $f`"
-        done
-        read incoming
-    done
 }