Changeset 1817 in MondoRescue for branches/stable/mondo/src/common/libmondo-devices.c

Timestamp:

Nov 20, 2007, 3:36:00 PM (16 years ago)

Author:

Bruno Cornec

Message:

exclude_paths now a configuration item

File:

• branches/stable/mondo/src/common/libmondo-devices.c (modified) (5 diffs)

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

@@ -1555 +1555 @@
     char *tmp = NULL;
     char *tmp1 = NULL;
+    char *tmp2 = NULL;
     char *sz_size = NULL;
     char *command = NULL;
@@ -1699 +1700 @@
                     bkpinfo->media_device);
         } else {
-<<<<<<< .courant
-            mr_asprintf(&comment, _("What is your media device ?"));
+            if (bkpinfo->backup_media_type == usb) {
+                mr_asprintf(&comment, _("What is the /dev entry of your USB Disk/Key, please ?"));
+            } else {
+                mr_asprintf(&comment, _("What is your media device ?"));
+            }
             mr_asprintf(&tmp, mr_conf->media_device);
 
@@ -1706 +1710 @@
                 log_to_screen(_("User has chosen not to backup the PC"));
                 finish(1);
-=======
-            if ((find_cdrw_device(bkpinfo->media_device)) && (bkpinfo->backup_media_type != usb)) {
-                bkpinfo->media_device[0] = '\0';
->>>>>>> .fusion-droit.r1769
-            }
-<<<<<<< .courant
+            }
             mr_free(comment);
 
@@ -1725 +1724 @@
                 if (!popup_and_get_string("Device", comment, tmp, 5)) {
                     log_to_screen(_("User has chosen not to backup the PC"));
-=======
-            if (bkpinfo->media_device[0]) {
-                if (bkpinfo->backup_media_type == usb) {
-                    sprintf(tmp,
-                        "I think your %s media corresponds to %s. Is this correct?",
-                        media_descriptor_string(bkpinfo->backup_media_type),
-                        bkpinfo->media_device);
-                } else {
-                    sprintf(tmp,
-                        "I think I've found your %s burner at SCSI node %s. Is this correct? (Say no if you have an IDE burner and you are running a 2.6 kernel. You will then be prompted for further details.)",
-                        media_descriptor_string(bkpinfo->backup_media_type),
-                        bkpinfo->media_device);
-                }
-                if (!ask_me_yes_or_no(tmp)) {
-                    bkpinfo->media_device[0] = '\0';
-                }
-            }
-            if (!bkpinfo->media_device[0]) {
-                if (bkpinfo->backup_media_type == usb) {
-                    i = popup_and_get_string("/dev entry?",
-                                         "What is the /dev entry of your USB Disk/Key, please?",
-                                         bkpinfo->media_device,
-                                         MAX_STR_LEN / 4);
-                } else {
-                    if (g_kernel_version < 2.6) {
-                        i = popup_and_get_string("Device node?",
-                                             "What is the SCSI node of your CD (re)writer, please?",
-                                             bkpinfo->media_device,
-                                             MAX_STR_LEN / 4);
-                    } else {
-                        i = popup_and_get_string("/dev entry?",
-                                             "What is the /dev entry of your CD (re)writer, please?",
-                                             bkpinfo->media_device,
-                                             MAX_STR_LEN / 4);
-                    }
-                }
-                if (!i) {
-                    log_to_screen("User has chosen not to backup the PC");
->>>>>>> .fusion-droit.r1769
                     finish(1);
                 }
@@ -2106 +2066 @@
         mr_asprintf(&tmp, list_of_NFS_mounts_only());
         if (strlen(tmp) > 2) {
-            if (bkpinfo->exclude_paths[0]) {
-                strcat(bkpinfo->exclude_paths, " ");
-            }
-            strncpy(bkpinfo->exclude_paths, tmp, MAX_STR_LEN);
+            if (bkpinfo->exclude_paths != NULL) {
+                mr_strcat(bkpinfo->exclude_paths, " ");
+            }
+            mr_strcat(bkpinfo->exclude_paths,tmp);
         }
         mr_free(tmp);