Changeset 2125 in MondoRescue for branches/2.2.8

Timestamp:

Jan 14, 2009, 3:50:19 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Changes the way to compute original_size_of_drive in mondo-prep.c to correspond to the way it's done in libmondo-mountlist.c, and thus avoiding aborting nuje mode for 2 MB (which could come from adjustements in computation)

Location:

branches/2.2.8/mondo/src

Files:

• common/libmondo-mountlist.c (modified) (4 diffs)
• common/libmondo-string.c (modified) (1 diff)
• mondorestore/mondo-prep.c (modified) (5 diffs)
• mondorestore/mondo-rstr-newt.c (modified) (4 diffs)

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

@@ -151 +151 @@
                 res++;
             }
-            amount_allocated += mountlist->el[pos].size / 1024;
+            amount_allocated += mountlist->el[pos].size / 1024L;
             prev_sp_no = cur_sp_no;
         }
@@ -304 +304 @@
                     res++;
                 }
-                amount_allocated += mountlist->el[pos].size / 1024;
+                amount_allocated += mountlist->el[pos].size / 1024L;
                 prev_sp_no = cur_sp_no;
             }
@@ -310 +310 @@
 
         /* OK, continue with main loop */
-        amount_allocated += mountlist->el[pos].size / 1024;
+        amount_allocated += mountlist->el[pos].size / 1024L;
         prev_part_no = curr_part_no;
     }
@@ -459 +459 @@
         }
         /* OK, continue with main loop */
-        amount_allocated += mountlist->el[pos].size / 1024;
+        amount_allocated += mountlist->el[pos].size / 1024L;
         prev_part_no = curr_part_no;
     }

branches/2.2.8/mondo/src/common/libmondo-string.c

@@ -401 +401 @@
     sprintf(output, "%-24s %-24s %-10s %8lld", mountlist->el[lino].device,
             mountlist->el[lino].mountpoint, mountlist->el[lino].format,
-            mountlist->el[lino].size / 1024);
+            mountlist->el[lino].size / 1024L);
     return (output);
 }

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

@@ -2457 +2457 @@
 
     /** long *************************************************************/
-    long newsizL;
+    long newsizL = 0L;
     long current_size_of_drive = 0L;
     long original_size_of_drive = 0L;
-    long final_size;            /* all in Megabytes */
+    long final_size = 0L;           /* all in Megabytes */
     struct mountlist_reference *drivemntlist;
 
@@ -2479 +2479 @@
     }
 
-    /*
-       sprintf (tmp, "cp -f %s %s.pre-resize", g_mountlist_fname, g_mountlist_fname);
-       run_program_and_log_output (tmp, FALSE);
-     */
-
     current_size_of_drive = get_phys_size_of_drive(drive_name);
 
@@ -2505 +2500 @@
 
     for (partno = 0; partno < drivemntlist->entries; partno++) {
-        original_size_of_drive += drivemntlist->el[partno]->size;
-    }
-    original_size_of_drive = original_size_of_drive / 1024;
+        if (drivemntlist->el[partno]->size > 0) {
+            original_size_of_drive += (drivemntlist->el[partno]->size / 1024L);
+        }
+    }
 
     if (original_size_of_drive <= 0) {
@@ -2540 +2536 @@
             newsizL = (long) new_size;
         }
+
+        /* Do not apply the factor if partition was of negative size */
+        if (newsizL < 0) {
+            newsizL = drivemntlist->el[partno]->size;
+        }
+
         sprintf(tmp, "Changing %s from %lld KB to %ld KB",
                 drivemntlist->el[partno]->device,
@@ -2548 +2550 @@
     final_size = get_phys_size_of_drive(drive_name);
     sprintf(tmp, "final_size = %ld MB", final_size);
+    log_to_screen(tmp);
     paranoid_free(tmp);
-    log_to_screen(tmp);
 }
 

branches/2.2.8/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -241 +241 @@
     strcpy(mountlist->el[currline].mountpoint, mountpoint_str);
     strcpy(mountlist->el[currline].format, format_str);
-    mountlist->el[currline].size = atol(size_str) * 1024;
+    mountlist->el[currline].size = atol(size_str) * 1024L;
     mountlist->entries++;
     if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)) {
@@ -1194 +1194 @@
     strcpy(mountpt_used_to_be, mountlist->el[currline].mountpoint);
     strcpy(format_str, mountlist->el[currline].format);
-    sprintf(size_str, "%lld", mountlist->el[currline].size / 1024);
+    sprintf(size_str, "%lld", mountlist->el[currline].size / 1024L);
     newtOpenWindow(20, 5, 48, 10, "Edit entry");
     label0 = newtLabel(2, 1, "Device:");
@@ -1297 +1297 @@
                                        mountlist->el[currline].device);
         } else {
-            mountlist->el[currline].size = atol(size_str) * 1024;
+            mountlist->el[currline].size = atol(size_str) * 1024L;
         }
     }
@@ -2506 +2506 @@
         sprintf(tmp, "%-22s %8lld",
                 unallocated_raid_partitions->el[i].device,
-                unallocated_raid_partitions->el[i].size / 1024);
+                unallocated_raid_partitions->el[i].size / 1024L);
         newtListboxAppendEntry(listbox, tmp, keylist[i]);
     }