Changeset 3903 in MondoRescue for branches/3.3/mondo/src

Timestamp:

Dec 17, 2024, 11:42:58 PM (5 months ago)

Author:

Bruno Cornec

Message:

Avoid useless umount

File:

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

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

@@ -1136 +1136 @@
 
     /*@ int's  ****************************************************** */
-    bool res;
+    bool res = FALSE;
 
     /*@ end vars **************************************************** */
@@ -1151 +1151 @@
     }
 
-    if ((bkpinfo->media_device == NULL) || (res = mount_media(mountpoint))) {
+    if ((bkpinfo->media_device == NULL) || ((res = mount_media(mountpoint)) == FALSE)) {
         mr_free(bkpinfo->media_device);
         if ((bkpinfo->media_device = mr_popup_and_get_string("CD-ROM device", "Please enter your CD-ROM's /dev device", "/dev/cdrom")) == NULL) {
-            res = TRUE;
+            res = FALSE;
         } else {
             res = mount_media(mountpoint);
         }
     }
-    if (res) {
+    if (!res) {
         log_msg(1, "mount failed");
     } else {
@@ -1535 +1535 @@
     char *mountdev = NULL;
     char *tmp = NULL;
+    bool res = FALSE;
 
     assert(bkpinfo != NULL);
@@ -1544 +1545 @@
         cd_number = atoi(last_line_of_file(mountdev));
         mr_free(mountdev);
-        return (cd_number);
+        return(cd_number);
     }
 
@@ -1556 +1557 @@
     }
     if (!is_this_device_mounted(MNT_CDROM)) {
-        mount_media(MNT_CDROM);
-    }
-
-    cd_number = atoi(last_line_of_file(MNT_CDROM "/archives/THIS-CD-NUMBER"));
+        res = mount_media(MNT_CDROM);
+    }
+
+    if (res) {
+        cd_number = atoi(last_line_of_file(MNT_CDROM "/archives/THIS-CD-NUMBER"));
+    } else {
+        cd_number = 0;
+    }
     return(cd_number);
 }
@@ -1577 +1582 @@
  * @param cd_number_i_want The CD number to ask for.
  */
-void
-insist_on_this_cd_number(int cd_number_i_want)
-{
+void insist_on_this_cd_number(int cd_number_i_want) {
 
     /*@ int ************************************************************* */
     int res = 0;
+    bool res1 = FALSE;
 
 
@@ -1596 +1600 @@
 
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        log_msg(3,
-                "No need to insist_on_this_cd_number when the backup type isn't CD-R(W) or NFS or ISO");
+        log_msg(3, "No need to insist_on_this_cd_number when the backup type isn't CD-R(W) or NFS or ISO");
         return;
-    }
-    if (!does_file_exist(MNT_CDROM)) {
-        mr_asprintf(tmp, "mkdir -p " MNT_CDROM);
-        run_program_and_log_output(tmp, 5);
-        mr_free(tmp);
     }
 
@@ -1611 +1609 @@
     if ((res = what_number_cd_is_this()) != cd_number_i_want) {
         log_msg(3, "Currently, we hold %d but we want %d", res, cd_number_i_want);
-
-        /* Now we need to umount the current media to have the next mounted after */
-        run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
-        log_msg(3, "Mounting next media %d",cd_number_i_want);
         g_current_media_number = cd_number_i_want;
-        mount_media(MNT_CDROM);
 
         mds = media_descriptor_string(bkpinfo->backup_media_type);
-        log_msg(3, "Insisting on %s #%d", mds, cd_number_i_want);
         mr_asprintf(request, "Please insert %s #%d and press Enter.", mds, cd_number_i_want);
         mr_free(mds);
 
+        // what_number_cd_is_this mounts the device anyhow if not yet done.
+        log_msg(3, "Mounting next media %d",cd_number_i_want);
         while (what_number_cd_is_this() != cd_number_i_want) {
             sync();
             if (is_this_device_mounted(MNT_CDROM)) {
-                res =
-                    run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
+                /* Now we need to umount the current media to have the next mounted after */
+                res = run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
             } else {
                 res = 0;