Changeset 2325 in MondoRescue for branches/2.2.10/mondo/src/mondoarchive/mondoarchive.c

Timestamp:

Aug 18, 2009, 3:19:15 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3336@localhost: bruno | 2009-08-11 16:32:36 +0200

• bkpinfo->media_device, bkpinfo->nfs_remote_dir, and bkpinfo->nfs_mount are now dynamically allocated
• new interfaces for find_cdrom_device(), find_tape_device_and_size(), find_dvd_device(), find_cdrw_device(), set_dev_to_this_if_rx_OK() and read_cfg_var() which allocate the string now returned
• Better differentiation between ISO and NFS iso file names construction

File:

• branches/2.2.10/mondo/src/mondoarchive/mondoarchive.c (modified) (3 diffs)

branches/2.2.10/mondo/src/mondoarchive/mondoarchive.c

@@ -276 +276 @@
     if (argc > 2 && !strcmp(argv[1], "find-cd")) {
         g_loglevel = 10;
-        malloc_string(tmp);
-        if (find_cdrw_device(tmp)) {
+        if ((tmp = find_cdrw_device()) == NULL) {
             printf("Failed to find CDR-RW drive\n");
         } else {
             printf("CD-RW is at %s\n", tmp);
         }
-        tmp[0] = '\0';
-        if (find_cdrom_device(tmp, atoi(argv[2]))) {
+        mr_free(tmp);
+        if ((tmp = find_cdrom_device(FALSE)) == NULL) {
             printf("Failed to find CD-ROM drive\n");
         } else {
             printf("CD-ROM is at %s\n", tmp);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
         finish(0);
     }
@@ -294 +293 @@
     if (argc > 2 && !strcmp(argv[1], "find-dvd")) {
         g_loglevel = 10;
-        malloc_string(tmp);
-        if (find_dvd_device(tmp, atoi(argv[2]))) {
+        if ((tmp = find_dvd_device()) == NULL) {
             printf("Failed to find DVD drive\n");
         } else {
             printf("DVD is at %s\n", tmp);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
         finish(0);
     }
@@ -406 +404 @@
     if (bkpinfo->backup_media_type == usb) {
         log_msg(1, "Unmounting USB device.");
+        if (bkpinfo->media_device == NULL) {
+            fatal_error("USB device set to NULL");
+        }
         mr_asprintf(tmp, "umount %s1", bkpinfo->media_device);
         run_program_and_log_output(tmp, TRUE);