Changeset 559 in MondoRescue for branches/stable

Timestamp:

May 20, 2006, 5:03:34 PM (18 years ago)

Author:

bcornec

Message:

strtok removed in favour of mr_strtok

File:

• branches/stable/mondo/mondo/common/libmondo-raid.c (modified) (5 diffs)

branches/stable/mondo/mondo/common/libmondo-raid.c

@@ -1016 +1016 @@
   FILE   *fin;
   int    res = 0, row, i, index_min;
+  int lastpos = 0;
   size_t len = 0;
-  char   *token, *string = NULL, *pos, type, *strtmp;
+  char   *token;
+  char *string = NULL;
+  char *pos;
+  char type;
+  char *strtmp;
 
   // open file
@@ -1054 +1059 @@
     }
     // tokenise string
-    token = strtok (string, delims);
+    token = mr_strtok (string, delims, &lastpos);
     // get RAID device name
     asprintf(&strtmp,"%s%s", device_prefix, token);
     strcpy(raidlist->el[raidlist->entries].raid_device, strtmp);
     paranoid_free(strtmp);
+    paranoid_free(token);
     // skip ':' and status
-    token = strtok (NULL, delims);
-    token = strtok (NULL, delims);
+    token = strtok (string, delims, &lastpos);
+    paranoid_free(token);
+    token = strtok (string, delims, &lastpos);
     if (!strcmp(token, "inactive")) {
       log_msg(1, "RAID device '%s' inactive.\n",
          raidlist->el[raidlist->entries].raid_device);
       paranoid_free(string);
+      paranoid_free(token);
       return 1;
     }
+    paranoid_free(token);
+
     // get RAID level
-    token = strtok (NULL, delims);
+    token = strtok (string, delims, &lastpos);
     if (!strcmp(token, "multipath")) {
       raidlist->el[raidlist->entries].raid_level = -2;
@@ -1089 +1099 @@
       log_msg(1, "Unknown RAID level '%s'.\n", token);
       paranoid_free(string);
+      paranoid_free(token);
       return 1;
     }
+    paranoid_free(token);
+
     // get RAID devices (type, index, device)
     // Note: parity disk for RAID4 is last normal disk, there is no '(P)'
@@ -1096 +1109 @@
     raidlist->el[raidlist->entries].spare_disks.entries = 0;
     raidlist->el[raidlist->entries].failed_disks.entries = 0;
-    while((token = strtok (NULL, delims))) {
+    while((token = strtok (string, delims, &lastpos))) {
       if ((pos = strstr(token, "("))) {
         type = *(pos+1);
@@ -1130 +1143 @@
         log_msg(1, "Unknown device type '%c'\n", type);
         paranoid_free(string);
+        paranoid_free(token);
         return 1;
         break;
       }
-    }
+      paranoid_free(token);
+    }
+
     // adjust index for each device so that it starts with 0 for every type
     index_min = 99;