Changeset 2328 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-archive.c

Timestamp:

Aug 18, 2009, 3:20:42 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3339@localhost: bruno | 2009-08-11 23:56:01 +0200
bkpinfo->kernel_path, bkpinfo->call_before_iso, bkpinfo->call_make_iso, bkpinfo->call_burn_iso, bkpinfo->call_after_iso and bkpinfo->postnuke_tarball are now dynamically allocated

File:

• branches/2.2.10/mondo/src/common/libmondo-archive.c (modified) (7 diffs)

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

@@ -438 +438 @@
     copy_mondo_and_mindi_stuff_to_scratchdir(); // payload, too, if it exists
 #if __FreeBSD__ == 5
-    strcpy(bkpinfo->kernel_path, "/boot/kernel/kernel");
+    mr_asprintf(bkpinfo->kernel_path, "/boot/kernel/kernel");
 #elif __FreeBSD__ == 4
-    strcpy(bkpinfo->kernel_path, "/kernel");
+    mr_asprintf(bkpinfo->kernel_path, "/kernel");
 #elif linux
-    if (figure_out_kernel_path_interactively_if_necessary
-        (bkpinfo->kernel_path)) {
-        fatal_error
-            ("Kernel not found. Please specify manually with the '-k' switch.");
+    if (figure_out_kernel_path_interactively_if_necessary(bkpinfo->kernel_path)) {
+        fatal_error("Kernel not found. Please specify manually with the '-k' switch.");
     }
 #else
@@ -1661 +1659 @@
     chdir(bkpinfo->scratchdir);
 
-    if (bkpinfo->call_before_iso[0] != '\0') {
+    if (bkpinfo->call_before_iso) {
         mr_asprintf(message_to_screen, "Running pre-ISO call for CD#%d", g_current_media_number);
         res = eval_call_to_make_ISO(bkpinfo->call_before_iso, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
@@ -1675 +1673 @@
     }
 
-    if (bkpinfo->call_make_iso[0] != '\0') {
+    if (bkpinfo->call_make_iso) {
         log_msg(2, "bkpinfo->call_make_iso = %s", bkpinfo->call_make_iso);
         mds = media_descriptor_string(bkpinfo->backup_media_type);
@@ -1747 +1745 @@
                 }
                 pause_for_N_seconds(5, "Letting DVD drive settle");
-                res =
-                    eval_call_to_make_ISO(bkpinfo->call_make_iso, bkpinfo->scratchdir, g_current_media_number, MONDO_LOGFILE, message_to_screen);
+                res = eval_call_to_make_ISO(bkpinfo->call_make_iso, bkpinfo->scratchdir, g_current_media_number, MONDO_LOGFILE, message_to_screen);
                 retval += res;
                 if (!bkpinfo->please_dont_eject) {
@@ -1846 +1843 @@
     }
 
-    if (bkpinfo->call_burn_iso[0] != '\0') {
+    if (bkpinfo->call_burn_iso) {
         log_msg(2, "bkpinfo->call_burn_iso = %s", bkpinfo->call_burn_iso);
         mds = media_descriptor_string(bkpinfo->backup_media_type);
@@ -1852 +1849 @@
         mr_free(mds);
         pause_and_ask_for_cdr(2, &cd_is_mountable);
-        res =
-            eval_call_to_make_ISO(bkpinfo->call_burn_iso,
-                                  destfile, g_current_media_number,
-                                  MONDO_LOGFILE, message_to_screen);
+        res = eval_call_to_make_ISO(bkpinfo->call_burn_iso, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
         if (res) {
             mr_strcat(message_to_screen, "...failed");
@@ -1867 +1861 @@
     }
 
-    if (bkpinfo->call_after_iso[0] != '\0') {
+    if (bkpinfo->call_after_iso) {
         mds = media_descriptor_string(bkpinfo->backup_media_type);
         mr_asprintf(message_to_screen, "Running post-ISO call (%s #%d)", mds, g_current_media_number);
         mr_free(mds);
-        res =
-            eval_call_to_make_ISO(bkpinfo->call_after_iso,
-                                  destfile, g_current_media_number,
-                                  MONDO_LOGFILE, message_to_screen);
+        res = eval_call_to_make_ISO(bkpinfo->call_after_iso, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
         if (res) {
             mr_strcat(message_to_screen, "...failed");