Changeset 3161 in MondoRescue for branches/3.1/mondo/src/common/libmondo-archive.c

Timestamp:

Jun 25, 2013, 10:53:14 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Apply fixes to 3.1 tree so that at least mondo compiles again (but that branch probably doesn't work at all again).

File:

• branches/3.1/mondo/src/common/libmondo-archive.c (modified) (9 diffs)

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

@@ -686 +686 @@
             fatal_error("The de facto standard location for your boot loader's config file is /boot/grub/menu.lst, /boot/grub/grub.cfg, or /boot/grub2/grub.cfg but I cannot find it there. What is wrong with your Linux distribution?");
         }
-        mr_asprintf(&bootldr_ver, "%s", call_program_and_get_last_line_of_output("grub --version"));
+        mr_asprintf(bootldr_ver, "%s", call_program_and_get_last_line_of_output("grub --version", TRUE));
     } else if (bkpinfo->boot_loader == 'E') {
         mr_asprintf(bootldr_str, "ELILO");
@@ -722 +722 @@
     log_to_screen("Your boot loader is %s and it boots from %s", bootldr_str, bkpinfo->boot_device);
     if (bootldr_ver != NULL) {
-        mr_asprintf(&tmp, "Boot loader version string: %s", bootldr_ver);
+        mr_asprintf(tmp, "Boot loader version string: %s", bootldr_ver);
         log_to_screen(tmp);
         mr_free(tmp);
     }
     if (bootldr_ver != NULL) {
-        mr_asprintf(&tmp, "Boot loader version string: %s", bootldr_ver);
+        mr_asprintf(tmp, "Boot loader version string: %s", bootldr_ver);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -1590 +1590 @@
     /*@ buffers ****************************************** */
     char *tmp = NULL;
+    char *tmp2 = NULL;
     char *old_pwd;
     char *result_sz = NULL;
@@ -1614 +1615 @@
     log_msg(2, "make_iso_fs --- scratchdir=%s --- destfile=%s", bkpinfo->scratchdir, destfile);
     tmp2 = getcwd(old_pwd, MAX_STR_LEN - 1);
+    if (! tmp2) {
+        //FIXME
+    }
     mr_asprintf(tmp, "chmod 700 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
@@ -1733 +1737 @@
         mr_free(mds);
         if (find_home_of_exe("genisoimage")) {
-            mr_asprintf(&isofs_cmd, "%s", MONDO_GENISOIMAGE_CMD);
+            mr_asprintf(isofs_cmd, "%s", MONDO_GENISOIMAGE_CMD);
         } else {
-            mr_asprintf(&isofs_cmd, "%s", MONDO_MKISOFS_CMD);
+            mr_asprintf(isofs_cmd, "%s", MONDO_MKISOFS_CMD);
         }
         if (bkpinfo->nonbootable_backup) {
             log_msg(1, "Making nonbootable backup");
             mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS);
-            res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
+            res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, message_to_screen);
             mr_free(full_isofs_cmd);
         } else {
@@ -1756 +1760 @@
                 log_msg(1, "IA64 --> elilo");
                 mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS_REGULAR_ELILO);
-                res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
+                res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, message_to_screen);
                 mr_free(full_isofs_cmd);
 #else
@@ -1762 +1766 @@
                 mr_asprintf(full_isofs_cmd, "%s%s-b images/mindi-bootroot.2880.img -c boot.cat -o '_ISO_' -J -V _CD#_ .",isofs_cmd,MONDO_MKISOFS);
                     // FIXME: fixed boot size probably wrong. lilo to be removed
-                res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
+                res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, message_to_screen);
 #endif
             } else {
@@ -1768 +1772 @@
                 log_msg(1, "Isolinux");
                 mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS_REGULAR_SYSLINUX);
-                res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
+                res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, message_to_screen);
             }
             mr_free(full_isofs_cmd);
@@ -1884 +1888 @@
     /*@ pointers ******************************************* */
     FILE *fin = NULL;
-    char *q;
-    char *q;
 
     /*@ buffers ******************************************** */