Changeset 1994 in MondoRescue

Timestamp:

Jun 28, 2008, 12:41:33 AM (16 years ago)

Author:

Bruno Cornec

Message:

merge content for trunk from old laptop

File:

• trunk/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (56 diffs)

trunk/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -6 +6 @@
 #include <unistd.h>
 #include "my-stuff.h"
-#include "../common/mondostructures.h"
-#include "../common/libmondo.h"
+#include "mr_mem.h"
+#include "mr_msg.h"
+#include "mr_str.h"
+
+#include "mondostructures.h"
+#include "libmondo.h"
 #include "mr-externs.h"
 #include "mondo-rstr-tools.h"
@@ -13 +17 @@
 #include <pthread.h>
 #endif
-#include "mr_mem.h"
 
 extern bool g_sigpipe_caught;
@@ -36 +39 @@
 extern char *g_mondo_cfg_file;  // where m*ndo-restore.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
-extern struct s_bkpinfo *g_bkpinfo_DONTUSETHIS;
 
 extern t_bkptype g_backup_media_type;
@@ -63 +64 @@
     mr_free(g_mondo_cfg_file);
     mr_free(g_mountlist_fname);
-    mr_free(g_mondo_home);
     mr_free(g_tmpfs_mountpt);
     mr_free(g_isodir_device);
@@ -254 +254 @@
         mr_free(tmp);
     }
