Changeset 2395 in MondoRescue for branches/2.2.10/mondo/src/mondorestore

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)

Location:

branches/2.2.10/mondo/src/mondorestore

Files:

• mondo-rstr-newt.c (modified) (3 diffs)
• mondo-rstr-newt.h (modified) (1 diff)
• mondorestore.c (modified) (2 diffs)
• mr-externs.h (modified) (1 diff)

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

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

@@ -137 +137 @@
                    struct raidlist_itself *);
 void edit_raidrec_additional_vars(struct raid_device_record *);
-char *evaluate_mountlist(struct mountlist_itself *, int *);
+char *evaluate_mountlist(struct mountlist_itself *);
 int find_device_in_mountlist(struct mountlist_itself *, char *);
 int find_next_free_index_in_disklist(struct list_of_disks *);

branches/2.2.10/mondo/src/mondorestore/mondorestore.c

@@ -774 +774 @@
     mr_free(tmp);
 
-    flaws_str = evaluate_mountlist(mountlist, &res);
-    if (!res) {
+    flaws_str = evaluate_mountlist(mountlist);
+    if (flaws_str != NULL) {
         mr_asprintf(tmp, "Mountlist analyzed. Result: \"%s\" Switch to Interactive Mode?", flaws_str);
         mr_free(flaws_str);
@@ -787 +787 @@
         }
     }
-    mr_free(flaws_str);
 
     save_mountlist_to_disk(mountlist, g_mountlist_fname);

branches/2.2.10/mondo/src/mondorestore/mr-externs.h

@@ -109 +109 @@
 extern bool g_restoring_live_from_netfs;
 extern int fput_string_one_char_at_a_time(FILE *, char *);
-extern char *evaluate_mountlist(struct mountlist_itself *mountlist, int *res);
+extern char *evaluate_mountlist(struct mountlist_itself *mountlist);