Changeset 2972 in MondoRescue for branches/3.0

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.

Location:

branches/3.0/mondo/src

Files:

• common/libmondo-filelist.c (modified) (2 diffs)
• lib/mr_str.c (modified) (1 diff)
• mondorestore/mondo-prep.c (modified) (4 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);
         }

branches/3.0/mondo/src/lib/mr_str.c

@@ -30 +30 @@
 
     if (instr == NULL) {
+        *lastpos = 0;
+        return token;
+    }
+
+    if (delims == NULL) {
         *lastpos = 0;
         return token;

branches/3.0/mondo/src/mondorestore/mondo-prep.c

@@ -556 +556 @@
   int i   = 0;
   int j   = 0;
+  int v   = 0;
   int res = 0;
   
   /** buffers ***********************************************************/
   char *devices = NULL;
-  char *strtmp  = NULL;
   char *level   = NULL;
   char *program = NULL;
@@ -590 +590 @@
   mr_asprintf(&devices, "%s", raidlist->el[i].data_disks.el[0].device);
   for (j = 1; j < raidlist->el[i].data_disks.entries; j++) {
-    mr_asprintf(&strtmp, "%s", devices);
-    paranoid_free(devices);
-    mr_asprintf(&devices, "%s %s", strtmp,
-         raidlist->el[i].data_disks.el[j].device);
-    paranoid_free(strtmp);
+    mr_strcat(devices, " %s", raidlist->el[i].data_disks.el[j].device);
   }
   for (j = 0; j < raidlist->el[i].spare_disks.entries; j++) {
-    mr_asprintf(&strtmp, "%s", devices);
-    paranoid_free(devices);
-    mr_asprintf(&devices, "%s %s", strtmp,
-         raidlist->el[i].spare_disks.el[j].device);
-    paranoid_free(strtmp);
+    mr_strcat(devices, " %s", raidlist->el[i].spare_disks.el[j].device);
   }
   // translate RAID level
@@ -641 +633 @@
   mr_asprintf(&program, "mdadm --create --force --run --auto=yes %s --level=%s --raid-devices=%d %s", raidlist->el[i].raid_device, level, raidlist->el[i].data_disks.entries, oldmd);
   mr_free(oldmd);
+  mr_free(level);
+  // Restoring the UUID stored at backup time of present
+  for (v = 0; v++ ; v <= raidlist->el[i].additional_vars.entries) {
+    if ((raidlist->el[i].additional_vars.el[v].label != NULL) && (strcmp(raidlist->el[i].additional_vars.el[v].label,"UUID") == 0)) {
+        // We have a UUID to handle
+        if (raidlist->el[i].additional_vars.el[v].value != NULL) {
+            // force its restoration in order to avoid modifying all conf files using it
+            mr_strcat(program, " --update=uuid --uuid %s",raidlist->el[i].additional_vars.el[v].value);
+            break;
+        }
+    }
+  }
   if (raidlist->el[i].parity != -1) {
-    mr_asprintf(&strtmp, "%s", program);
-    paranoid_free(program);
     switch(raidlist->el[i].parity) {
     case 0:
-      mr_asprintf(&program, "%s --parity=%s", strtmp, "la");
+      mr_strcat(program, " --parity=%s", "la");
       break;
     case 1:
-      mr_asprintf(&program, "%s --parity=%s", strtmp, "ra");
+      mr_strcat(program, " --parity=%s", "ra");
       break;
     case 2:
-      mr_asprintf(&program, "%s --parity=%s", strtmp, "ls");
+      mr_strcat(program, " --parity=%s", "ls");
       break;
     case 3:
-      mr_asprintf(&program, "%s --parity=%s", strtmp, "rs");
+      mr_strcat(program, " --parity=%s", "rs");
       break;
     default:
@@ -661 +663 @@
       break;
     }
-    paranoid_free(strtmp);
   }
   if (raidlist->el[i].chunk_size != -1) {
-    mr_asprintf(&strtmp, "%s", program);
-    paranoid_free(program);
-    mr_asprintf(&program, "%s --chunk=%d", strtmp, raidlist->el[i].chunk_size);
-    paranoid_free(strtmp);
+    mr_strcat(program, " --chunk=%d", raidlist->el[i].chunk_size);
   }
   if (raidlist->el[i].spare_disks.entries > 0) {
-    mr_asprintf(&strtmp, "%s", program);
-    paranoid_free(program);
-    mr_asprintf(&program, "%s --spare-devices=%d", strtmp,
-         raidlist->el[i].spare_disks.entries);
-    paranoid_free(strtmp);
+    mr_strcat(program, " --spare-devices=%d", raidlist->el[i].spare_disks.entries);
   }
-  mr_asprintf(&strtmp, "%s", program);
-  paranoid_free(program);
-  mr_asprintf(&program, "%s %s", strtmp, devices);
-  paranoid_free(strtmp);
+  mr_strcat(program, " %s", devices);
   res = run_program_and_log_output(program, 1);
   // free memory
-  paranoid_free(devices);
-  paranoid_free(level);
-  paranoid_free(program);
+  mr_free(devices);
+  mr_free(program);
   // return to calling instance
   return res;