Changeset 2053 in MondoRescue for branches/2.2.8/mondo/src/common/libmondo-cli.c

Timestamp:

Oct 23, 2008, 3:16:34 PM (15 years ago)

Author:

Bruno Cornec

Message:

register-pid is gone

File:

• branches/2.2.8/mondo/src/common/libmondo-cli.c (modified) (7 diffs)

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

@@ -414 +414 @@
 {
     int i = 0;
-    int lastpos = 0;
     int mount_cnt = 0;
     char *mounted_file_system = NULL;
@@ -559 +558 @@
     i = 0;
     lastpos = 0;
-    while (token = mr_strtok(partition_list, token_chars, &lastpos)) {
+    while ((token = mr_strtok(partition_list, token_chars, &lastpos)) != NULL) {
         log_msg (5, "Found partition: %s", token);
         strcpy(partitions[i++], token);
@@ -654 +653 @@
                     log_msg(4, "  VG %s mount_list: %s", VG, mount_list);
                     lastpos = 0;
-                    while (token = mr_strtok(mount_list, token_chars, &lastpos)) {
+                    while ((token = mr_strtok(mount_list, token_chars, &lastpos)) != NULL) {
                         log_msg (5, "mount point token: %s", token);
                         if ((DSFptr = find_mount_point_in_list(token)) == NULL) {
@@ -675 +674 @@
                     log_msg(4, "  Software raid device list: %s", mount_list);   
                     lastpos = 0;
-                    while (token = mr_strtok(mount_list, token_chars, &lastpos)) {
+                    while ((token = mr_strtok(mount_list, token_chars, &lastpos)) != NULL) {
                         asprintf(&command, "mdadm --detail %s 2>/dev/null | grep -c %s", token, VG); 
                         log_msg (5, "Running: %s", command);
@@ -728 +727 @@
         /* Loop through the software raid device list to see if we can find the partition */
         lastpos = 0;
-        while (token = mr_strtok(mount_list, token_chars, &lastpos)) {
+        while ((token = mr_strtok(mount_list, token_chars, &lastpos)) != NULL) {
             asprintf(&command, "mdadm --detail %s 2>/dev/null | grep -c %s", token, tmp);
             log_msg(4, "  Running: %s", command);
@@ -931 +930 @@
         }
         paranoid_free(tmp1);
-        while (token = mr_strtok(flag_val['I'], token_chars, &lastpos)) {
+        while ((token = mr_strtok(flag_val['I'], token_chars, &lastpos)) != NULL) {
             switch (get_dsf_mount_list(token, &mounted_on_dsf, &not_mounted_on_dsf)) {
             /* It's a dsf but not a whole disk dsf */
@@ -1238 +1237 @@
         paranoid_free(tmp1);
         lastpos = 0;
-        while (token = mr_strtok(flag_val['E'], token_chars, &lastpos)) {
+        while ((token = mr_strtok(flag_val['E'], token_chars, &lastpos)) != NULL) {
             switch (get_dsf_mount_list(token, &mounted_on_dsf, &not_mounted_on_dsf)) {
             case 1: