Changeset 2011 in MondoRescue for branches/2.2.7/mondo/src/common/libmondo-cli.c

Timestamp:

Aug 11, 2008, 2:46:00 PM (16 years ago)

Author:

Bruno Cornec

Message:

Fix warnings and errors in previous libmondo-cli.c patch

File:

• branches/2.2.7/mondo/src/common/libmondo-cli.c (modified) (5 diffs)

branches/2.2.7/mondo/src/common/libmondo-cli.c

@@ -625 +625 @@
             /* It's not swap. See if we can find the mount point from the mount command. */
             asprintf(&command, "mount 2>/dev/null | awk '{if((NF>0)&&($1==\"%s\")){print $3}}'", partitions[i]);
-            sprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
+            asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
             paranoid_free(command);
             if (strlen(tmp)) {
@@ -682 +682 @@
                          *******/
                         paranoid_free(mount_list);
-                        asprintf(&command,
+                        asprintf(&command, "%s",
                             "cat /proc/mdstat|grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
                         log_msg (5, "Running: %s", command);
@@ -724 +724 @@
              ********/
             log_msg (5, "It's not swap, mounted, or LVM. See if it's used in a software raid device.");
-            asprintf(command, "mdadm --examine %s 2>/dev/null | awk '{if($1 == \"UUID\"){print $3}}'", partitions[i]);
+            asprintf(&command, "mdadm --examine %s 2>/dev/null | awk '{if($1 == \"UUID\"){print $3}}'", partitions[i]);
             log_msg(4, "  Running: %s", command);
             asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(command));
@@ -735 +735 @@
             log_msg (5, "  UUID: %s", tmp);
             /* Get the Software raid device list */
-            asprintf(&command,
+            asprintf(&command, "%s",
              "cat /proc/mdstat|grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
             log_msg (5, "  Running: %s", command);
@@ -1222 +1222 @@
                 if (strlen(mounted_on_dsf)) {
                     log_to_screen("Excluding the following file systems on %s:\n", flag_val['E']);
-                    `log_to_screen("  %s\n", mounted_on_dsf);
+                    log_to_screen("  %s\n", mounted_on_dsf);
                     log_msg (5, "Adding to bkpinfo->exclude_paths due to -E option: %s", mounted_on_dsf);
                     strcat(bkpinfo->exclude_paths, mounted_on_dsf);