Changeset 2972 in MondoRescue for branches/3.0/mondo/src/common/libmondo-filelist.c

Timestamp:

Mar 27, 2012, 2:48:08 PM (12 years ago)

Author:

Bruno Cornec

Message:

• Uses mr_strcat again instead of multiple mr_asprintf
• Generats the correct mdadm create command when using UUID for fixing #596. Needs to be checked
• More valgrind warning reported that may be fixed here.

File:

• branches/3.0/mondo/src/common/libmondo-filelist.c (modified) (2 diffs)

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

@@ -1337 +1337 @@
     char *skip_these;
     char *new_with_pipe;
-    char *strtmp;
-    char *token;
+    char *strtmp = NULL;
+    char *token = NULL;
     char *find_excludes = NULL;
     static char *name_of_evalcall_form;
@@ -1366 +1366 @@
         malloc_string(name_of_evalcall_form);
         malloc_string(find_skeleton_marker);
-        while((token = mr_strtok(sth, delims, &lastpos))) {
-          mr_asprintf(&strtmp,"%s", find_excludes);
-          paranoid_free(find_excludes);
-          mr_asprintf(&find_excludes,"%s -path %s -prune -o", strtmp, token);
-          paranoid_free(strtmp);
+        while((token = mr_strtok(sth, delims, &lastpos)) != NULL) {
+          mr_strcat(find_excludes," -path %s -prune -o", token);
           mr_free(token);
         }