Changeset 2296 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-prep.c

Timestamp:

Jul 23, 2009, 2:53:30 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Replace sprintf by mr_asprintf in mondo-rstr-compare.c
• All mr_asprintf call should be on one line (for quality script) and use a string as second param
• Improve quality script

File:

• branches/2.2.10/mondo/src/mondorestore/mondo-prep.c (modified) (13 diffs)

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

@@ -79 +79 @@
         make_list_of_drives_in_mountlist(mountlist, drivelist);
         for (lino = 0; lino < drivelist->entries; lino++) {
-            mr_asprintf(&command,
-                    "dd if=%s bs=512 count=1 2> /dev/null | grep \"%s\"",
-                    drivelist->el[lino].device, MONDO_WAS_HERE);
+            mr_asprintf(&command, "dd if=%s bs=512 count=1 2> /dev/null | grep \"%s\"", drivelist->el[lino].device, MONDO_WAS_HERE);
             res = run_program_and_log_output(command, 1);
             mr_free(command);
@@ -260 +258 @@
         strcpy(vgremove_sz, "vgremove");
     }
-    mr_asprintf(&tmp1,
-            "for i in `%s | cut -d\"'\" -f2 | sort -r` ; do echo \"Shutting down lv $i\" >> %s ; %s -f $i; done", lvscan_sz, MONDO_LOGFILE, lvremove_sz);
+    mr_asprintf(&tmp1, "for i in `%s | cut -d\"'\" -f2 | sort -r` ; do echo \"Shutting down lv $i\" >> %s ; %s -f $i; done", lvscan_sz, MONDO_LOGFILE, lvremove_sz);
     run_program_and_log_output(tmp1, 5);
     mr_free(tmp1);
@@ -521 +518 @@
                             new_mountlist->entries++;
                         } else {
-                            mr_asprintf(&tmp,
-                                    "Not adding %s to mountlist: it's already there",
-                                    p);
+                            mr_asprintf(&tmp, "Not adding %s to mountlist: it's already there", p);
                             log_it(tmp);
                             mr_free(tmp);
@@ -647 +642 @@
     mr_asprintf(&strtmp, "%s", program);
     paranoid_free(program);
-    mr_asprintf(&program, "%s --spare-devices=%d", strtmp,
-         raidlist->el[i].spare_disks.entries);
+    mr_asprintf(&program, "%s --spare-devices=%d", strtmp, raidlist->el[i].spare_disks.entries);
     paranoid_free(strtmp);
   }
@@ -747 +741 @@
 
             /* format raid partition */
-            mr_asprintf(&program,
-                    "for plex in `vinum lv -r %s | grep '^P' | tr '\t' ' ' | tr -s ' ' | cut -d' ' -f2`; do echo $plex; done > /tmp/plexes", basename(device));
+            mr_asprintf(&program, "for plex in `vinum lv -r %s | grep '^P' | tr '\t' ' ' | tr -s ' ' | cut -d' ' -f2`; do echo $plex; done > /tmp/plexes", basename(device));
             system(program);
             if (g_fprep) {
@@ -914 +907 @@
 
     assert(mountlist != NULL);
-    mr_asprintf(&tmp, "format_everything (mountlist, interactively = %s",
-            (interactively) ? "true" : "false");
+    mr_asprintf(&tmp, "format_everything (mountlist, interactively = %s", (interactively) ? "true" : "false");
     log_it(tmp);
     mr_free(tmp);
@@ -943 +935 @@
             if (interactively) {
                 // ask user if we should format the current device
-                mr_asprintf(&tmp, "Shall I format %s (%s) ?", me->device,
-                        me->mountpoint);
+                mr_asprintf(&tmp, "Shall I format %s (%s) ?", me->device, me->mountpoint);
                 do_it = ask_me_yes_or_no(tmp);
                 mr_free(tmp);
@@ -1425 +1416 @@
     mr_free(command);
 
-    mr_asprintf(&command, "disklabel -R %s /tmp/disklabel",
-            canonical_name(drivename));
+    mr_asprintf(&command, "disklabel -R %s /tmp/disklabel", canonical_name(drivename));
     retval += run_program_and_log_output(command, TRUE);
     mr_free(command);
@@ -1571 +1561 @@
             file = open(drivename, O_WRONLY);
             if (file != -1) {
-                mr_asprintf(&tmp,
-                        "Warning - unable to open %s for wiping it's partition table",
-                        drivename);
+                mr_asprintf(&tmp, "Warning - unable to open %s for wiping it's partition table", drivename);
                 log_to_screen(tmp);
                 mr_free(tmp);
@@ -1580 +1568 @@
             for (i = 0; i < 512; i++) {
                 if (!write(file, "\0", 1)) {
-                    mr_asprintf(&tmp, "Warning - unable to write to %s",
-                            drivename);
+                    mr_asprintf(&tmp, "Warning - unable to write to %s", drivename);
                     log_to_screen(tmp);
                     mr_free(tmp);
@@ -1642 +1629 @@
     if (pout_to_fdisk) {
 // mark relevant partition as bootable
-        mr_asprintf(&tmp, "a\n%s\n",
-                call_program_and_get_last_line_of_output
-                ("make-me-bootable /tmp/mountlist.txt dummy"));
+        mr_asprintf(&tmp, "a\n%s\n", call_program_and_get_last_line_of_output("make-me-bootable /tmp/mountlist.txt dummy"));
         fput_string_one_char_at_a_time(pout_to_fdisk, tmp);
         mr_free(tmp);
@@ -1739 +1724 @@
 
     if (is_this_device_mounted(partition_name)) {
-        mr_asprintf(&tmp, "%s is mounted, and should not be partitioned",
-                partition_name);
+        mr_asprintf(&tmp, "%s is mounted, and should not be partitioned", partition_name);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -2050 +2034 @@
     } else {
         /* probably an image */
-        mr_asprintf(&tmp,
-                "Unknown format ('%s') - using supplied string anyway",
-                format);
+        mr_asprintf(&tmp, "Unknown format ('%s') - using supplied string anyway", format);
         mvaddstr_and_log_it(g_currentY++, 0, tmp);
         mr_free(tmp);