Changeset 3292 in MondoRescue

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

Location:

branches/3.2

Files:

• mindi/mindi (modified) (2 diffs)
• mondo/src/common/libmondo-archive.c (modified) (5 diffs)
• mondo/src/common/libmondo-devices.c (modified) (1 diff)
• mondo/src/common/libmondo-filelist.c (modified) (2 diffs)
• mondo/src/common/libmondo-files.c (modified) (2 diffs)
• mondo/src/common/libmondo-fork.c (modified) (1 diff)
• mondo/src/common/libmondo-tools.c (modified) (2 diffs)
• mondo/src/common/newt-specific.c (modified) (2 diffs)
• mondo/src/include/my-stuff.h (modified) (1 diff)
• mondo/src/lib/mr_mem.c (modified) (2 diffs)
• mondo/src/mondorestore/mondo-prep.c (modified) (1 diff)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (1 diff)

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
 }
 

branches/3.2/mondo/src/common/libmondo-archive.c

@@ -843 +843 @@
     mr_asprintf(command, "mindi %s --custom %s %s/images '%s' '%s' \
 '%s' %ld '%s' '%s' '%s' \
-'%s' %s %ld '%s' '%s' '%s' '%s' %ld %d '%s'", tmp2, bkpinfo->tmpdir,    // parameter #2
+'%s' %s %ld '%s' '%s' '%s' '%s' %ld %d '%s' 2>&1 > %s", tmp2, bkpinfo->tmpdir,  // parameter #2
             bkpinfo->scratchdir,    // parameter #3
             bkpinfo->kernel_path,   // parameter #4
@@ -864 +864 @@
             use_lzma_sz,        // parameter #20 (STRING)
             value,              // parameter #21 (STRING)
+            MONDO_LOGFILE,      // redirect to log file
             MONDO_LOGFILE);
 
@@ -888 +889 @@
 //  popup_and_OK("Pausing");
 
-    res = run_program_and_log_output(command, FALSE);
+    // BCO old call :
+    //res = run_program_and_log_output(command, FALSE);
+    res = run_external_binary_with_percentage_indicator_NEW("Calling MINDI for boot disk",command);
+    /* May crash now that we changed the call
     update_evalcall_form(99);
+    */
     paranoid_free(command);
 
@@ -929 +934 @@
     } else {
         log_to_screen("Mindi failed to create your boot+data disks.");
-        mr_asprintf(command, "grep 'Fatal error' /var/log/mindi.log");
+        mr_asprintf(command, "grep 'Fatal error' %s", MINDI_LOGFILE);
         mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
         mr_free(command);
@@ -1638 +1643 @@
         mr_free(tmp3);
     }
+    mr_free(tmp);
     mr_free(tmp2);
     mr_free(tmp3);

branches/3.2/mondo/src/common/libmondo-devices.c

@@ -2176 +2176 @@
         }
         setup_scratchdir(tmp);
+        mr_free(tmp);
     }
     log_msg(3, "media type = %s", bkptype_to_string(bkpinfo->backup_media_type));

branches/3.2/mondo/src/common/libmondo-filelist.c

@@ -390 +390 @@
     }
     if (filelist->down) {
-/*      if (!(i++ %39999)) { update_evalcall_form(0); } */
         free_filelist(filelist->down);
         filelist->down = NULL;
@@ -1331 +1330 @@
         }
     }