-    mr_asprintf(&tmp,
-            "Checking to see if f=%s, file=%s, is in the list of biggiefiles",
+    mr_msg(2, "Checking to see if f=%s, file=%s, is in the list of biggiefiles",
             f, file);
-    mr_msg(2, tmp);
-    mr_free(tmp);
-
     mr_asprintf(&command, "grep -E '^%s$' %s", file, list_fname);
     mr_free(file);
@@ -299 +295 @@
     read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
     if (bkpinfo->disaster_recovery) {
-/* Patch Conor Daly 26-june-2004 
- * Don't let this clobber an existing bkpinfo->isodir */
+    /* Patch Conor Daly 26-june-2004 
+     * Don't let this clobber an existing bkpinfo->isodir */
         if (!bkpinfo->isodir) {
             mr_allocstr(bkpinfo->isodir, "/tmp/isodir");
@@ -328 +324 @@
         }
         run_program_and_log_output("df -m", FALSE);
-        mr_asprintf(&tmp,
-                "The 'mount' command is '%s'. PLEASE report this command to be if you have problems, ok?",
+        mr_msg(1, "The 'mount' command is '%s'. PLEASE report this command to be if you have problems, ok?",
                 mount_isodir_command);
-        mr_msg(1, tmp);
-        mr_free(tmp);
-
         if (run_program_and_log_output(mount_isodir_command, FALSE)) {
             popup_and_OK
@@ -350 +342 @@
     }
     i = what_number_cd_is_this(bkpinfo);    /* has the side-effect of calling mount_cdrom() */
-    mr_asprintf(&tmp, "%s #%d has been mounted via loopback mount",
+    mr_msg(1, "%s #%d has been mounted via loopback mount",
             bkpinfo->backup_media_string, i);
-    mr_msg(1, tmp);
-    mr_free(tmp);
-
     if (i < 0) {
         popup_and_OK
@@ -371 +360 @@
 void kill_petris(void)
 {
-    char *command;
+    char *command = NULL;
     mr_asprintf(&command,
             "kill `ps 2> /dev/null | grep petris 2> /dev/null | grep -v grep | cut -d' ' -f2` 2> /dev/null");
@@ -394 +383 @@
     int res = 0;
 
-    char *tmp = NULL;
     char *command = NULL;
     char *mountdir = NULL;
     char *mountpoint = NULL;
     char *additional_parameters = NULL;
-    char *p1 = NULL;
-    char *p2 = NULL;
-    char *p3 = NULL;
-
+ 
     assert_string_is_neither_NULL_nor_zerolength(device);
     assert_string_is_neither_NULL_nor_zerolength(mpt);
@@ -422 +407 @@
         return (0);
     }
-    mr_asprintf(&tmp, "Mounting device %s   ", device);
-    mr_msg(1, tmp);
-
+    mr_msg(1, "Mounting device %s   ", device);
     if (writeable) {
-        mr_asprintf(&p1, "-o rw");
-    } else {
-        mr_asprintf(&p1, "-o ro");
-    }
-    tmp = find_home_of_exe("setfattr");
-    if (tmp) {
-        mr_asprintf(&p2, ",user_xattr");
-    } else {
-        mr_asprintf(&p2, "%s", "");
-    }
-    mr_free(tmp);
-
-    tmp = find_home_of_exe("setfacl");
-    if (tmp) {
-        mr_asprintf(&p3, ",acl");
-    } else {
-        mr_asprintf(&p3, "%s", "");
-    }
-    mr_free(tmp);
-
-    mr_asprintf(&additional_parameters, "%s%s%s", p1, p2, p3);
-    mr_free(p1);
-    mr_free(p2);
-    mr_free(p3);
+        mr_asprintf(&additional_parameters, "-o rw");
+    } else {
+        mr_asprintf(&additional_parameters, "-o ro");
+    }
+    if (find_home_of_exe("setfattr")) {
+        mr_strcat(additional_parameters, ",user_xattr");
+    }
+    if (find_home_of_exe("setfacl")) {
+        mr_strcat(additional_parameters, ",acl");
+    }
 
     if (!strcmp(mountpoint, "swap")) {
@@ -483 +452 @@
         mr_msg(1, "command was '%s'", command);
         if (!strcmp(mountpoint, "swap")) {
-            log_to_screen(tmp);
+            log_to_screen("Unable to mount device %s (type %s) at %s", device,
+                format, mountdir);
         } else {
             mr_msg(2, "Retrying w/o the '-t' switch");
@@ -500 +470 @@
         }
     }
-    mr_free(tmp);
     mr_free(command);
     mr_free(mountdir);
@@ -516 +485 @@
  *END_MOUNT_DEVICE                                                        *
  **************************************************************************/
-
 
 
@@ -553 +521 @@
                     "Again with the /proc - why is this in your mountlist?");
         } else if (is_this_device_mounted(mountlist->el[lino].device)) {
-            mr_asprintf(&tmp, _("%s is already mounted"),
+            log_to_screen(_("%s is already mounted"),
                     mountlist->el[lino].device);
-            log_to_screen(tmp);
-            mr_free(tmp);
         } else if (strcmp(mountlist->el[lino].mountpoint, "none")
                    && strcmp(mountlist->el[lino].mountpoint, "lvm")
@@ -576 +542 @@
             if (res) {
                 if (these_failed != NULL) { /* not the first time */
-                    mr_asprintf(&tmp, "%s %s", these_failed, mountlist->el[lino].device);
-                    mr_free(these_failed);
-                    these_failed = tmp;
+                    mr_strcat(these_failed, " %s", mountlist->el[lino].device);
                 } else { /* The first time */
-                    mr_asprintf(&these_failed, "%s ", mountlist->el[lino].device);
+                    mr_asprintf(&these_failed, "%s", mountlist->el[lino].device);
                 }
             }
@@ -620 +584 @@
     }
     run_program_and_log_output("df -m", 3);
-    mr_free((void*) mountlist);
+    mr_free(mountlist);
     return (retval);
 }
@@ -640 +604 @@
 {
     char *mount_cmd = NULL;
-    int i, res;
+    int i = 0, res = 0;
 #ifdef __FreeBSD__
     char *mddev = NULL;
@@ -895 +859 @@
             mr_free(value);
 
-            mr_asprintf(&tmp, "Backup medium is TAPE --- dev=%s",
+            mr_msg(2, "Backup medium is TAPE --- dev=%s",
                     bkpinfo->media_device);
-            mr_msg(2, tmp);
-            mr_free(tmp);
         } else {
             mr_allocstr(bkpinfo->media_device, "/dev/cdrom");
@@ -990 +952 @@
 
     read_cfg_var(g_mondo_cfg_file, "please-dont-eject", tmp);
-#ifdef __FreeBSD__
-    tmp1 = call_program_and_get_last_line_of_output("cat /tmp/cmdline");
-#else
     tmp1 = call_program_and_get_last_line_of_output("cat /proc/cmdline");
-#endif
     if ((tmp != NULL) || strstr(tmp1,"donteject")) {
         bkpinfo->please_dont_eject = TRUE;
@@ -1088 +1046 @@
                     mr_free(iso_mnt);
                     mr_free(iso_path);
-                    mr_asprintf(&iso_mnt, "%s", "");
-                    mr_asprintf(&iso_path, "%s", "");
-
+                    mr_asprintf(&iso_mnt, "");
+                    mr_asprintf(&iso_path, "");
                     if (mount_cdrom(bkpinfo)) {
                         fatal_error
@@ -1119 +1076 @@
                 media_specified_by_user = bkpinfo->backup_media_type;
                 get_cfg_file_from_archive(bkpinfo);
-/*
-              if (media_specified_by_user != cdr && media_specified_by_user == cdrw)
-                { g_restoring_live_from_cd = FALSE; }
-*/
             }
         }
@@ -1150 +1103 @@
 s_node *process_filelist_and_biggielist(struct s_bkpinfo *bkpinfo)
 {
-    struct s_node *filelist;
+    struct s_node *filelist = NULL;
 
     char *command = NULL;
@@ -1252 +1205 @@
         mr_msg(1, "Warning - %s does not exist", g_filelist_full);
     }
-//  popup_and_OK("Wonderful.");
 
     mr_msg(2, "Forking");
@@ -1262 +1214 @@
 
     case 0:
-        log_to_screen(("Pre-processing filelist"));
+        log_to_screen(_("Pre-processing filelist"));
         if (!does_file_exist(g_biggielist_txt)) {
             mr_asprintf(&command, "> %s", g_biggielist_txt);
@@ -1268 +1220 @@
             mr_free(command);
         }
-        mr_asprintf(&command, "grep  -E '^/dev/.*$' %s > %s",
+        mr_asprintf(&command, "grep -E '^/dev/.*' %s > %s",
                 g_biggielist_txt, g_filelist_imagedevs);
         paranoid_system(command);
@@ -1356 +1308 @@
 int run_boot_loader(bool offer_to_hack_scripts)
 {
-    int res;
+    int res = 0;
     int retval = 0;
 
@@ -1369 +1321 @@
     read_cfg_var(g_mondo_cfg_file, "bootloader.device", device);
     read_cfg_var(g_mondo_cfg_file, "bootloader.name", name);
-    mr_asprintf(&tmp, "run_boot_loader: device='%s', name='%s'", device, name);
-    mr_msg(2, tmp);
-    mr_free(tmp);
-
+    mr_msg(2, "run_boot_loader: device='%s', name='%s'", device, name);
     sync();
     if (!strcmp(name, "LILO")) {
@@ -1379 +1328 @@
         res = run_elilo(offer_to_hack_scripts);
     } else if (!strcmp(name, "GRUB")) {
-//      if ( does_file_exist(DO_MBR_PLEASE) || (offer_to_hack_scripts && ask_me_yes_or_no("Because of bugs in GRUB, you're much better off running mondorestore --mbr after this program terminates. Are you sure you want to install GRUB right now?")))
-//        {
         res = run_grub(offer_to_hack_scripts, device);
-//    unlink(DO_MBR_PLEASE);
-//  }
-//      else
-//        {
-//    mr_msg(1, "Not running run_grub(). Was a bad idea anyway.");
-//    res = 1;
-//  }
     } else if (!strcmp(name, "RAW")) {
         res = run_raw_mbr(offer_to_hack_scripts, device);
@@ -1487 +1427 @@
 
     assert_string_is_neither_NULL_nor_zerolength(bd);
+    editor = find_my_editor();
 
     if (offer_to_run_stabgrub
@@ -1518 +1459 @@
                 newtSuspend();
             }
-            editor = find_my_editor();
             mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
             paranoid_system(tmp);
@@ -1524 +1464 @@
 
             mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/grub.conf", editor);
-            mr_free(editor);
-
             paranoid_system(tmp);
             mr_free(tmp);
@@ -1578 +1516 @@
         mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
+    mr_free(editor);
     return (res);
 }
@@ -1599 +1538 @@
     int done = 0;
 
+    editor = find_my_editor();
     if (offer_to_run_stabelilo
         && ask_me_yes_or_no(_("Did you change the mountlist?")))
@@ -1620 +1560 @@
                     newtSuspend();
                 }
-                editor = find_my_editor();
                 mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
                 paranoid_system(tmp);
@@ -1626 +1565 @@
 
                 mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/elilo.conf", editor);
-                mr_free(editor);
-
                 paranoid_system(tmp);
                 mr_free(tmp);
@@ -1648 +1585 @@
         res = TRUE;
     }
+    mr_free(editor);
     return (res);
 }
@@ -1676 +1614 @@
     }
 
+    editor = find_my_editor();
     if (offer_to_run_stablilo
         && ask_me_yes_or_no(_("Did you change the mountlist?"))) {
@@ -1695 +1634 @@
                     newtSuspend();
                 }
-                editor = find_my_editor();
                 mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
                 paranoid_system(tmp);
@@ -1701 +1639 @@
 
                 mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/lilo.conf", editor);
-                mr_free(editor);
-
                 paranoid_system(tmp);
                 mr_free(tmp);
@@ -1709 +1645 @@
                     newtResume();
                 }
-//              newtCls();
                 if (ask_me_yes_or_no(_("Edit them again?"))) {
                     continue;
@@ -1761 +1696 @@
                                    " lilo -M /dev/sda", 3);
     }
