Changeset 688 in MondoRescue for trunk/mondo/mondo/common/libmondo-raid.c

Timestamp:

Jul 17, 2006, 3:44:46 PM (18 years ago)

Author:

bcornec

Message:

Huge memory management patch.
Still not finished but a lot as been done.
What remains is around some functions returning strings, and some structure members.
(Could not finish due to laptop failure !)

File:

• trunk/mondo/mondo/common/libmondo-raid.c (modified) (1 diff)

trunk/mondo/mondo/common/libmondo-raid.c

@@ -774 +774 @@
 {
     int cnt = 0;
-    static char *argv[64];
+    char *argv[64];
     char **ap;
-    char *line = (char *) malloc(MAX_STR_LEN);
-    if (!line)
-        errx(1,
-             "unable to allocate %i bytes of memory for `char *line' at %s:%i",
-             MAX_STR_LEN, __FILE__, __LINE__);
-    (void) fgets(line, MAX_STR_LEN, f);
+    char *line = NULL;
+    size_t = 0;
+    int lastpos = 0;
+
+    getline(&line, &n, f);
     if (feof(f)) {
         log_it("[GNVCL] Uh... I reached the EOF.");
-        return 0;
-    }
-
-    for (ap = argv; (*ap = strsep(&line, " \t")) != NULL;)
+        return NULL;
+    }
+
+    for (ap = argv; (*ap = mr_strtok(line, " \t", &lastpos)) != NULL;)
         if (**ap != '\0') {
             if (++ap >= &argv[64])