Changeset 2296 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-devices.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/common/libmondo-devices.c (modified) (12 diffs)

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

@@ -257 +257 @@
         mr_asprintf(&command, "cdcontrol -f %s close", dev);
     } else {
-        mr_asprintf(&command, "camcontrol load `echo %s | sed 's|/dev/||'`",
-                dev);
+        mr_asprintf(&command, "camcontrol load `echo %s | sed 's|/dev/||'`", dev);
     }
 #else
@@ -343 +342 @@
 #ifdef __FreeBSD__
     // We assume here that this is running from mondorestore. (It is.)
-    mr_asprintf(&program, "ls %s %s >/dev/null 2>&1", drive,
-            build_partition_name(tmp, drive, partno));
+    mr_asprintf(&program, "ls %s %s >/dev/null 2>&1", drive, build_partition_name(tmp, drive, partno));
     res = system(program);
     mr_free(program);
@@ -399 +397 @@
     assert_string_is_neither_NULL_nor_zerolength(str);
 
-    mr_asprintf(&command,
-            "dd if=%s bs=446 count=1 2> /dev/null | strings | grep \"%s\" > /dev/null 2> /dev/null",
-            dev, str);
+    mr_asprintf(&command, "dd if=%s bs=446 count=1 2> /dev/null | strings | grep \"%s\" > /dev/null 2> /dev/null", dev, str);
     i = system(command);
     mr_free(command);
@@ -425 +421 @@
     int i;
 
-    mr_asprintf(&command,
-            "dd if=%s bs=512 count=%i 2> /dev/null | strings | grep \"%s\" > /dev/null 2> /dev/null",
-            dev, n, str);
+    mr_asprintf(&command, "dd if=%s bs=512 count=%i 2> /dev/null | strings | grep \"%s\" > /dev/null 2> /dev/null", dev, n, str);
     i = system(command);
     mr_free(command);
@@ -530 +524 @@
     }
     if (find_home_of_exe(cdr_exe)) {
-        mr_asprintf(&command,
-                "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep CD | cut -d' ' -f2 | head -n1",
-                cdr_exe);
+        mr_asprintf(&command, "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep CD | cut -d' ' -f2 | head -n1", cdr_exe);
         mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
         mr_free(command);
@@ -848 +840 @@
     }
 
-    mr_asprintf(&command,
-            "%s -scanbus | grep \"[0-9],[0-9],[0-9]\" | grep \"[D|C][V|D]\" | grep -n \"\" | grep \"%s\" | cut -d':' -f2",
-            cdr_exe, g_cdrw_drive_is_here);
+    mr_asprintf(&command, "%s -scanbus | grep \"[0-9],[0-9],[0-9]\" | grep \"[D|C][V|D]\" | grep -n \"\" | grep \"%s\" | cut -d':' -f2", cdr_exe, g_cdrw_drive_is_here);
     log_msg(1, "command=%s", command);
     mr_asprintf(&tmp1, "%s", call_program_and_get_last_line_of_output(command));
@@ -1042 +1032 @@
 
 #ifdef __FreeBSD__
-    mr_asprintf(&command,
-            "lsvfs | tr -s '\t' ' ' | grep -v Filesys | grep -v -- -- | cut -d' ' -f1 | tr -s '\n' ' '");
+    mr_asprintf(&command, "lsvfs | tr -s '\t' ' ' | grep -v Filesys | grep -v -- -- | cut -d' ' -f1 | tr -s '\n' ' '");
 #else
-    mr_asprintf(&command,
-            "grep -v nodev /proc/filesystems | tr -s '\t' ' ' | cut -d' ' -f2 | tr -s '\n' ' '");
+    mr_asprintf(&command, "grep -v nodev /proc/filesystems | tr -s '\t' ' ' | cut -d' ' -f2 | tr -s '\n' ' '");
 #endif
 
@@ -1243 +1231 @@
 
 #ifdef __FreeBSD__
-    mr_asprintf(&command, "mount_vfat %s %s 2>> %s",
-            device, mountpoint, MONDO_LOGFILE);
+    mr_asprintf(&command, "mount_vfat %s %s 2>> %s", device, mountpoint, MONDO_LOGFILE);
 
 #else
-    mr_asprintf(&command, "mount %s -t vfat %s 2>> %s",
-            device, mountpoint, MONDO_LOGFILE);
+    mr_asprintf(&command, "mount %s -t vfat %s 2>> %s", device, mountpoint, MONDO_LOGFILE);
 #endif
 
@@ -1382 +1368 @@
         mr_free(tmp);
 
-        mr_asprintf(&tmp, "%s/%s/%s-%d.iso", bkpinfo->isodir,
-                bkpinfo->nfs_remote_dir, bkpinfo->prefix,
-                cd_number_i_want);
+        mr_asprintf(&tmp, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, cd_number_i_want);
         if (!does_file_exist(tmp)) {
             mr_free(tmp);
-            mr_asprintf(&tmp, "%s/isodir/%s/%s-%d.iso", bkpinfo->tmpdir,
-                    bkpinfo->nfs_remote_dir, bkpinfo->prefix,
-                    cd_number_i_want);
+            mr_asprintf(&tmp, "%s/isodir/%s/%s-%d.iso", bkpinfo->tmpdir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, cd_number_i_want);
             if (does_file_exist(tmp)) {
                 log_msg(1,
@@ -1550 +1532 @@
             mr_free(tmp);
 
-            mr_asprintf(&comment,
-                    "How much data (in Megabytes) will each %s store?", mds);
+            mr_asprintf(&comment, "How much data (in Megabytes) will each %s store?", mds);
             mr_free(mds);
             if (!popup_and_get_string("Size", comment, sz_size, 5)) {
@@ -1588 +1569 @@
                 log_msg(1, "bkpinfo->media_device = %s",
                         bkpinfo->media_device);
-                mr_asprintf(&comment,
-                        "Please specify your %s drive's /dev entry", mds);
+                mr_asprintf(&comment, "Please specify your %s drive's /dev entry", mds);
                 if (!popup_and_get_string
                     ("Device?", comment, bkpinfo->media_device,
@@ -1761 +1741 @@
 
             if (!bkpinfo->restore_data) {
-                mr_asprintf(&comment,
-                    "How much data (in Megabytes) will each media store?");
+                mr_asprintf(&comment, "How much data (in Megabytes) will each media store?");
                 if (!popup_and_get_string("Size", comment, sz_size, 5)) {
                     mr_free(comment);