Changeset 2325 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-cli.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/common/libmondo-cli.c (modified) (11 diffs)

branches/2.2.10/mondo/src/common/libmondo-cli.c

@@ -114 +114 @@
         }
     }
-    mr_asprintf(tmp, "rm -Rf %s/tmp.mondo.*", bkpinfo->tmpdir);
-    paranoid_system(tmp);
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "rm -Rf %s/mondo.scratch.*", bkpinfo->scratchdir);
-    paranoid_system(tmp);
-    mr_free(tmp);
-
-    mr_strcat(bkpinfo->scratchdir, "/mondo.scratch.%ld", random() % 32767);
-
     mr_asprintf(tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
     paranoid_system(tmp);
@@ -889 +879 @@
     if ((flag_set['t'] && !flag_set['d']) && (! bkpinfo->restore_data)) {
         log_it("Hmm! No tape drive specified. Let's see what we can do.");
-        p = mr_find_tape_device();
-        if (!p) {
+        if ((tmp1 = find_tape_device_and_size(NULL)) == NULL) {
             fatal_error("Tape device not specified. I couldn't find it either.");
         }
+        strcpy(flag_val['d'], tmp1);
+        mr_free(tmp1);
         flag_set['d'] = TRUE;
         strcpy(flag_val['d'], p);
@@ -917 +908 @@
         }
         if (!flag_set['d']) {
-            if (!find_dvd_device(flag_val['d'], FALSE)) {
+            if ((tmp = find_dvd_device(flag_val['d'])) != NULL) {
+                strcpy(flag_val['d'],tmp);
+                mr_free(tmp);
                 flag_set['d'] = TRUE;
                 log_to_screen("I guess DVD drive is at %s", flag_val['d']);
@@ -923 +916 @@
         }
         if (strchr(flag_val['d'], ',')) {
-            fatal_error
-                ("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag.");
+            fatal_error("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag.");
         }
         if (! bkpinfo->restore_data) {
             if (!find_home_of_exe("growisofs")) {
-                fatal_error
-                    ("Please install growisofs (probably part of dvd+rw-tools). If you want DVD support, you need it.");
+                fatal_error("Please install growisofs (probably part of dvd+rw-tools). If you want DVD support, you need it.");
             }
             if (!find_home_of_exe("dvd+rw-format")) {
-                fatal_error
-                    ("Please install dvd+rw-format (probably part of dvd+rw-tools). If you want DVD support, you need it.");
+                fatal_error("Please install dvd+rw-format (probably part of dvd+rw-tools). If you want DVD support, you need it.");
             }
             if (!flag_set['s']) {
                 sprintf(flag_val['s'], "%d", DEFAULT_DVD_DISK_SIZE);    // 4.7 salesman's GB = 4.482 real GB = 4582 MB
                 strcat(flag_val['s'], "m");
-                log_to_screen
-                    ("You did not specify a size (-s) for DVD. I'm guessing %s.",
-                    flag_val['s']);
+                log_to_screen("You did not specify a size (-s) for DVD. I'm guessing %s.", flag_val['s']);
                 flag_set['s'] = 1;
             }
@@ -948 +936 @@
     if (flag_set['t'] || flag_set['u']) {   /* tape size */
         if (strchr(flag_val['d'], ',')) {
-            fatal_error
-                ("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag.");
+            fatal_error("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag.");
         }
         if ((flag_set['O']) && (! bkpinfo->restore_data)) {
@@ -981 +968 @@
 
     if (flag_set['n']) {
-        strncpy(bkpinfo->nfs_mount, flag_val['n'], MAX_STR_LEN);
+        mr_free(bkpinfo->nfs_mount);
+        mr_asprintf(bkpinfo->nfs_mount, "%s", flag_val['n']);
         if (!flag_set['d']) {
-            strncpy(bkpinfo->nfs_remote_dir, "/", MAX_STR_LEN);
+            mr_free(bkpinfo->nfs_remote_dir);
+            mr_asprintf(bkpinfo->nfs_remote_dir, "/");
         }
         /* test if we specified a user for the NFS dialog */
@@ -989 +978 @@
         if (p != NULL) {
             /* User found. Store the 2 values */
+            bkpinfo->nfs_user = bkpinfo->nfs_mount;
             p++;
             /* new NFS mount */
-            strcpy(tmp,p);
+            bkpinfo->nfs_mount = p;
             p--;
             *p = '\0';
-            mr_asprintf(bkpinfo->nfs_user,"%s",p);
-            strcpy(bkpinfo->nfs_mount,tmp);
         }
         mr_asprintf(tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->nfs_mount);
@@ -1221 +1209 @@
             mr_free(tmp1);
         } else if (flag_set['n']) {
-            strncpy(bkpinfo->nfs_remote_dir, flag_val['d'], MAX_STR_LEN);
+            mr_free(bkpinfo->nfs_remote_dir);
+            mr_asprintf(bkpinfo->nfs_remote_dir, "%s", flag_val['d']);
         } else {                /* backup device (if tape/CD-R/CD-RW) */
-            strncpy(bkpinfo->media_device, flag_val['d'], MAX_STR_LEN / 4);
+            mr_free(bkpinfo->media_device);
+            mr_asprintf(bkpinfo->media_device, "%s", flag_val['d']);
         }
     }
@@ -1245 +1235 @@
     }
 
-    if (!flag_set['d']
-        && (flag_set['c'] || flag_set['w'] || flag_set['C'])) {
+    if (!flag_set['d'] && (flag_set['c'] || flag_set['w'] || flag_set['C'])) {
         if (g_kernel_version >= 2.6) {
             tmp2 = popup_and_get_string("Device", "Please specify the device", bkpinfo->media_device);
             if (tmp2 == NULL) {
+                fatal_error("User opted to cancel.");
+            }
+            bkpinfo->media_device = tmp2;
+        } else {
+            bkpinfo->media_device = find_cdrw_device();
+            if (bkpinfo->media_device == NULL) {
                 retval++;
-                log_to_screen("User opted to cancel.");
-            }
-            mr_free(tmp2);
-        } else if (find_cdrw_device(bkpinfo->media_device)) {
-            retval++;
-            log_to_screen
-                ("Tried and failed to find CD-R[W] drive automatically.\n");
-        } else {
-            flag_set['d'] = TRUE;
-            strncpy(flag_val['d'], bkpinfo->media_device, MAX_STR_LEN / 4);
+                log_to_screen("Tried and failed to find CD-R[W] drive automatically.\n");
+            } else {
+                flag_set['d'] = TRUE;
+                strncpy(flag_val['d'], bkpinfo->media_device, MAX_STR_LEN / 4);
+            }
         }
     }
@@ -1288 +1278 @@
 
         if (i) {
-            retval++;
             log_to_screen("Please specify a tempdir which I can write to. :)");
             fatal_error("I cannot write to the tempdir you specified.");
@@ -1467 +1456 @@
     /*@ ints ** */
     int opt = 0;
-    char *tmp = NULL;
     int i = 0;
     int len;