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

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

@@ -610 +610 @@
 
         log_it("isodir = %s", bkpinfo->isodir);
-        mr_asprintf(&command, "df -P %s | tail -n1 | cut -d' ' -f1",
-                bkpinfo->isodir);
+        mr_asprintf(&command, "df -P %s | tail -n1 | cut -d' ' -f1", bkpinfo->isodir);
         log_it("command = %s", command);
         log_it("res of it = %s", call_program_and_get_last_line_of_output(command));
@@ -911 +910 @@
             ("ln -sf `which mkfs.msdos` /sbin/mkfs.vfat", FALSE);
     }
-    mr_asprintf(&tmp, "%s",
-           call_program_and_get_last_line_of_output
-           ("free | grep Mem | head -n1 | tr -s ' ' '\t' | cut -f2"));
+    mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output("free | grep Mem | head -n1 | tr -s ' ' '\t' | cut -f2"));
     if (atol(tmp) < 35000) {
         retval++;
@@ -984 +981 @@
     run_program_and_log_output
         ("umount `mount | grep cdr | cut -d' ' -f3 | tr '\n' ' '`", 5);
-    mr_asprintf(&tmp, "%s",
-           call_program_and_get_last_line_of_output
-           ("mount | grep -E \"cdr(om|w)\""));
+    mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output("mount | grep -E \"cdr(om|w)\""));
     if (strcmp("", tmp)) {
         if (strstr(tmp, "autofs")) {
@@ -1067 +1062 @@
     assert_string_is_neither_NULL_nor_zerolength(label);
     if (!does_file_exist(config_file)) {
-        mr_asprintf(&tmp, "(read_cfg_var) Cannot find %s config file",
-                config_file);
+        mr_asprintf(&tmp, "(read_cfg_var) Cannot find %s config file", config_file);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -1078 +1072 @@
         return (0);
     } else {
-        mr_asprintf(&command, "grep '%s .*' %s| cut -d' ' -f2,3,4,5",
-                label, config_file);
+        mr_asprintf(&command, "grep '%s .*' %s| cut -d' ' -f2,3,4,5", label, config_file);
         strcpy(value, call_program_and_get_last_line_of_output(command));
         mr_free(command);
@@ -1207 +1200 @@
     g_boot_mountpt[0] = '\0';
     log_msg(4, "Done. Great. Seeting command to something");
-    mr_asprintf(&command, "%s",
-           "grep -v \":\" /etc/fstab | grep -vE '^#.*$' | grep -E \"[   ]/boot[     ]\" | tr -s ' ' '\t' | cut -f1 | head -n1");
+    mr_asprintf(&command, "grep -v \":\" /etc/fstab | grep -vE '^#.*$' | grep -E \"[    ]/boot[     ]\" | tr -s ' ' '\t' | cut -f1 | head -n1");
     log_msg(4, "Cool. Command = '%s'", command);
     mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
@@ -1218 +1210 @@
         mr_asprintf(&command, "mount | grep -Ew '/boot'");
         mr_free(tmp);
-        mr_asprintf(&tmp, call_program_and_get_last_line_of_output(command));
+        mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
         mr_free(command);
 
@@ -1235 +1227 @@
                     strcpy(g_boot_mountpt, tmp);
                     mr_free(tmp);
-                    mr_asprintf(&tmp,
-                            "%s (your /boot partition) is not mounted. I'll mount it before backing up",
-                            g_boot_mountpt);
+                    mr_asprintf(&tmp, "%s (your /boot partition) is not mounted. I'll mount it before backing up", g_boot_mountpt);
                     log_it(tmp);
                     mr_free(tmp);
@@ -1304 +1294 @@
     assert(value != NULL);
     if (!does_file_exist(config_file)) {
-        mr_asprintf(&tmp, "(write_cfg_file) Cannot find %s config file",
-                config_file);
+        mr_asprintf(&tmp, "(write_cfg_file) Cannot find %s config file", config_file);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -1312 +1301 @@
     mr_asprintf(&tempfile, "%s/mojo-jojo.blah", bkpinfo->tmpdir);
     if (does_file_exist(config_file)) {
-        mr_asprintf(&command, "grep -vE '^%s .*$' %s > %s",
-                label, config_file, tempfile);
+        mr_asprintf(&command, "grep -vE '^%s .*$' %s > %s", label, config_file, tempfile);
         paranoid_system(command);
         mr_free(command);