Changeset 3185 in MondoRescue for branches/3.0/mondo/src/mondorestore/mondo-prep.c

Timestamp:

Sep 20, 2013, 2:29:57 PM (11 years ago)

Author:

Bruno Cornec

Message:

Simplify the interface of mr_getline and mr_asprintf. With 3.1 compatibility now will allow backports from this branch into 3.0

File:

• branches/3.0/mondo/src/mondorestore/mondo-prep.c (modified) (21 diffs)

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

@@ -335 +335 @@
             log_it("%s... so I'll get creative.", tmp);
             if (lvmversion == 2) {
-                mr_asprintf(&tmp1, "tail -n5 %s | grep Insufficient | tail -n1", MONDO_LOGFILE);
+                mr_asprintf(tmp1, "tail -n5 %s | grep Insufficient | tail -n1", MONDO_LOGFILE);
                 strcpy(tmp, call_program_and_get_last_line_of_output(tmp1));
                 free(tmp1);
             } else {
-                mr_asprintf(&tmp1, "tail -n5 %s | grep lvcreate | tail -n1", MONDO_LOGFILE);
+                mr_asprintf(tmp1, "tail -n5 %s | grep lvcreate | tail -n1", MONDO_LOGFILE);
                 strcpy(tmp, call_program_and_get_last_line_of_output(tmp1));
                 free(tmp1);
@@ -586 +586 @@
     // create device list from normal disks followed by spare ones
     if (raidlist->el[i].data_disks.el[0].device != NULL) {
-        mr_asprintf(&devices, "%s", raidlist->el[i].data_disks.el[0].device);
+        mr_asprintf(devices, "%s", raidlist->el[i].data_disks.el[0].device);
         log_msg(4, "Adding device %s to list", raidlist->el[i].data_disks.el[0].device);
     } else {
@@ -602 +602 @@
     // translate RAID level
     if (raidlist->el[i].raid_level == -2) {
-      mr_asprintf(&level, "multipath");
+      mr_asprintf(level, "multipath");
     } else if (raidlist->el[i].raid_level == -1) {
-      mr_asprintf(&level, "linear");
+      mr_asprintf(level, "linear");
     } else {
-      mr_asprintf(&level, "raid%d", raidlist->el[i].raid_level);
+      mr_asprintf(level, "raid%d", raidlist->el[i].raid_level);
     }
     // create RAID device:
@@ -614 +614 @@
     // - persistent superblock always used as this is recommended
 
-    mr_asprintf(&program, "mdadm --create --force --run --auto=yes %s --level=%s --raid-devices=%d", raidlist->el[i].raid_device, level, raidlist->el[i].data_disks.entries);
+    mr_asprintf(program, "mdadm --create --force --run --auto=yes %s --level=%s --raid-devices=%d", raidlist->el[i].raid_device, level, raidlist->el[i].data_disks.entries);
     mr_free(level);
     log_msg(4, "cmd built: %s", program);
@@ -718 +718 @@
 
     if (strstr(format, "raid")) {   // do not form RAID disks; do it to /dev/md* instead
-        mr_asprintf(&tmp, "Not formatting %s (it is a RAID disk)", device);
+        mr_asprintf(tmp, "Not formatting %s (it is a RAID disk)", device);
         log_it(tmp);
         paranoid_free(tmp);
@@ -733 +733 @@
 #endif
     if (strlen(format) <= 2) {
-        mr_asprintf(&tmp, "%s has a really small format type ('%s') - this is probably a hexadecimal string, which would suggest the partition is an image --- I shouldn't format it", device, format);
+        mr_asprintf(tmp, "%s has a really small format type ('%s') - this is probably a hexadecimal string, which would suggest the partition is an image --- I shouldn't format it", device, format);
         log_it(tmp);
         paranoid_free(tmp);
@@ -740 +740 @@
     }
     if (is_this_device_mounted(device)) {
-        mr_asprintf(&tmp, "%s is mounted - cannot format it      ", device);
+        mr_asprintf(tmp, "%s is mounted - cannot format it       ", device);
         log_to_screen(tmp);
         paranoid_free(tmp);
@@ -771 +771 @@
             char line[MAX_STR_LEN];
 
-            mr_asprintf(&tmp, "Initializing Vinum device %s (this may take a *long* time)", device);
+            mr_asprintf(tmp, "Initializing Vinum device %s (this may take a *long* time)", device);
             log_to_screen(tmp);
             paranoid_free(tmp);
@@ -789 +789 @@
                     *(strchr(line, '\n')) = '\0';   // get rid of the \n on the end
 
-                mr_asprintf(&tmp, "Initializing plex: %s", line);
+                mr_asprintf(tmp, "Initializing plex: %s", line);
                 open_evalcall_form(tmp);
                 paranoid_free(tmp);
 
-                mr_asprintf(&tmp, "vinum init %s", line);
+                mr_asprintf(tmp, "vinum init %s", line);
                 paranoid_system(tmp);
                 paranoid_free(tmp);
 
                 while (1) {
-                    mr_asprintf(&tmp, "vinum lp -r %s | grep '^S' | head -1 | tr -s ' ' | cut -d: -f2 | cut -f1 | sed 's/^ //' | sed 's/I //' | sed 's/%%//'", line);
+                    mr_asprintf(tmp, "vinum lp -r %s | grep '^S' | head -1 | tr -s ' ' | cut -d: -f2 | cut -f1 | sed 's/^ //' | sed 's/I //' | sed 's/%%//'", line);
                     FILE *pin = popen(tmp, "r");
                     paranoid_free(tmp);
@@ -820 +820 @@
         }
 #else
-        mr_asprintf(&tmp, "Initializing RAID device %s", device);
+        mr_asprintf(tmp, "Initializing RAID device %s", device);
         log_to_screen(tmp);
         paranoid_free(tmp);
@@ -871 +871 @@
     }
     res = which_format_command_do_i_need(format, program);
-    mr_asprintf(&tmp, "%s %s", program, device);
+    mr_asprintf(tmp, "%s %s", program, device);
     if (strstr(program, "kludge")) {
         mr_strcat(tmp, " /");
@@ -878 +878 @@
     paranoid_free(tmp);
 
-    mr_asprintf(&tmp, "Formatting %s as %s", device, format);
+    mr_asprintf(tmp, "Formatting %s as %s", device, format);
     update_progress_form(tmp);
     paranoid_free(tmp);
@@ -892 +892 @@
 
     if (res && strstr(program, "kludge")) {
-        mr_asprintf(&tmp, "Kludge failed; using regular mkfs.%s to format %s",
+        mr_asprintf(tmp, "Kludge failed; using regular mkfs.%s to format %s",
                 format, device);
 #ifdef __FreeBSD__
@@ -1705 +1705 @@
         paranoid_system(tmp);
         // mark relevant partition as bootable
-        mr_asprintf(&tmp1,"make-me-bootable /tmp/mountlist.txt %s",drivename);
+        mr_asprintf(tmp1,"make-me-bootable /tmp/mountlist.txt %s",drivename);
         call_program_and_get_last_line_of_output(tmp1);
         mr_free(tmp1);
@@ -1817 +1817 @@
     /* BERLIOS: should not be called each time */
     part_table_fmt = which_partition_format(drive);
-    mr_asprintf(&output, "");
+    mr_asprintf(output, "");
     /* make it a primary/extended/logical */
     if (partno <= 4) {
@@ -2169 +2169 @@
             fput_string_one_char_at_a_time(pout_to_fdisk, "p\n");
         } else {
-            mr_asprintf(&output, "t\n%d\n%s\nw\n", partno, partcode);
+            mr_asprintf(output, "t\n%d\n%s\nw\n", partno, partcode);
             sprintf(command, "parted2fdisk %s >> %s 2>> %s", drive,
                     MONDO_LOGFILE, MONDO_LOGFILE);
@@ -2519 +2519 @@
         return;
     }
-    mr_asprintf(&tmp, "Expanding entries to suit drive %s (%lld MB)", drive_name, current_size_of_drive / 1024);
+    mr_asprintf(tmp, "Expanding entries to suit drive %s (%lld MB)", drive_name, current_size_of_drive / 1024);
     log_to_screen(tmp);
     mr_free(tmp);
@@ -2539 +2539 @@
 
     if (original_size_of_drive <= 0LL) {
-        mr_asprintf(&tmp, "Cannot resize %s's entries. Drive not found.", drive_name);
+        mr_asprintf(tmp, "Cannot resize %s's entries. Drive not found.", drive_name);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -2545 +2545 @@
     }
     factor = ((float)current_size_of_drive/(float)original_size_of_drive);
-    mr_asprintf(&tmp, "Disk %s was %lld MB; is now %lld MB; Proportionally resizing partitions (factor ~= %.5f)",
+    mr_asprintf(tmp, "Disk %s was %lld MB; is now %lld MB; Proportionally resizing partitions (factor ~= %.5f)",
             drive_name, original_size_of_drive/1024, current_size_of_drive/1024, factor);
     log_to_screen(tmp);
@@ -2572 +2572 @@
         totalsizL += newsizL;
 
-        mr_asprintf(&tmp, "Changing %s from %lld KB to %lld KB", drivemntlist->el[partno]->device, drivemntlist->el[partno]->size, newsizL);
+        mr_asprintf(tmp, "Changing %s from %lld KB to %lld KB", drivemntlist->el[partno]->device, drivemntlist->el[partno]->size, newsizL);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -2579 +2579 @@
     // Ensures over-allocation alert and prompt for interactive mode does not happen
     if (totalsizL > current_size_of_drive) {
-        mr_asprintf(&tmp, "Last partition size calculated would be over-allocated, reducing %s from %lld KB to %lld KB.", drivemntlist->el[lastpart]->device, drivemntlist->el[lastpart]->size, drivemntlist->el[lastpart]->size - (totalsizL - current_size_of_drive));
+        mr_asprintf(tmp, "Last partition size calculated would be over-allocated, reducing %s from %lld KB to %lld KB.", drivemntlist->el[lastpart]->device, drivemntlist->el[lastpart]->size, drivemntlist->el[lastpart]->size - (totalsizL - current_size_of_drive));
         drivemntlist->el[drivemntlist->entries-1]->size -= (totalsizL - current_size_of_drive);
     } else if (totalsizL < current_size_of_drive) {
-        mr_asprintf(&tmp, "Last partition size calculated would be under-allocated, increasing %s from %lld KB to %lld KB.",drivemntlist->el[lastpart]->device, drivemntlist->el[lastpart]->size, drivemntlist->el[lastpart]->size + (current_size_of_drive - totalsizL));
+        mr_asprintf(tmp, "Last partition size calculated would be under-allocated, increasing %s from %lld KB to %lld KB.",drivemntlist->el[lastpart]->device, drivemntlist->el[lastpart]->size, drivemntlist->el[lastpart]->size + (current_size_of_drive - totalsizL));
         drivemntlist->el[drivemntlist->entries-1]->size += (current_size_of_drive - totalsizL);
     }
     log_to_screen(tmp);
     mr_free(tmp);
-    mr_asprintf(&tmp, "final_size = %lld MB", current_size_of_drive / 1024);
+    mr_asprintf(tmp, "final_size = %lld MB", current_size_of_drive / 1024);
     log_to_screen(tmp);
     mr_free(tmp);