Changeset 2291 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-cli.c

Timestamp:

Jul 22, 2009, 2:11:26 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Fix a printing error in mindi for the tar command
• Fix all mr_asprintf which had no second param as a string

(report bug fix done originaly in 2.2.9)

File:

• branches/2.2.10/mondo/src/common/libmondo-cli.c (modified) (12 diffs)

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

@@ -364 +364 @@
 
     log_msg(5, "dsf: %s", dsf);
-    
+
     /********
     * See if a device special file was passed in (i.e. it must start with /dev/
@@ -388 +388 @@
     }
     log_msg(5, "  %s device special file exists", dsf);
-    
+
     /* Get a list of the mounted file systems */
     if (create_list_of_non_NFS_mounted_file_systems()) {
@@ -400 +400 @@
     * Either way, it's an error.
     ********/
-    mr_asprintf(&command, 
-      "parted2fdisk -l %s 2>/dev/null|grep -E \"^/dev/\"|awk '{printf(\"%%s \", $1)}END{print \"\"}'", dsf);
+    mr_asprintf(&command, "parted2fdisk -l %s 2>/dev/null|grep -E \"^/dev/\"|awk '{printf(\"%%s \", $1)}END{print \"\"}'", dsf);
     log_msg(4, "Executing: %s", command);
     mr_asprintf(&partition_list, "%s", call_program_and_get_last_line_of_output(command));
@@ -454 +453 @@
         log_msg(4, "Processing partition: %s", partitions[i]);
         /* See if it's swap. If it is, ignore it. */
-        mr_asprintf(&command,
-          "parted2fdisk -l %s 2>/dev/null | awk '{if(($1==\"%s\")&&(toupper($0) ~ \"SWAP\")){print $1;exit}}'", 
+        mr_asprintf(&command, "parted2fdisk -l %s 2>/dev/null | awk '{if(($1==\"%s\")&&(toupper($0) ~ \"SWAP\")){print $1;exit}}'", 
           dsf, partitions[i]);
         log_msg(4, "  Running: %s", command);
@@ -492 +490 @@
         if (strlen(tmp)) {
             log_msg(4, "  Partition ID: %s", tmp);
-            if (!strcasecmp(tmp, "8e")) { 
+            if (!strcasecmp(tmp, "8e")) {
                 /* It's LVM: Find the VG it's in */
                 log_msg(4, "  It's LVM: Find the VG it's in...");
@@ -503 +501 @@
                     /* Found the Volume Group. Now find all of the VG's mount points */
                     log_msg(4, "  Found the Volume Group. Now find all of the VG's mount points");
-                    mr_asprintf(&command, 
-                      "mount 2>/dev/null|grep -E \"/dev/mapper/%s-|/dev/%s/\"|awk '{printf(\"%%s \",$3)}END{print \"\"}'", 
-                      VG, VG);
+                    mr_asprintf(&command, "mount 2>/dev/null|grep -E \"/dev/mapper/%s-|/dev/%s/\"|awk '{printf(\"%%s \",$3)}END{print \"\"}'", VG, VG);
                     log_msg(4, "  Running: %s", command);
                     mr_asprintf(&mount_list, "%s", call_program_and_get_last_line_of_output(command));
@@ -527 +523 @@
                      *******/
                     paranoid_free(mount_list);
-                    mr_asprintf(&command, "%s",
-                        "cat /proc/mdstat|grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
+                    mr_asprintf(&command, "%s", "cat /proc/mdstat|grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
                     log_msg (5, "Running: %s", command);
                     mr_asprintf(&mount_list, "%s", call_program_and_get_last_line_of_output(command));
                     paranoid_free(command);
-                    log_msg(4, "  Software raid device list: %s", mount_list);   
+                    log_msg(4, "  Software raid device list: %s", mount_list);
                     lastpos = 0;
                     while ((token = mr_strtok(mount_list, token_chars, &lastpos)) != NULL) {
-                        mr_asprintf(&command, "mdadm --detail %s 2>/dev/null | grep -c %s", token, VG); 
+                        mr_asprintf(&command, "mdadm --detail %s 2>/dev/null | grep -c %s", token, VG);
                         log_msg (5, "Running: %s", command);
                         paranoid_free(tmp);
@@ -581 +576 @@
         log_msg (5, "  UUID: %s", tmp);
         /* Get the Software raid device list */
-        mr_asprintf(&command, "%s",
-         "cat /proc/mdstat|grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
+        mr_asprintf(&command, "%s", "cat /proc/mdstat|grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
         log_msg (5, "  Running: %s", command);
         mr_asprintf(&mount_list, "%s", call_program_and_get_last_line_of_output(command));
         paranoid_free(command);
-        log_msg(4, "  Software raid device list: %s", mount_list);   
+        log_msg(4, "  Software raid device list: %s", mount_list);
         /* Loop through the software raid device list to see if we can find the partition */
         lastpos = 0;
@@ -770 +764 @@
             strcat(bkpinfo->include_paths, " ");
         }
-        
+
         mr_asprintf(&tmp1, "%s", flag_val['I']);
         p = tmp1;
@@ -1534 +1528 @@
             if (flag_set[opt]) {
                 bad_switches = TRUE;
-                mr_asprintf(&tmp, "Switch -%c previously defined as %s\n", opt,
-                        flag_val[opt]);
+                mr_asprintf(&tmp, "Switch -%c previously defined as %s\n", opt, flag_val[opt]);
                 log_to_screen(tmp);
                 paranoid_free(tmp);
@@ -1551 +1544 @@
                         if (strchr(flag_val[opt], '/')
                             && flag_val[opt][0] != '/') {
-                            mr_asprintf(&tmp,
-                                    "-%c flag --- must be absolute path --- '%s' isn't absolute",
-                                    opt, flag_val[opt]);
+                            mr_asprintf(&tmp, "-%c flag --- must be absolute path --- '%s' isn't absolute", opt, flag_val[opt]);
                             log_to_screen(tmp);
                             paranoid_free(tmp);
@@ -1624 +1615 @@
     case SIGABRT:
         mr_asprintf(&tmp, "SIGABRT");
-        mr_asprintf(&tmp2,
-                "Abort - probably failed assertion. I'm sleeping for a few seconds so you can read the message.");
+        mr_asprintf(&tmp2, "Abort - probably failed assertion. I'm sleeping for a few seconds so you can read the message.");
         break;
     default: