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

Timestamp:

Aug 18, 2009, 2:37:25 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3330@localhost: bruno | 2009-08-05 00:48:36 +0200
bkpinfo->include_paths is now dynamically allocated

File:

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

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

@@ -759 +759 @@
         if (!strcmp(bkpinfo->include_paths, "/")) {
             log_msg(2, "'/' is pleonastic.");
-            bkpinfo->include_paths[0] = '\0';
-        }
-        if (bkpinfo->include_paths[0]) {
-            strcat(bkpinfo->include_paths, " ");
         }
 
@@ -801 +797 @@
                 log_to_screen("Archiving only the following file systems on %s:\n", token);
                 log_to_screen("  %s\n", mounted_on_dsf);
-                strcpy(bkpinfo->include_paths, "/");
+                mr_asprintf(&p, "/");
+                bkpinfo->include_paths = p;
                 if (strlen(not_mounted_on_dsf)) {
                     log_msg (5, "Adding to bkpinfo->exclude_paths due to -I option: %s", not_mounted_on_dsf);
@@ -811 +808 @@
             /* A device special file was not passed in. Process it as a path. */
             case -1:
-                    strcat(bkpinfo->include_paths, token);
-                    strcat(bkpinfo->include_paths, " ");
+                mr_strcat(bkpinfo->include_paths, " %s ", token);
                 break; 
             }
             mr_free(token);
         }
-        log_msg(1, "include_paths is now '%s'", bkpinfo->include_paths);
+        if (bkpinfo->include_paths != NULL) {
+            log_msg(1, "include_paths is now '%s'", bkpinfo->include_paths);
+        }
         if (bkpinfo->exclude_paths != NULL) {
             log_msg(1, "exclude_paths is now '%s'", bkpinfo->exclude_paths);
@@ -838 +836 @@
         }
         bkpinfo->make_filelist = FALSE;
-        strcpy(bkpinfo->include_paths, flag_val['J']);
+        mr_asprintf(&p, "%s", flag_val['J']);
+        bkpinfo->include_paths = p;
     }