Changeset 2326 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-tools.c

Timestamp:

Aug 18, 2009, 3:19:54 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3337@localhost: bruno | 2009-08-11 20:02:18 +0200
bkpinfo->boot_device and bkpinfo->zip_exe are now dynamically allocated

File:

• branches/2.2.10/mondo/src/common/libmondo-tools.c (modified) (5 diffs)

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

@@ -478 +478 @@
 
     if (bkpinfo->use_lzo) {
-        strcpy(bkpinfo->zip_exe, "lzop");
+        mr_asprintf(bkpinfo->zip_exe, "lzop");
         strcpy(bkpinfo->zip_suffix, "lzo");
     } else if (bkpinfo->use_gzip) {
-        strcpy(bkpinfo->zip_exe, "gzip");
+        mr_asprintf(bkpinfo->zip_exe, "gzip");
         strcpy(bkpinfo->zip_suffix, "gz");
     } else if (bkpinfo->compression_level != 0) {
-        strcpy(bkpinfo->zip_exe, "bzip2");
+        mr_asprintf(bkpinfo->zip_exe, "bzip2");
         strcpy(bkpinfo->zip_suffix, "bz2");
-    } else {
-        bkpinfo->zip_exe[0] = bkpinfo->zip_suffix[0] = '\0';
     }
 
@@ -798 +796 @@
 
     mr_free(bkpinfo->media_device);
+    mr_free(bkpinfo->boot_device);
+    mr_free(bkpinfo->zip_exe);
     mr_free(bkpinfo->isodir);
     mr_free(bkpinfo->prefix);
@@ -827 +827 @@
     }
     bkpinfo->boot_loader = '\0';
-    bkpinfo->boot_device[0] = '\0';
-    bkpinfo->zip_exe[0] = '\0';
+    bkpinfo->boot_device = NULL;
+    bkpinfo->zip_exe = NULL;
     bkpinfo->zip_suffix[0] = '\0';
     bkpinfo->image_devs[0] = '\0';
@@ -1223 +1223 @@
  * If this is a distribution like Gentoo that doesn't keep /boot mounted, mount it.
  */
-void mount_boot_if_necessary()
-{
+void mount_boot_if_necessary() {
     char *tmp = NULL;
     char *command = NULL;
@@ -1238 +1237 @@
 
     log_msg(4, "tmp = '%s'", tmp);
-    if (tmp[0]) {
-        log_it("/boot is at %s according to /etc/fstab", tmp);
-        mr_asprintf(command, "mount | grep -Ew '/boot'");
-        mr_free(tmp);
-        mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
-        mr_free(command);
-
-        if (!strcmp(tmp,"")) {
-            if ((strstr(tmp, "LABEL=") || strstr(tmp,"UUID="))) {
-                if (!run_program_and_log_output("mount /boot", 5)) {
-                    strcpy(g_boot_mountpt, "/boot");
-                    log_msg(1, "Mounted /boot");
-                } else {
-                    log_it("...ignored cos it's a label or uuid :-)");
+    log_it("/boot is at %s according to /etc/fstab", tmp);
+    mr_asprintf(command, "mount | grep -Ew '/boot'");
+    mr_free(tmp);
+    mr_asprintf(tmp, call_program_and_get_last_line_of_output(command));
+    mr_free(command);
+
+    if (!strcmp(tmp,"")) {
+        if ((strstr(tmp, "LABEL=") || strstr(tmp,"UUID="))) {
+            if (!run_program_and_log_output("mount /boot", 5)) {
+                strcpy(g_boot_mountpt, "/boot");
+                log_msg(1, "Mounted /boot");
+            } else {
+                log_it("...ignored cos it's a label or uuid :-)");
+            }
+        } else {
+            mr_asprintf(command, "mount | grep -E '^%s'", tmp);
+            log_msg(3, "command = %s", command);
+            if (run_program_and_log_output(command, 5)) {
+                strcpy(g_boot_mountpt, tmp);
+                mr_free(tmp);
+                log_it("%s (your /boot partition) is not mounted. I'll mount it before backing up", g_boot_mountpt);
+
+                mr_asprintf(tmp, "mount %s", g_boot_mountpt);
+                if (run_program_and_log_output(tmp, 5)) {
+                    g_boot_mountpt[0] = '\0';
+                    log_msg(1, "Plan B");
+                    if (!run_program_and_log_output("mount /boot", 5)) {
+                        strcpy(g_boot_mountpt, "/boot");
+                        log_msg(1, "Plan B worked");
+                    } else {
+                        log_msg(1,
+                            "Plan B failed. Unable to mount /boot for backup purposes. This probably means /boot is mounted already, or doesn't have its own partition.");
+                    }
                 }
-            } else {
-                mr_asprintf(command, "mount | grep -E '^%s'", tmp);
-                log_msg(3, "command = %s", command);
-                if (run_program_and_log_output(command, 5)) {
-                    strcpy(g_boot_mountpt, tmp);
-                    mr_free(tmp);
-                    log_it("%s (your /boot partition) is not mounted. I'll mount it before backing up", g_boot_mountpt);
-
-                    mr_asprintf(tmp, "mount %s", g_boot_mountpt);
-                    if (run_program_and_log_output(tmp, 5)) {
-                        g_boot_mountpt[0] = '\0';
-                        log_msg(1, "Plan B");
-                        if (!run_program_and_log_output("mount /boot", 5)) {
-                            strcpy(g_boot_mountpt, "/boot");
-                            log_msg(1, "Plan B worked");
-                        } else {
-                            log_msg(1,
-                                "Plan B failed. Unable to mount /boot for backup purposes. This probably means /boot is mounted already, or doesn't have its own partition.");
-                        }
-                    }
-                    mr_free(tmp);
-                }
-                mr_free(command);
             }
-        }
-    }
+            mr_free(command);
+        }
+    }
+    mr_free(tmp);
     log_msg(1, "Ended sub");
 }