Changeset 1817 in MondoRescue for branches

Timestamp:

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

Author:

Bruno Cornec

Message:

exclude_paths now a configuration item

Location:

branches/stable/mondo

Files:

• distributions/conf/mondo.conf.dist (modified) (3 diffs)
• src/common/libmondo-devices.c (modified) (5 diffs)
• src/common/libmondo-filelist.c (modified) (2 diffs)
• src/common/libmondo-tools.c (modified) (1 diff)
• src/common/mondostructures.h (modified) (1 diff)
• src/mondoarchive/mondo-cli.c (modified) (3 diffs)

branches/stable/mondo/distributions/conf/mondo.conf.dist

@@ -97 +97 @@
 mondo_boot_loader="NATIVE"
 
-# DONE
 #
 # Default compression tool
@@ -115 +114 @@
 mondo_compression_level=6
 
-# IN PROGRESS
-
 #
 # Paths to exclude from backup
@@ -123 +120 @@
 mondo_exclude_paths=""
 
+# DONE
+
+# IN PROGRESS
 #
 # Paths to include onto the backup

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);

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

@@ -1529 +1529 @@
 
     malloc_string(sz_datefile);
-    if (!(exclude_paths = malloc(8*MAX_STR_LEN))) {
-        fatal_error("Cannot malloc exclude_paths");
-    }
     malloc_string(g_skeleton_filelist);
     // The pathname to the skeleton filelist, used to give better progress reporting for mondo_makefilelist().
@@ -1589 +1586 @@
         mr_msg(2, "include_paths = '%s'", include_paths);
         mr_msg(1, "Calculating filelist");
-        snprintf(exclude_paths, (size_t)8*MAX_STR_LEN," %s %s %s %s %s %s %s . .. \
+        mr_asprintf(&exclude_paths, " %s %s %s %s %s %s %s . .. \
 " MNT_CDROM " /mnt/floppy /media \
 /proc /sys /tmp /var/log/lastlog /root/images/mondo " MINDI_CACHE " " MONDO_CACHE, excp, call_program_and_get_last_line_of_output("locate /win386.swp 2> /dev/null"), call_program_and_get_last_line_of_output("locate /hiberfil.sys 2> /dev/null"), call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null"), (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);

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

@@ -770 +770 @@
     bkpinfo->backup_media_string[0] = '\0';
     strcpy(bkpinfo->include_paths, "/");
-    bkpinfo->exclude_paths[0] = '\0';
     bkpinfo->call_before_iso[0] = '\0';
     bkpinfo->call_make_iso[0] = '\0';

branches/stable/mondo/src/common/mondostructures.h

@@ -497 +497 @@
    * the scratchdir, and the tempdir are automatically excluded.
    */
-    char exclude_paths[MAX_STR_LEN*4];
+    char *exclude_paths;
 
   /**

branches/stable/mondo/src/mondoarchive/mondo-cli.c

@@ -506 +506 @@
 
     if (flag_set['E']) {
-        if (bkpinfo->exclude_paths[0]) {
-            strcat(bkpinfo->exclude_paths, " ");
+        if (bkpinfo->exclude_paths != NULL) {
+            mr_strcat(bkpinfo->exclude_paths, " ");
         }
         mr_asprintf(&tmp1, flag_val['E']);
@@ -538 +538 @@
         }
         mr_free(tmp1);
-
-        strncpy(bkpinfo->exclude_paths + strlen(bkpinfo->exclude_paths),
-                flag_val['E'],
-                4*MAX_STR_LEN - strlen(bkpinfo->exclude_paths));
+        mr_strcat(bkpinfo->exclude_paths, flag_val['E']);
     }
     if (flag_set['e']) {
@@ -549 +546 @@
     {
         mr_asprintf(&psz, list_of_NFS_mounts_only());
-        if (bkpinfo->exclude_paths[0]) {
-            strncat(bkpinfo->exclude_paths, " ", 4*MAX_STR_LEN);
-        }
-        strncat(bkpinfo->exclude_paths, psz, 4*MAX_STR_LEN);
+        if (bkpinfo->exclude_paths != NULL) {
+            mr_strcat(bkpinfo->exclude_paths, " ");
+        }
+        mr_strcat(bkpinfo->exclude_paths, psz);
         mr_free(psz);
         mr_msg(3, "-N means we're now excluding %s",
                 bkpinfo->exclude_paths);
-    }
-    if (strlen(bkpinfo->exclude_paths) >= 4*MAX_STR_LEN) {
-        fatal_error
-            ("Your '-E' parameter is too long. Increase MAX_STR_LEN");
     }
     if (flag_set['b']) {