+    mr_free(editor);
     return (res);
 }
@@ -1785 +1721 @@
     assert_string_is_neither_NULL_nor_zerolength(bd);
 
+    editor = find_my_editor();
     if (offer_to_hack_scripts
         && ask_me_yes_or_no(_("Did you change the mountlist?"))) {
@@ -1797 +1734 @@
                     newtSuspend();
                 }
-                editor = find_my_editor();
                 mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
-                mr_free(editor);
-
                 paranoid_system(tmp);
                 mr_free(tmp);
@@ -1807 +1741 @@
                     newtResume();
                 }
-//              newtCls();
             }
             popup_and_get_string(_("Boot device"),
-                                 _
-                                 ("Please confirm/enter the boot device. If in doubt, try /dev/hda"), bd);
+                                 _("Please confirm/enter the boot device. If in doubt, try /dev/hda"), bd);
             mr_asprintf(&command, "stabraw-me %s", bd);
             res = run_program_and_log_output(command, 3);
@@ -1826 +1758 @@
         /* nuke mode */
         mvaddstr_and_log_it(g_currentY, 0,
-                            _
-                            ("Restoring MBR...                                               "));
+                            _("Restoring MBR...                                               "));
         mr_asprintf(&command, "raw-MR %s /tmp/mountlist.txt", bd);
         mr_msg(2, "run_raw_mbr() --- command='%s'", command);
