Changeset 3867 in MondoRescue

Timestamp:

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

Author:

Bruno Cornec

Message:

Fix find_home_of_exe calls + errors

Location:

branches/3.3/mondo/src/common

Files:

• libmondo-devices.c (modified) (3 diffs)
• libmondo-files.c (modified) (4 diffs)
• libmondo-string.c (modified) (3 diffs)
• libmondo-tools.c (modified) (6 diffs)

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

@@ -15 +15 @@
 #include "mr_str.h"
 #include "mondostructures.h"
+#include "lib-common-externs.h"
 #include "libmondo-files-EXT.h"
-#include "libmondo-devices.h"
-#include "lib-common-externs.h"
 #include "libmondo-string-EXT.h"
 #include "libmondo-tools-EXT.h"
@@ -484 +483 @@
         strcpy(dev, g_cdrom_drive_is_here);
         if (!dev[0]) {
-            find_cdrom_device(dev);
+            find_cdrom_device(dev, FALSE);
         }
     }
@@ -619 +618 @@
         if (!does_device_exist(output)) {
             log_msg(4, "That didn't work. Sorry.");
-            return(1)
+            return(1);
         } else {
-            return(0)
+            return(0);
         }
     }

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

@@ -13 +13 @@
 #include "mr_file.h"
 #include "mondostructures.h"
-#include "libmondo-files.h"
-
 #include "lib-common-externs.h"
-
 #include "libmondo-tools-EXT.h"
 #include "libmondo-gui-EXT.h"
@@ -37 +34 @@
 /* Reference to global bkpinfo */
 extern struct s_bkpinfo *bkpinfo;
+
+/**
+ * Check for existence of given @p filename.
+ * @param filename The file to check for.
+ * @return TRUE if it exists, FALSE otherwise.
+ */
+bool does_file_exist(const char *filename)
+{
+
+    /*@ structures ************************************************** */
+    struct stat buf;
+
+    /*@************************************************************** */
+
+    assert(filename != NULL);
+    //  assert_string_is_neither_NULL_nor_zerolength(filename);
+    if (lstat(filename, &buf)) {
+        log_msg(20, "%s does not exist", filename);
+        return (FALSE);
+    } else {
+        log_msg(20, "%s exists", filename);
+        return (TRUE);
+    }
+}
+
 
 /**
@@ -169 +191 @@
     }
     return (noof_lines);
-}
-
-
-/**
- * Check for existence of given @p filename.
- * @param filename The file to check for.
- * @return TRUE if it exists, FALSE otherwise.
- */
-bool does_file_exist(const char *filename)
-{
-
-    /*@ structures ************************************************** */
-    struct stat buf;
-
-    /*@************************************************************** */
-
-    assert(filename != NULL);
-    //  assert_string_is_neither_NULL_nor_zerolength(filename);
-    if (lstat(filename, &buf)) {
-        log_msg(20, "%s does not exist", filename);
-        return (FALSE);
-    } else {
-        log_msg(20, "%s exists", filename);
-        return (TRUE);
-    }
 }
 
@@ -883 +880 @@
  * @return 0 if it's found, nonzero if not.
  */
-int whine_if_not_found(char *fname)
+int whine_if_not_found(const char *fname)
 {
     /*@ buffers *** */

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

@@ -11 +11 @@
 #include "mr_str.h"
 #include "mondostructures.h"
-#include "libmondo-string.h"
 #include "lib-common-externs.h"
 #include "libmondo-files-EXT.h"
@@ -41 +40 @@
 {
     char *p, *c;
+    char *partition = NULL;
 
     assert_string_is_neither_NULL_nor_zerolength(drive);
@@ -59 +59 @@
             mr_strcat(partition, "%c",
 #ifdef BSD
-                's';
+                's'
 #else
-                'p';
+                'p'
 #endif
                 );

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)'");