Changeset 2318 in MondoRescue

Timestamp:

Aug 18, 2009, 2:36:47 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3329@localhost: bruno | 2009-08-05 00:33:17 +0200
bkpinfo->exclude_paths is now dynamically allocated

Location:

branches/2.2.10/mondo/src/common

Files:

• libmondo-archive.c (modified) (2 diffs)
• libmondo-cli.c (modified) (5 diffs)
• libmondo-devices.c (modified) (2 diffs)
• libmondo-string.c (modified) (2 diffs)
• libmondo-tools.c (modified) (2 diffs)
• newt-specific.c (modified) (2 diffs)

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

@@ -13 +13 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_str.h"
 #include "mondostructures.h"
 #include "libmondo-string-EXT.h"
@@ -542 +543 @@
 
     assert(bkpinfo != NULL);
-    mr_asprintf(&tmp, "echo '%s' | tr -s ' ' '\n' | grep -E '^/dev/.*$' | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'",
-            bkpinfo->exclude_paths);
+    mr_asprintf(&tmp, "echo '%s' | tr -s ' ' '\n' | grep -E '^/dev/.*$' | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'", bkpinfo->exclude_paths);
     mr_asprintf(&devs_to_exclude, "%s", call_program_and_get_last_line_of_output(tmp));
     mr_free(tmp);

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

@@ -806 +806 @@
                     log_to_screen("Not archiving the following file systems:\n");
                     log_to_screen("  %s\n", not_mounted_on_dsf);
-                    strcat(bkpinfo->exclude_paths, not_mounted_on_dsf);
-                    strcat(bkpinfo->exclude_paths, "");
+                    mr_strcat(bkpinfo->exclude_paths, "%s ", not_mounted_on_dsf);
                 }
                 break;
@@ -1095 +1094 @@
             log_to_screen("Please supply a sensible value with '-E'\n");
         }
-        if (bkpinfo->exclude_paths[0]) {
-            strcat(bkpinfo->exclude_paths, " ");
-        }
+        mr_strcat(bkpinfo->exclude_paths, " ");
         mr_asprintf(&tmp1, "%s", flag_val['E']);
 
@@ -1140 +1137 @@
                     log_to_screen("  %s\n", mounted_on_dsf);
                     log_msg (5, "Adding to bkpinfo->exclude_paths due to -E option: %s", mounted_on_dsf);
-                    strcat(bkpinfo->exclude_paths, mounted_on_dsf);
-                    strcat(bkpinfo->exclude_paths, " ");
+                    mr_strcat(bkpinfo->exclude_paths, "%s ", mounted_on_dsf);
+                    }
                 }
                 break;
@@ -1150 +1147 @@
             /* A device special file was not passed in. Process it as a path. */
             case -1:
-                strcat(bkpinfo->exclude_paths, token);
-                strcat(bkpinfo->exclude_paths, " ");
+                mr_strcat(bkpinfo->exclude_paths, "%s ", token);
                 break;
             }
             mr_free(token);
         }
-        log_msg(1, "exclude_paths is now '%s'", bkpinfo->exclude_paths);
+        if (bkpinfo->exclude_paths != NULL) {
+            log_msg(1, "exclude_paths is now '%s'", bkpinfo->exclude_paths);
+        }
         log_msg(4, "Finished with the -E option");
     }
@@ -1166 +1164 @@
     if ((flag_set['N']) && (! bkpinfo->restore_data))       // exclude NFS mounts & devices
     {
-//      strncpy(psz, list_of_NFS_devices_and_mounts(), MAX_STR_LEN);
         mr_asprintf(&psz, "%s", 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);
+        mr_strcat(bkpinfo->exclude_paths, "%s ", psz);
         mr_free(psz);
 
-        log_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 (bkpinfo->exclude_paths != NULL) {
+            log_msg(3, "-N means we're now excluding %s", bkpinfo->exclude_paths);
+        }
     }
 

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

@@ -1938 +1938 @@
         mr_asprintf(&tmp, "%s", 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);
+            mr_strcat(bkpinfo->exclude_paths, " %s",tmp);
         }
         mr_free(tmp);
@@ -1963 +1960 @@
             finish(1);
         }
-        strcpy(bkpinfo->exclude_paths, p);
-        mr_free(p);
+        mr_free(bkpinfo->exclude_paths);
+        bkpinfo->exclude_paths = p;
 
         p = popup_and_get_string("Temporary directory", "Please enter your temporary directory.", bkpinfo->tmpdir);

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

@@ -54 +54 @@
     } else {
         if (isdigit(partition[-1])) {
-            mr_strcat(partition,
+            mr_strcat(partition, "%c",
 #ifdef BSD
                 's');
@@ -506 +506 @@
 
     q = ip;
-    while ((p = strstr(q, token) != NULL)) {
+    while ((p = strstr(q, token)) != NULL) {
         *p = '\0';
         if (output) {

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

@@ -814 +814 @@
     bkpinfo->make_filelist = TRUE;  // unless -J supplied to mondoarchive
     bkpinfo->include_paths[0] = '\0';
-    bkpinfo->exclude_paths[0] = '\0';
     bkpinfo->restore_path[0] = '\0';
     bkpinfo->call_before_iso[0] = '\0';
@@ -823 +822 @@
     bkpinfo->nfs_mount[0] = '\0';
     bkpinfo->nfs_user = NULL;
+    bkpinfo->exclude_paths = NULL;
     bkpinfo->nfs_remote_dir[0] = '\0';
     bkpinfo->postnuke_tarball[0] = '\0';

branches/2.2.10/mondo/src/common/newt-specific.c

@@ -427 +427 @@
                 mr_asprintf(&command, "rm -Rf %s", bkpinfo->tmpdir);
                 system(command);
-                paranoid_free(command);
+                mr_free(command);
             }
         }
@@ -436 +436 @@
                 mr_asprintf(&command, "rm -Rf %s", bkpinfo->scratchdir);
                 system(command);
-                paranoid_free(command);
+                mr_free(command);
             }
         }
         /* Free all allocated strings in bkpinfo */
         mr_free(bkpinfo->nfs_user);
+        mr_free(bkpinfo->exclude_paths);
 
         /* Then free the structure */