@@ -1841 +1772 @@
         mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
+    mr_free(editor);
     return (res);
 }
@@ -1954 +1886 @@
 {
     log_to_screen
-        (_
-         ("Mondorestore is terminating in response to a signal from the OS"));
+        (_("Mondorestore is terminating in response to a signal from the OS"));
     paranoid_MR_finish(254);
 }
@@ -2092 +2023 @@
             mr_free(command);
         } else {
-            mr_asprintf(&tmp1, "%s%s", tmp, _("...not mounted anyway :-) OK"));
-            mr_free(tmp);
-            tmp = tmp1;
+            mr_strcat(tmp, _("...not mounted anyway :-) OK"));
             res = 0;
         }
         g_current_progress++;
         if (res) {
-            mr_asprintf(&tmp1, "%s%s", tmp, _("...Failed"));
-            mr_free(tmp);
-            tmp = tmp1;
+            mr_strcat(tmp, _("...Failed"));
             retval++;
             log_to_screen(tmp);
@@ -2120 +2047 @@
         log_to_screen(_("All partitions were unmounted OK."));
     }
-    mr_free((void*) mountlist);
+    mr_free(mountlist);
     return (retval);
 }
@@ -2182 +2109 @@
     int res = 0;
 
-    bool try_plan_B;
+    bool try_plan_B = FALSE;
 
     assert(bkpinfo != NULL);
@@ -2235 +2162 @@
         mr_msg(2,
                 "Mounted floppy OK but I don't trust it because the archives might contain more up-to-date config file than the floppy does.");
-// NB: If busybox does not support 'mount -o loop' then Plan A WILL NOT WORK.
+        // NB: If busybox does not support 'mount -o loop' then Plan A WILL NOT WORK.
         mr_msg(2, "Processing floppy (plan A?)");
         mr_asprintf(&ramdisk_fname, "%s/mindi.rdz", mountpt);
@@ -2355 +2282 @@
         mr_free(command);
 
-        mr_asprintf(&command, "cp -f %s/%s %s",tmp1,
+        mr_asprintf(&command, "cp -f %s/%s %s",
+                tmp1,
                 MOUNTLIST_FNAME_STUB, mountlist_file);
         mr_free(tmp1);
@@ -2405 +2333 @@
     mr_asprintf(&command, "cp -f %s /%s", cfg_file, MONDO_CFG_FILE_STUB);
     mr_free(cfg_file);
-
     run_program_and_log_output(command, FALSE);
     mr_free(command);
@@ -2411 +2338 @@
     mr_asprintf(&command, "cp -f %s /%s", mountlist_file, MOUNTLIST_FNAME_STUB);
     mr_free(mountlist_file);
-
     run_program_and_log_output(command, FALSE);
     mr_free(command);
@@ -2451 +2377 @@
             return;
         }
-        for (unfinished_mdstat_devices = i = 0; i <= raidlist->entries;
-             i++) {
+        for (unfinished_mdstat_devices = i = 0; i <= raidlist->entries; i++) {
             if (raidlist->el[i].progress < wait_for_percentage) {
                 unfinished_mdstat_devices++;