Changeset 3195 in MondoRescue

Timestamp:

Sep 30, 2013, 9:07:23 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Fix tmpdir initialization as mkdtemp modify the existing string so it should not be freed too early.

Location:

branches/3.2/mondo/src/common

Files:

• libmondo-fork.c (modified) (2 diffs)
• libmondo-tools.c (modified) (9 diffs)

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

@@ -249 +249 @@
     if (!program[0]) {
         log_msg(2, "Warning - asked to run zerolength program");
-        return (1);
+        return(1);
     }
 
@@ -312 +312 @@
         }
     }
-    return (res);
+    return(res);
 }
 

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

@@ -707 +707 @@
     char *p = NULL;
 
-    if (bkpinfo->tmpdir != NULL) {
+    if (bkpinfo->tmpdir[0] != '\0') {
         /* purging a potential old tmpdir */
         if (chdir("/tmp")) {
@@ -735 +735 @@
     p = mkdtemp(tmp);
     if (p == NULL) {
-        log_it("Failed to create global tmp directory %s for Mondo.",tmp);
+        printf("Failed to create global tmp directory %s for Mondo.",tmp);
         mr_free(tmp);
         finish(-1);
     }
+    strcpy(bkpinfo->tmpdir,p);
     mr_free(tmp);
 
-    strcpy(bkpinfo->tmpdir,p);
     log_it("bkpinfo->tmpdir is being set to %s", bkpinfo->tmpdir);
 
@@ -799 +799 @@
 void reset_bkpinfo()
 {
-    log_msg(1, "Initializing bkpinfo");
-
     assert(bkpinfo != NULL);
     memset((void *) bkpinfo, 0, sizeof(struct s_bkpinfo));
@@ -822 +820 @@
     
     /*  We need tmpdir as early as possible for further function calls */
-    bkpinfo->tmpdir[0]= '\0';           // Really setup after
-    bkpinfo->scratchdir[0]= '\0';           // Really setup after
+    bkpinfo->tmpdir[0] = '\0';          // Really setup after
+    bkpinfo->scratchdir[0] = '\0';          // Really setup after
     setup_tmpdir(NULL);
     setup_scratchdir(NULL);
@@ -919 +917 @@
     int retval = 0;
 
-    mvaddstr_and_log_it(g_currentY, 0,
-                        "Checking sanity of your Linux distribution");
+    mvaddstr_and_log_it(g_currentY, 0, "Checking sanity of your Linux distribution");
 #ifndef __FreeBSD__
     if (system("which mkfs.vfat 2> /dev/null 1> /dev/null")
@@ -950 +947 @@
         /* Some SuSE have ramdisk as modules, so insert it first, then test again */
         run_program_and_log_output("modprobe brd 2> /dev/null > /dev/null",FALSE);
-        if (run_program_and_log_output
-            ("grep ramdisk /proc/devices", FALSE)) {
-            if (!ask_me_yes_or_no
-                ("Your kernel has no ramdisk support. That's mind-numbingly stupid but I'll allow it if you're planning to use a failsafe kernel. Are you?"))
-            {
+        if (run_program_and_log_output("grep ramdisk /proc/devices", FALSE)) {
+            if (!ask_me_yes_or_no("Your kernel has no ramdisk support. That's mind-numbingly stupid but I'll allow it if you're planning to use a failsafe kernel. Are you?")) {
                 //          retval++;
-                log_to_screen
-                    ("It looks as if your kernel lacks ramdisk and initrd support.");
-                log_to_screen
-                    ("I'll allow you to proceed but FYI, if I'm right, your kernel is broken.");
+                log_to_screen("It looks as if your kernel lacks ramdisk and initrd support.");
+                log_to_screen("I'll allow you to proceed but FYI, if I'm right, your kernel is broken.");
             }
         }
@@ -992 +984 @@
     if (strcmp("", tmp)) {
         if (strstr(tmp, "autofs")) {
-            log_to_screen
-                ("Your CD-ROM is mounted via autofs. I therefore cannot tell");
-            log_to_screen
-                ("if a CD actually is inserted. If a CD is inserted, please");
+            log_to_screen("Your CD-ROM is mounted via autofs. I therefore cannot tell");
+            log_to_screen("if a CD actually is inserted. If a CD is inserted, please");
             log_to_screen("eject it. Thank you.");
-            log_it
-                ("Ignoring autofs CD-ROM 'mount' since we hope nothing's in it.");
+            log_it("Ignoring autofs CD-ROM 'mount' since we hope nothing's in it.");
         } else
             if (run_program_and_log_output("uname -a | grep Knoppix", 5)) {
@@ -1017 +1006 @@
     if (run_program_and_log_output("mindi -V", 1)) {
         log_to_screen("Could not ascertain mindi's version number.");
-        log_to_screen
-            ("You have not installed Mondo and/or Mindi properly.");
+        log_to_screen("You have not installed Mondo and/or Mindi properly.");
         log_to_screen("Please uninstall and reinstall them both.");
         fatal_error("Please reinstall Mondo and Mindi.");
@@ -1024 +1012 @@
     mr_asprintf(tmp, "mindi --makemountlist %s/mountlist.txt.test", bkpinfo->tmpdir);
     if (run_program_and_log_output(tmp, 5)) {
+        log_to_screen("%s failed for some reason.", tmp);
         mr_free(tmp);
-        mr_asprintf(tmp, "mindi --makemountlist %s/mountlist.txt.test failed for some reason.", bkpinfo->tmpdir);
-        log_to_screen(tmp);
-        log_to_screen
-            ("Please run that command by hand and examine /var/log/mindi.log");
-        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.");
+        log_to_screen("Please run that command by hand and examine /var/log/mindi.log");
+        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.");
         retval++;
     }
     mr_free(tmp);
 
-    if (!run_program_and_log_output("parted2fdisk -l 2>/dev/null | grep -i raid", 1)
-        && !does_file_exist("/etc/raidtab")) {
-        log_to_screen
-            ("You have RAID partitions but no /etc/raidtab - creating one from /proc/mdstat");
+    if (!run_program_and_log_output("parted2fdisk -l 2>/dev/null | grep -i raid", 1) && !does_file_exist("/etc/raidtab")) {
+        log_to_screen("You have RAID partitions but no /etc/raidtab - creating one from /proc/mdstat");
         create_raidtab_from_mdstat(MDSTAT_FILE,"/etc/raidtab");
     }