Changeset 3822 in MondoRescue for branches/3.3/mondo/src/mondorestore

Timestamp:

Mar 3, 2024, 2:44:57 AM (2 years ago)

Author:

Bruno Cornec

Message:

manages media_device dynamically

Location:

branches/3.3/mondo/src/mondorestore

Files:

• mondo-rstr-compare.c (modified) (1 diff)
• mondo-rstr-tools.c (modified) (5 diffs)
• mondorestore.c (modified) (1 diff)

branches/3.3/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -656 +656 @@
     if (bkpinfo->disaster_recovery
         && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
-        strcpy(bkpinfo->media_device,
-               last_line_of_file("/tmp/CDROM-LIVES-HERE"));
+        mr_asprintf(bkpinfo->media_device, "%s", last_line_of_file("/tmp/CDROM-LIVES-HERE"));
     } else {
         find_cdrom_device(bkpinfo->media_device, FALSE);

branches/3.3/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -734 +734 @@
 if (bkpinfo->disaster_recovery) {
     if (bkpinfo->backup_media_type == cdstream) {
-        sprintf(bkpinfo->media_device, "/dev/cdrom");
+        mr_asprintf(bkpinfo->media_device, "%s", "/dev/cdrom");
         bkpinfo->media_size = 650;  /* good guess */
     } else if (bkpinfo->backup_media_type == usb) {
@@ -745 +745 @@
             strcpy(value,envtmp1);
         }
-        sprintf(bkpinfo->media_device, "%s1", value);
+        mr_asprintf(bkpinfo->media_device, "%s1", value);
         log_msg(2, "Backup medium is USB --- dev=%s", bkpinfo->media_device);
     } else if (bkpinfo->backup_media_type == tape || bkpinfo->backup_media_type == udev) {
@@ -751 +751 @@
             fatal_error("Cannot get tape device name from cfg file");
         }
-        strcpy(bkpinfo->media_device, value);
+        mr_asprintf(bkpinfo->media_device, "%s", value);
         read_cfg_var(cfg_file, "media-size", value);
         bkpinfo->media_size = atol(value);
         log_msg(2, "Backup medium is TAPE --- dev=%s", bkpinfo->media_device);
     } else {
-        strcpy(bkpinfo->media_device, "/dev/cdrom");    /* we don't really need this var */
+        mr_asprintf(bkpinfo->media_device, "%s", "/dev/cdrom"); /* we don't really need this var */
         bkpinfo->media_size = 1999 * 1024;  /* 650, probably, but we don't need this var anyway */
         log_msg(2, "Backup medium is similar to CD-R[W]");
@@ -968 +968 @@
                 log_msg(1, "Unable to mount isodir. Perhaps this is really a CD backup?");
                 bkpinfo->backup_media_type = cdr;
-                strcpy(bkpinfo->media_device, "/dev/cdrom");    /* superfluous */
+                mr_asprintf(bkpinfo->media_device, "%s", "/dev/cdrom"); /* superfluous */
                 bkpinfo->isodir[0] = iso_mnt[0] = iso_path[0] = '\0';
                 if (mount_media()) {
@@ -2160 +2160 @@
             run_program_and_log_output("mkdir -p tmp", FALSE);
 
-            if (strlen(bkpinfo->media_device) == 0) {
-                strcpy(bkpinfo->media_device, "/dev/st0");
-                log_msg(2, "media_device is blank; assuming %s");
+            if (bkpinfo->media_device == NULL) {
+                mr_asprintf(bkpinfo->media_device, "%s", "/dev/st0");
+                log_msg(2, "media_device is blank; assuming %s", bkpinfo->media_device);
             }
             mr_asprintf(tmp, "%s", bkpinfo->media_device);
-            if (extract_cfg_file_and_mountlist_from_tape_dev
-                (bkpinfo->media_device)) {
-                strcpy(bkpinfo->media_device, "/dev/st0");
-                if (extract_cfg_file_and_mountlist_from_tape_dev
-                    (bkpinfo->media_device)) {
-                    strcpy(bkpinfo->media_device, "/dev/osst0");
-                    if (extract_cfg_file_and_mountlist_from_tape_dev
-                        (bkpinfo->media_device)) {
-                        strcpy(bkpinfo->media_device, "/dev/ht0");
-                        if (extract_cfg_file_and_mountlist_from_tape_dev
-                            (bkpinfo->media_device)) {
-                            log_msg(3,
-                                    "I tried lots of devices but none worked.");
-                            strcpy(bkpinfo->media_device, tmp);
+            if (extract_cfg_file_and_mountlist_from_tape_dev(bkpinfo->media_device)) {
+                mr_free(bkpinfo->media_device);
+                mr_asprintf(bkpinfo->media_device, "%s", "/dev/st0");
+                if (extract_cfg_file_and_mountlist_from_tape_dev(bkpinfo->media_device)) {
+                    mr_free(bkpinfo->media_device);
+                    mr_asprintf(bkpinfo->media_device, "%s", "/dev/osst0");
+                    if (extract_cfg_file_and_mountlist_from_tape_dev(bkpinfo->media_device)) {
+                        mr_free(bkpinfo->media_device);
+                        mr_asprintf(bkpinfo->media_device, "%s", "/dev/ht0");
+                        if (extract_cfg_file_and_mountlist_from_tape_dev(bkpinfo->media_device)) {
+                            log_msg(3, "I tried lots of devices but none worked.");
+                            mr_free(bkpinfo->media_device);
                         }
                     }
                 }
             }
-            mr_free(tmp);
+            if (bkpinfo->media_device == NULL) {
+                bkpinfo->media_device = tmp;
+            } else {
+                mr_free(tmp);
+            }
 
             if (!does_file_exist("tmp/mondorestore.cfg")) {

branches/3.3/mondo/src/mondorestore/mondorestore.c

@@ -2474 +2474 @@
         interactively_obtain_media_parameters_from_user(FALSE);
     }
-    log_msg(2, "bkpinfo->media_device = %s", bkpinfo->media_device);
-    if (!bkpinfo->media_device[0]) {
-        log_msg(2, "Warning - failed to find media dev");
+    if (bkpinfo->media_device == NULL) {
+        log_msg(2, "Warning - failed to find media_device");
+    } else {
+        log_msg(2, "bkpinfo->media_device = %s", bkpinfo->media_device);
     }