Changeset 3566 in MondoRescue

Timestamp:

Apr 13, 2016, 12:58:26 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Fix a bug in mr_strip_space (end of string was on char too far)
• Dynamic memory allocation for load_raidtab_into_raidlist and get_next_raidtab_line
• Add a test to test_mountlist to rewrite the raitab, allowing comparison with original
• Fix #780, #781 and #757 with a new raitab handling as a consequence

Location:

branches/3.2/mondo

Files:

• src/common/libmondo-raid.c (modified) (17 diffs)
• src/lib/mr_str.c (modified) (1 diff)
• test/test-mountlist.c (modified) (1 diff)

branches/3.2/mondo/src/common/libmondo-raid.c

@@ -243 +243 @@
     items++;
     disklist->entries = items;
+    log_msg(3, "Adding device %s (%d)", device_to_add, index);
 }
 #endif
@@ -372 +373 @@
         fprintf(fout, "    raid-level            linear\n");
     } else {
-        fprintf(fout, "    raid-level            %d\n",
-                raidrec->raid_level);
-    }
-    fprintf(fout, "    nr-raid-disks         %d\n",
-            raidrec->data_disks.entries);
+        fprintf(fout, "    raid-level            %d\n", raidrec->raid_level);
+    }
+    fprintf(fout, "    nr-raid-disks         %d\n", raidrec->data_disks.entries);
     if (raidrec->spare_disks.entries > 0) {
-        fprintf(fout, "    nr-spare-disks        %d\n",
-                raidrec->spare_disks.entries);
+        fprintf(fout, "    nr-spare-disks        %d\n", raidrec->spare_disks.entries);
     }
     if (raidrec->parity_disks.entries > 0) {
-        fprintf(fout, "    nr-parity-disks       %d\n",
-                raidrec->parity_disks.entries);
-    }
-    fprintf(fout, "    persistent-superblock %d\n",
-            raidrec->persistent_superblock);
+        fprintf(fout, "    nr-parity-disks       %d\n", raidrec->parity_disks.entries);
+    }
+    fprintf(fout, "    persistent-superblock %d\n", raidrec->persistent_superblock);
     if (raidrec->chunk_size > -1) {
       fprintf(fout, "    chunk-size            %d\n", raidrec->chunk_size);
@@ -426 +422 @@
  * @return 0 if the line was read and stored successfully, 1 if we're at end of file.
  */
-int get_next_raidtab_line(FILE * fin, char *label, char *value)
+static int get_next_raidtab_line(FILE * fin, char **label, char **value)
 {
     char *incoming = NULL;
-    char *p;
+    char *p = NULL;
 
     assert(fin != NULL);
-    assert(label != NULL);
-    assert(value != NULL);
-
-    label[0] = value[0] = '\0';
+
     if (feof(fin)) {
         return (1);
     }
+
     for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
+        log_msg(10,"Found in raidtab line: %s",incoming);
         mr_strip_spaces(incoming);
         p = strchr(incoming, ' ');
@@ -450 +445 @@
             p++;
         }
-        strcpy(label, incoming);
-        strcpy(value, p);
-        mr_free(incoming);
+        *label = incoming;
+        *value = p;
+        log_msg(10,"Found in raidtab pair: %s|%s",*label,*value);
         return (0);
     }
-    mr_free(incoming);
     return (1);
 }
@@ -468 +462 @@
  */
 #ifdef __FreeBSD__
-int load_raidtab_into_raidlist(struct raidlist_itself *raidlist,
-                               char *fname)
+int load_raidtab_into_raidlist(struct raidlist_itself *raidlist, char *fname)
 {
     FILE *fin;
@@ -503 +496 @@
             if (get_option_state(argc, argv, "hotspare")) {
                 strcpy(raidlist->spares.el[raidlist->spares.entries].name, drivename);
-                strcpy(raidlist->spares.el[raidlist->spares.entries].  device, devname);
-                raidlist->spares.el[raidlist->spares.entries].index =
-                    raidlist->disks.entries;
+                strcpy(raidlist->spares.el[raidlist->spares.entries].device, devname);
+                raidlist->spares.el[raidlist->spares.entries].index = raidlist->disks.entries;
                 raidlist->spares.entries++;
             } else {
                 strcpy(raidlist->disks.el[raidlist->disks.entries].name, drivename);
                 strcpy(raidlist->disks.el[raidlist->disks.entries].device, devname);
-                raidlist->disks.el[raidlist->disks.entries].index =
-                    raidlist->disks.entries;
+                raidlist->disks.el[raidlist->disks.entries].index = raidlist->disks.entries;
                 raidlist->disks.entries++;
             }
@@ -593 +584 @@
     char *label = NULL;
     char *value = NULL;
-    int items;
-    int v;
+    int items = 0;
+    int v = 0;
 
     assert(raidlist != NULL);
@@ -608 +599 @@
         return (1);
     }