-    mr_asprintf(find_excludes, " ");
 
     if (!depth) {
+        mr_asprintf(find_excludes, " ");
         while((token = mr_strtok(sth, delims, &lastpos)) != NULL) {
           mr_strcat(find_excludes," -path %s -prune -o", token);

branches/3.2/mondo/src/common/libmondo-files.c

@@ -278 +278 @@
     // If we didn't get anything back, check whether mindi raised a fatal error
     if (!kernel[0]) {
-        mr_asprintf(command, "%s", "grep 'Fatal error' /var/log/mindi.log");
+        mr_asprintf(command, "grep 'Fatal error' %s", MINDI_LOGFILE);
         mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
         if (strlen(tmp) > 1) {
@@ -284 +284 @@
             mr_free(tmp);
             mr_free(command);
-            fatal_error("Mindi gave a fatal error. Please check '/var/log/mindi.log'.");
+            fatal_error("Mindi gave a fatal error. Please check "MINDI_LOGFILE);
         }
         mr_free(tmp);

branches/3.2/mondo/src/common/libmondo-fork.c

@@ -649 +649 @@
 
     for (sleep(1); command[0] != '\0'; sleep(1)) {
-        pcno = grab_percentage_from_last_line_of_file(MONDO_LOGFILE);
+        if (strstr(cmd,"mindi") != NULL) {
+            pcno = grab_percentage_from_last_line_of_file(MINDI_LOGFILE);
+        } else {
+            pcno = grab_percentage_from_last_line_of_file(MONDO_LOGFILE);
+        }
         if (pcno < 0 || pcno > 100) {
             log_msg(8, "Weird pc# %d", pcno);

branches/3.2/mondo/src/common/libmondo-tools.c

@@ -391 +391 @@
 #else
     run_program_and_log_output("cat /proc/cpuinfo", 5);
-    run_program_and_log_output
-        ("rpm -q newt newt-devel slang slang-devel ncurses ncurses-devel gcc",
-         5);
+    /*
+    run_program_and_log_output("rpm -q newt newt-devel slang slang-devel ncurses ncurses-devel gcc", 5);
+    */
 #endif
 
@@ -985 +985 @@
         log_to_screen("%s failed for some reason.", tmp);
         mr_free(tmp);
-        log_to_screen("Please run that command by hand and examine /var/log/mindi.log");
+        log_to_screen("Please run that command by hand and examine "MINDI_LOGFILE);
         log_to_screen("for more information. Perhaps your /etc/fstab file is insane.");
         log_to_screen("Perhaps Mindi's MakeMountlist() subroutine has a bug. We'll see.");

branches/3.2/mondo/src/common/newt-specific.c

@@ -420 +420 @@
         mr_free(bkpinfo->exclude_devs);
         mr_free(bkpinfo->exclude_paths);
+        mr_free(bkpinfo->include_paths);
         mr_free(bkpinfo->subdir);
         /* Then free the structure */
@@ -609 +610 @@
             g_isoform_scale = newtScale(3, 3, 34, 100);
             newtCenteredWindow(40, 7, ttl);
+            if (g_isoform_main != NULL) {
+                newtFormDestroy(g_isoform_main);
+            }
             g_isoform_main = newtForm(NULL, NULL, 0);
             g_isoform_timeline = newtLabel(1, 5, "                    ");

branches/3.2/mondo/src/include/my-stuff.h

@@ -76 +76 @@
 #define MINDI_CACHE_REL "var/cache/mindi"   /* Should be coherent with mindi */
 #define MINDI_CACHE "/"MINDI_CACHE_REL
+#define MINDI_LOGFILE "/var/log/mindi.log"
 
 /**

branches/3.2/mondo/src/lib/mr_mem.c

@@ -74 +74 @@
     size_t n = 0;
 
+    if (*lineptr != NULL) {
+        /* free a variable which should be already free */
+        mr_msg_int(1,line,file,"mr_getline_ found a non freed variable here");
+        mr_free_int(lineptr,line,file);
+    }
     ret = getline(lineptr,&n,fd);
     if ((ret == -1) && (! feof(fd))) {
@@ -81 +86 @@
     /*  We reached end of file, allocating empty string */
     if (ret == -1) {
-        mr_asprintf_int(lineptr, line, file, "");
+        mr_free_int(lineptr,line,file);
+        mr_asprintf_int(lineptr,line,file,"");
     }
 }

branches/3.2/mondo/src/mondorestore/mondo-prep.c

@@ -45 +45 @@
 
 FILE *g_fprep = NULL;
-extern char *g_mondo_cfg_file;  // where m*ndo-restore.cfg (the config file) is stored
+extern char *g_mondo_cfg_file;  // where mondorestore.cfg (the config file) is stored
 
 int g_partition_table_locked_up = 0;

branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -67 +67 @@
 extern char *g_imagedevs_restthese; // of the imagedevs listed in FILELIST_IMAGEDEVS,
                       // restore only these
-extern char *g_mondo_cfg_file;  // where m*ndo-restore.cfg (the config file) is stored
+extern char *g_mondo_cfg_file;  // where mondorestore.cfg (the config file) is stored
 extern char *g_mountlist_fname; // where mountlist.txt (the mountlist file) is stored
 extern char *g_mondo_home;      // homedir of Mondo; usually /usr/local/share/mondo