Changeset 3866 in MondoRescue for branches/3.3/mondo/src/common/libmondo-devices.c

Timestamp:

Mar 7, 2024, 1:55:18 PM (3 months ago)

Author:

Bruno Cornec

Message:

Change find_my_editor and find_home_of_exe to return dynamically assigned stringsi - adapt whine_if_not_found

File:

• branches/3.3/mondo/src/common/libmondo-devices.c (modified) (7 diffs)

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

@@ -535 +535 @@
     }
     run_program_and_log_output("insmod ide-scsi", -1);
-    if (find_home_of_exe("cdrecord")) {
-        mr_asprintf(cdr_exe, "cdrecord");
-    } else {
-        mr_asprintf(cdr_exe, "dvdrecord");
-    }
-    if (find_home_of_exe(cdr_exe)) {
+    if ((cdr_exe = find_home_of_exe("cdrecord")) == NULL) {
+        if ((cdr_exe = find_home_of_exe("wodim")) == NULL) {
+            cdr_exe = find_home_of_exe("dvdrecord");
+        }
+    }
+    if (cdr_exe != NULL) {
         mr_asprintf(command, "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -E '[D|C][V|D]' | cut -d' ' -f2 | head -n1", cdr_exe);
         tmp = call_program_and_get_last_line_of_output(command);
@@ -594 +594 @@
     static char the_last_place_i_found_it[MAX_STR_LEN] = "";
 
-    /*@ intialize *************************************************** */
-    malloc_string(tmp);
-    malloc_string(phrase_one);
-    malloc_string(mountpoint);
-
+    assert_string_is_neither_NULL_nor_zerolength(output);
     output[0] = '\0';
-    phrase_one[0] = '\0';
-
-    /*@ end vars **************************************************** */
 
     if (g_cdrom_drive_is_here[0] && !isdigit(g_cdrom_drive_is_here[0])) {
         strcpy(output, g_cdrom_drive_is_here);
         log_msg(3, "Been there, done that. Returning %s", output);
-        retval = 0;
-        goto end_of_find_cdrom_device;
+        return(0);
     }
     if (the_last_place_i_found_it[0] != '\0' && !try_to_mount) {
         strcpy(output, the_last_place_i_found_it);
         log_msg(3, "find_cdrom_device() --- returning last found location - '%s'", output);
-        retval = 0;
-        goto end_of_find_cdrom_device;
-    }
-
-    sprintf(mountpoint, "%s/cd.mnt", bkpinfo->tmpdir);
-    make_hole_for_dir(mountpoint);
-
-    if (find_home_of_exe("cdrecord")) {
-        mr_asprintf(cdr_exe, "cdrecord");
-    } else {
-        mr_asprintf(cdr_exe, "dvdrecord");
-    }
-    tmp[0] = '\0';
-    if (!find_home_of_exe(cdr_exe)) {
+        return(0);
+    }
+
+    if ((cdr_exe = find_home_of_exe("cdrecord")) == NULL) {
+        if ((cdr_exe = find_home_of_exe("wodim")) == NULL) {
+            cdr_exe = find_home_of_exe("dvdrecord");
+        }
+    }
+
+    if (cdr_exe == NULL) {
         strcpy(output, "/dev/cdrom");
         log_msg(4, "Can't find cdrecord; assuming %s", output);
         if (!does_device_exist(output)) {
             log_msg(4, "That didn't work. Sorry.");
-            retval = 1;
-            goto end_of_find_cdrom_device;
+            return(1)
         } else {
-            retval = 0;
-            goto end_of_find_cdrom_device;
+            return(0)
         }
     }
@@ -646 +632 @@
         mr_free(cdr_exe);
         mr_free(command);
-        return (1);
+        return(1);
     }
     mr_free(command);
+
+    /*@ intialize *************************************************** */
+    malloc_string(tmp);
+    malloc_string(phrase_one);
+
+    phrase_one[0] = '\0';
+    tmp[0] = '\0';
+
+    /*@ end vars **************************************************** */
+
 
     for (tmp1 = fgets(tmp, MAX_STR_LEN, fin); !feof(fin) && (tmp1 != NULL);
@@ -810 +806 @@
 #endif
 
+    mr_asprintf(mountpoint, "%s/cd.mnt", bkpinfo->tmpdir);
+    make_hole_for_dir(mountpoint);
+
     if (found_it && try_to_mount) {
         if (mount_CDROM_here(output, mountpoint)) {
@@ -829 +828 @@
     }
     unlink(mountpoint);
+    mr_free(mountpoint);
 
     if (found_it) {
@@ -865 +865 @@
     paranoid_free(tmp);
     paranoid_free(phrase_one);
-    paranoid_free(mountpoint);
     return (retval);
 }
@@ -2805 +2804 @@
 
         if (ask_me_yes_or_no("Do you want to backup extended attributes?")) {
-            if (find_home_of_exe("getfattr")) {
-                mr_free(g_getfattr);
-                mr_asprintf(g_getfattr,"getfattr");
-            }
-            if (find_home_of_exe("getfacl")) {
-                mr_free(g_getfacl);
-                mr_asprintf(g_getfacl,"getfacl");
-            }
+            mr_free(g_getfattr);
+            g_getfattr = find_home_of_exe("getfattr");
+            mr_free(g_getfacl);
+            g_getfacl = find_home_of_exe("getfacl");
             log_it("Backup of extended attributes");
         }