-    malloc_string(label);
-    malloc_string(value);
-    items = 0;
     log_it("Loading raidtab...");
-    get_next_raidtab_line(fin, label, value);
+    get_next_raidtab_line(fin, &label, &value);
     while (!feof(fin)) {
         log_msg(1, "Looking for raid record #%d", items);
@@ -621 +609 @@
             strcpy(raidlist->el[items].additional_vars.el[v].label, label);
             strcpy(raidlist->el[items].additional_vars.el[v].value, value);
+            mr_free(label);
             log_msg(2,"Found raidtab entry Label: %s Value: %s",raidlist->el[items].additional_vars.el[v].label,raidlist->el[items].additional_vars.el[v].value);
             v++;
-            get_next_raidtab_line(fin, label, value);
-        }
+            get_next_raidtab_line(fin, &label, &value);
+        }
+
         raidlist->el[items].additional_vars.entries = v;
         if (feof(fin)) {
@@ -632 +622 @@
         log_msg(2, "Record #%d (%s) found", items, value);
         strcpy(raidlist->el[items].raid_device, value);
-        for (get_next_raidtab_line(fin, label, value);
-             !feof(fin) && strcmp(label, "raiddev");
-             get_next_raidtab_line(fin, label, value)) {
+        mr_free(label);
+        for (get_next_raidtab_line(fin, &label, &value); !feof(fin) && strcmp(label, "raiddev"); get_next_raidtab_line(fin, &label, &value)) {
             process_raidtab_line(fin, &raidlist->el[items], label, value);
+            mr_free(label);
         }
         items++;
     }
+    mr_free(label);
     paranoid_fclose(fin);
     raidlist->entries = items;
     log_msg(1, "Raidtab loaded successfully.");
     log_msg(1, "%d RAID devices in raidtab", items);
-    paranoid_free(label);
-    paranoid_free(value);
     return (0);
 }
@@ -665 +654 @@
  */
 void
-process_raidtab_line(FILE * fin,
-                     struct raid_device_record *raidrec,
-                     char *label, char *value)
+process_raidtab_line(FILE * fin, struct raid_device_record *raidrec, char *label, char *value)
 {
 
     /*@ add mallocs * */
-    char *labelB;
-    char *valueB;
+    char *labelB = NULL;
+    char *valueB = NULL;
 
     struct list_of_disks *disklist;
@@ -678 +665 @@
     int v;
 
-    malloc_string(labelB);
-    malloc_string(valueB);
     assert(fin != NULL);
     assert(raidrec != NULL);
@@ -716 +701 @@
         log_msg(4,"Found raid parity %d",raidrec->parity);
     } else if (!strcmp(label, "device")) {
-        get_next_raidtab_line(fin, labelB, valueB);
+        get_next_raidtab_line(fin, &labelB, &valueB);
         if (!strcmp(labelB, "raid-disk")) {
             disklist = &raidrec->data_disks;
@@ -734 +719 @@
             add_disk_to_raid_device(disklist, value, index);
         }
+        mr_free(labelB);
     } else {
         v = raidrec->additional_vars.entries;
@@ -742 +728 @@
         raidrec->additional_vars.entries = v;
     }
-    paranoid_free(labelB);
-    paranoid_free(valueB);
 }
 #endif
@@ -755 +739 @@
  */
 void
-save_disklist_to_file(char *listname,
-                      struct list_of_disks *disklist, FILE * fout)
+save_disklist_to_file(char *listname, struct list_of_disks *disklist, FILE * fout)
 {
     int i;
@@ -765 +748 @@
 
     for (i = 0; i < disklist->entries; i++) {
-        fprintf(fout, "    device                %s\n",
-                disklist->el[i].device);
+        fprintf(fout, "    device                %s\n", disklist->el[i].device);
         fprintf(fout, "    %-21s %d\n", listname, disklist->el[i].index);
     }

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

@@ -182 +182 @@
         }
         /* Erase the end of the string if needed */
-        j++;
         in_out[j] = '\0';
     }

branches/3.2/mondo/test/test-mountlist.c

@@ -91 +91 @@
 mr_free(flaws_str);
 
-log_it("before check raidlist content");
-log_it("after check raidlist content");
+log_it("before write again raidlist content");
+save_raidlist_to_raidtab(raidlist, RAIDTAB_TEST".new");
+log_it("after write again raidlist content");
 
 log_it("before create mdadm dev");
+/*
 create_raid_device_via_mdadm(raidlist,"/dev/md0",FALSE);
 create_raid_device_via_mdadm(raidlist,"/dev/md1",FALSE);
+*/
 log_it("after create mdadm dev");