Changeset 2395 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.c

Timestamp:

Sep 12, 2009, 2:57:02 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Fix interface of evaluate_mountlist (remove 2nd param useless) and fix nuke mode which wasn't working.
• Tries to add support for bzip2 and lzma initramfs (preliminary, not tested) for 2.6.30

(Backport from 2.2.9)

File:

• branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.c (modified) (3 diffs)

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -1924 +1924 @@
     /** int **************************************************************/
     int i = 0;
-    int res = 0;
     int currline = 0;
     int finished = FALSE;
@@ -1965 +1964 @@
                           bEdit, bDelete, bReload, bCancel, bOK, NULL);
     while (!finished) {
-        flaws_str = evaluate_mountlist(mountlist, &res);
+        flaws_str = evaluate_mountlist(mountlist);
         if (strlen(flaws_str) > 0) {
             mr_asprintf(flaws_str_A, "%s", flaws_str + 1);
@@ -1996 +1995 @@
 
         if (b_res == bOK) {
-            flaws_str = evaluate_mountlist(mountlist, &res);
-            mr_free(flaws_str);
-            if (!res) {
+            flaws_str = evaluate_mountlist(mountlist);
+            if (flaws_str != NULL) {
+                mr_free(flaws_str);
                 finished =
                     ask_me_yes_or_no