Changeset 2318 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-cli.c

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

File:

• branches/2.2.10/mondo/src/common/libmondo-cli.c (modified) (5 diffs)

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