Changeset 3867 in MondoRescue for branches/3.3/mondo/src/common/libmondo-tools.c

Timestamp:

Mar 7, 2024, 2:56:52 PM (2 months ago)

Author:

Bruno Cornec

Message:

Fix find_home_of_exe calls + errors

File:

• branches/3.3/mondo/src/common/libmondo-tools.c (modified) (6 diffs)

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

@@ -14 +14 @@
 #include "mondostructures.h"
 #include "lib-common-externs.h"
-#include "libmondo-tools.h"
 #include "libmondo-gui-EXT.h"
 #include "libmondo-files-EXT.h"
@@ -436 +435 @@
 
     if (bkpinfo->backup_media_type == dvd) {
-        if (find_home_of_exe("growisofs")) {
-            mr_asprintf(cdr_exe, "growisofs");
-        }                       // unlikely to be used
-        else {
+        if ((cdr_exe = find_home_of_exe("growisofs")) == NULL) {
             fatal_error("Please install growisofs.");
         }
@@ -462 +458 @@
             mondo_mkisofs_sz = mr_compute_uefi_string(cdr_exe);
         }
+        mr_free(cdr_exe);
+
         if (bkpinfo->manual_cd_tray) {
             fatal_error("Manual CD tray + DVD not supported yet.");
@@ -496 +494 @@
             mr_asprintf(extra_cdrom_params, " ");
         }
-        if (find_home_of_exe("cdrecord")) {
-            mr_asprintf(cdr_exe, "cdrecord");
-        } else if (find_home_of_exe("dvdrecord")) {
-            mr_asprintf(cdr_exe, "dvdrecord");
+        if ((cdr_exe = find_home_of_exe("cdrecord")) == NULL) {
+            if ((cdr_exe = find_home_of_exe("wodim")) == NULL) {
+                if ((cdr_exe = find_home_of_exe("dvdrecord")) == NULL) {
+                    fatal_error("Please install either cdrecord, wodim or dvdrecord.");
+                }
+            }
+        }
+        if ((tmp = find_home_of_exe("xorriso")) != NULL) {
+            mr_asprintf(isofs_cmd, "%s %s", tmp, MONDO_XORRISO_OPT);
+        } else if ((tmp = find_home_of_exe("genisoimage")) != NULL) {
+            mr_asprintf(isofs_cmd, "%s %s", tmp, MONDO_GENISOIMAGE_OPT);
+        } else if ((tmp = find_home_of_exe("mkisofs")) != NULL) {
+            mr_asprintf(isofs_cmd, "%s %s", tmp, MONDO_MKISOFS_OPT);
+        } else if ((tmp = find_home_of_exe("wodim")) != NULL) {
+            mr_asprintf(isofs_cmd, "%s %s", tmp, MONDO_WODIM_OPT);
         } else {
-            fatal_error("Please install either cdrecord or dvdrecord.");
-        }
-        if (find_home_of_exe("xorriso")) {
-            mr_asprintf(isofs_cmd, "%s", MONDO_XORRISO_CMD);
-        } else if (find_home_of_exe("genisoimage")) {
-            mr_asprintf(isofs_cmd, "%s", MONDO_GENISOIMAGE_CMD);
-        } else {
-            mr_asprintf(isofs_cmd, "%s", MONDO_MKISOFS_CMD);
-        }
+            fatal_error("Unable to find a command to create ISO among xorriso, genisoimage, mksiofs or wodim, please install one");
+        }
+        mr_free(tmp);
+
         if (bkpinfo->nonbootable_backup) {
             mr_asprintf(mondo_mkisofs_sz, "%s%s", isofs_cmd, MONDO_MKISOFS);
@@ -965 +969 @@
     retval += whine_if_not_found("bzip2");
     retval += whine_if_not_found("gzip");
+    retval += whine_if_not_found("cmp");
     retval += whine_if_not_found("awk");
     retval += whine_if_not_found("md5sum");
@@ -981 +986 @@
     }
 
-    if (!find_home_of_exe("cmp")) {
-        whine_if_not_found("cmp");
-    }
     run_program_and_log_output("umount `mount | grep cdr | cut -d' ' -f3 | tr '\n' ' '`", 5);
     tmp = call_program_and_get_last_line_of_output("mount | grep -E 'cdr(om|w)'");