Changeset 2296 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.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-rstr-tools.c (modified) (17 diffs)

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -368 +368 @@
         log_msg(3, "Mommm! SME is being a dildo!");
     } else {
-        mr_asprintf(&mountpoint, mpt);
+        mr_asprintf(&mountpoint, "%s", mpt);
     }
 
@@ -408 +408 @@
         mr_free(command);
 
-        mr_asprintf(&command, "mount -t %s %s %s %s 2>> %s", format, device,
-                additional_parameters, mountdir, MONDO_LOGFILE);
+        mr_asprintf(&command, "mount -t %s %s %s %s 2>> %s", format, device, additional_parameters, mountdir, MONDO_LOGFILE);
         log_msg(2, "command='%s'", command);
     }
@@ -418 +417 @@
         log_msg(1, "Re-trying without the fancy extra parameters");
         mr_free(command);
-        mr_asprintf(&command, "mount -t %s %s %s 2>> %s", format, device,
-            mountdir, MONDO_LOGFILE);
+        mr_asprintf(&command, "mount -t %s %s %s 2>> %s", format, device, mountdir, MONDO_LOGFILE);
         res = run_program_and_log_output(command, TRUE);
     }
@@ -497 +495 @@
                 "Again with the /proc - why is this in your mountlist?");
         } else if (is_this_device_mounted(mountlist->el[lino].device)) {
-            mr_asprintf(&tmp, "%s is already mounted",
-                mountlist->el[lino].device);
+            mr_asprintf(&tmp, "%s is already mounted", mountlist->el[lino].device);
             log_to_screen(tmp);
             mr_free(tmp);
@@ -607 +604 @@
         mr_asprintf(&mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
 #else
-        mr_asprintf(&mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->nfs_remote_dir,
-            bkpinfo->prefix, g_current_media_number, MNT_CDROM);
+        mr_asprintf(&mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
 #endif
 
@@ -619 +615 @@
         mr_asprintf(&mount_cmd, "mount_cd9660 -r %s %s", mddev, MNT_CDROM);
 #else
-        mr_asprintf(&mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s",
-            bkpinfo->isodir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
+        mr_asprintf(&mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
 #endif
     } else if (bkpinfo->backup_media_type == usb) {
@@ -1101 +1096 @@
     unlink(FILELIST_FULL_STUB);
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        mr_asprintf(&command, "tar -b %ld -zxf %s ./%s ./%s ./%s ./%s ./%s",
-            bkpinfo->internal_tape_block_size,
-            bkpinfo->media_device,
-            MOUNTLIST_FNAME_STUB,
-            BIGGIELIST_TXT_STUB,
-            FILELIST_FULL_STUB,
-            IWANTMYLVM_STUB,
-            MONDO_CFG_FILE_STUB);
+        mr_asprintf(&command, "tar -b %ld -zxf %s ./%s ./%s ./%s ./%s ./%s", bkpinfo->internal_tape_block_size, bkpinfo->media_device, MOUNTLIST_FNAME_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB, MONDO_CFG_FILE_STUB);
         log_msg(1, "tarcommand = %s", command);
         run_program_and_log_output(command, 1);
@@ -1116 +1104 @@
             /* Doing that allow us to remain compatible with pre-2.2.5 versions */
             log_msg(2, "pre-2.2.4 compatible mode on");
-            mr_asprintf(&command,
-                "tar -b %ld -zxf %s %s %s %s %s %s",
-                bkpinfo->internal_tape_block_size,
-                bkpinfo->media_device,
-                MOUNTLIST_FNAME_STUB,
-                BIGGIELIST_TXT_STUB,
-                FILELIST_FULL_STUB,
-                IWANTMYLVM_STUB,
-                MONDO_CFG_FILE_STUB);
+            mr_asprintf(&command, "tar -b %ld -zxf %s %s %s %s %s %s", bkpinfo->internal_tape_block_size, bkpinfo->media_device, MOUNTLIST_FNAME_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB, MONDO_CFG_FILE_STUB);
             log_msg(1, "tarcommand = %s", command);
             run_program_and_log_output(command, 1);
@@ -1136 +1116 @@
         log_msg(2, "Back from iotcn");
         run_program_and_log_output("mount", 1);
-        mr_asprintf(&command,
-            "tar -zxf %s/images/all.tar.gz ./%s ./%s ./%s ./%s ./%s",
-            MNT_CDROM,
-            MOUNTLIST_FNAME_STUB,
-            BIGGIELIST_TXT_STUB,
-            FILELIST_FULL_STUB,
-            IWANTMYLVM_STUB,
-            MONDO_CFG_FILE_STUB);
+        mr_asprintf(&command, "tar -zxf %s/images/all.tar.gz ./%s ./%s ./%s ./%s ./%s", MNT_CDROM, MOUNTLIST_FNAME_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB, MONDO_CFG_FILE_STUB);
 
         log_msg(1, "tarcommand = %s", command);
@@ -1152 +1125 @@
             /* Doing that allow us to remain compatible with pre-2.2.5 versions */
             log_msg(2, "pre-2.2.4 compatible mode on");
-            mr_asprintf(&command,
-                "tar -zxf %s/images/all.tar.gz %s %s %s %s %s",
-                MNT_CDROM,
-                MOUNTLIST_FNAME_STUB,
-                BIGGIELIST_TXT_STUB,
-                FILELIST_FULL_STUB,
-                IWANTMYLVM_STUB,
-                MONDO_CFG_FILE_STUB);
+            mr_asprintf(&command, "tar -zxf %s/images/all.tar.gz %s %s %s %s %s", MNT_CDROM, MOUNTLIST_FNAME_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB, MONDO_CFG_FILE_STUB);
 
             log_msg(1, "tarcommand = %s", command);
@@ -1195 +1161 @@
     &&
     ask_me_yes_or_no("Do you want to retrieve the mountlist as well?")) {
-        mr_asprintf(&command, "ln -sf %s/%s /tmp", MOUNTLIST_FNAME_STUB,
-            bkpinfo->tmpdir);
+        mr_asprintf(&command, "ln -sf %s/%s /tmp", MOUNTLIST_FNAME_STUB, bkpinfo->tmpdir);
         paranoid_system(command);
         mr_free(command);
@@ -1225 +1190 @@
             mr_free(command);
         }
-        mr_asprintf(&command, "grep -E '^/dev/.*' %s > %s",
-                g_biggielist_txt, g_filelist_imagedevs);
+        mr_asprintf(&command, "grep -E '^/dev/.*' %s > %s", g_biggielist_txt, g_filelist_imagedevs);
         paranoid_system(command);
         mr_free(command);
@@ -2044 +2008 @@
                             "Well, I know a certain kitty-kitty who'll be sleeping with Mommy tonight...");
                 } else {
-                    mr_asprintf(&command, "umount " MNT_RESTORING "%s",
-                            mountlist->el[lino].mountpoint);
+                    mr_asprintf(&command, "umount " MNT_RESTORING "%s", mountlist->el[lino].mountpoint);
 
                     /* To support latest Ubuntu where /var is a separate FS 
@@ -2112 +2075 @@
     }
 
-    mr_asprintf(&command,
-            "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx ./%s ./%s ./%s ./%s ./%s",
-            dev,
-            bkpinfo->internal_tape_block_size,
-            1024L * 1024 * 32 / bkpinfo->internal_tape_block_size,
-            MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB,
-            BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);
+    mr_asprintf(&command, "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx ./%s ./%s ./%s ./%s ./%s", dev, bkpinfo->internal_tape_block_size, 1024L * 1024 * 32 / bkpinfo->internal_tape_block_size, MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);
     log_msg(2, "command = '%s'", command);
     res = run_program_and_log_output(command, -1);
@@ -2129 +2086 @@
             /* Doing that allow us to remain compatible with pre-2.2.5 versions */
             log_msg(2, "pre-2.2.4 compatible mode on");
-            mr_asprintf(&command,
-                    "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx %s %s %s %s %s",
-                    dev,
-                    bkpinfo->internal_tape_block_size,
-                    1024L * 1024 * 32 / bkpinfo->internal_tape_block_size,
-                    MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB,
-                    BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);
+            mr_asprintf(&command, "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx %s %s %s %s %s", dev, bkpinfo->internal_tape_block_size, 1024L * 1024 * 32 / bkpinfo->internal_tape_block_size, MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);
             log_msg(2, "command = '%s'", command);
             res = run_program_and_log_output(command, -1);
@@ -2226 +2177 @@
                 log_msg(2, "media_device is blank; assuming %s");
             }
-            mr_asprintf(&tmp, bkpinfo->media_device);
+            mr_asprintf(&tmp, "%s", bkpinfo->media_device);
             if (extract_cfg_file_and_mountlist_from_tape_dev
                 (bkpinfo->media_device)) {
@@ -2335 +2286 @@
             /* Is this code really useful ??? */
         if (extract_mountlist_stub) {
-            mr_asprintf(&command, "cp -f %s %s/%s", MOUNTLIST_FNAME_STUB,
-                    bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
+            mr_asprintf(&command, "cp -f %s %s/%s", MOUNTLIST_FNAME_STUB, bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
             run_program_and_log_output(command, FALSE);
             mr_free(command);