Changeset 2235 in MondoRescue

Timestamp:

Jun 19, 2009, 6:05:10 PM (16 years ago)

Author:

Bruno Cornec

Message:

r3132@localhost: bruno | 2009-06-19 16:10:49 +0200
Ads a test infrastruture for mountlist nd truncname

Location:

branches/2.2.9/mondo

Files:

• src/common/libmondo-mountlist.c (modified) (3 diffs)
• test/mountlist-simple.txt (added)
• test/test-mountlist.c (modified) (1 diff)
• test/test-truncname.c (added)

branches/2.2.9/mondo/src/common/libmondo-mountlist.c

@@ -537 +537 @@
             paranoid_free(tmp);
         } else {
+            log_msg(8, "Evaluating drive #%d (%s) within mountlist", i, drivelist->el[i].device);
             if ((tmp = evaluate_drive_within_mountlist(mountlist, drivelist->el[i].device)) == NULL) {
                 res++;
@@ -686 +687 @@
         }
         if (j == noof_drives) {
-            strcpy(drivelist->el[noof_drives++].device, truncdrive);
+            log_msg(8,"Adding drive %s to list", drivelist->el[noof_drives].device[63]);
+            strncpy(drivelist->el[noof_drives].device, drive, 63);
+            drivelist->el[noof_drives].device[63] = '\0';
+            noof_drives++;
             drivelist->el[noof_drives++].device[63] = '\0';
         }
@@ -693 +697 @@
     }
     drivelist->entries = noof_drives;
-    log_msg(8, "Made list of drives");
+    log_msg(8, "Made list of %d drives",noof_drives);
 
     return (noof_drives);

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

@@ -87 +87 @@
 ret = evaluate_mountlist(mountlist, tmpA, tmpB, tmpC);
 log_it("after evaluate_mountlist");
+
+mr_free(MONDO_LOGFILE);
 exit(0);
 }