Changeset 3576 in MondoRescue

Timestamp:

Apr 28, 2016, 12:52:19 AM (8 years ago)

Author:

Bruno Cornec

Message:

• Fix a bug for tape usage in interactive mode (wrong printf string)
• Improve fdisk version usage by removing letters to allow vnumber comparison

Location:

branches/3.2

Files:

• mindi/mr-parted2fdisk (modified) (1 diff)
• mondo/src/common/libmondo-devices.c (modified) (1 diff)

branches/3.2/mindi/mr-parted2fdisk

@@ -233 +233 @@
     $maj++;
 }
+# Remove potential remaining letters
+$maj =~ s/[a-z]+//;
+
 if ((defined $min) && ($min =~ /-pre/)) {
     $min =~ s/-pre.*$//;
     $min++;
 }
+$min =~ s/[a-z]+//;
 
 # Check partition table type

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

@@ -2383 +2383 @@
         mr_free(tmp);
 
-        mr_asprintf(sz_size,"%l",bkpinfo->internal_tape_block_size);
+        mr_asprintf(sz_size,"%ld",bkpinfo->internal_tape_block_size);
         tmp = mr_popup_and_get_string("Tape block size?", "What is the block size of your tape streamer?", sz_size);
         if (tmp == NULL) {