Changeset 2356 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.c

Timestamp:

Aug 29, 2009, 1:00:03 AM (15 years ago)

Author:

Bruno Cornec

Message:

Remove function spread_flaws_across_three_lines and expand it at the single place where it was useful, and fix memory allocation issues in it.
(backport from 2.2.9)

File:

• branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.c (modified) (1 diff)

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -1966 +1966 @@
     while (!finished) {
         flaws_str = evaluate_mountlist(mountlist, &res);
-        spread_flaws_across_three_lines(flaws_str, flaws_str_A, flaws_str_B, flaws_str_C);
-
+        if (strlen(flaws_str) > 0) {
+            mr_asprintf(flaws_str_A, "%s", flaws_str + 1);
+        } else {
+            mr_asprintf(flaws_str_A, "");
+        }
+        if (strlen(flaws_str_A) >= 74) {
+            for (i = 74; flaws_str_A[i] != ' '; i--);
+            mr_asprintf(flaws_str_B, "%s", flaws_str_A + i + 1);
+            flaws_str_A[i] = '\0';
+        } else {
+            mr_asprintf(flaws_str_B, "");
+        }
+        if (strlen(flaws_str_B) >= 74) {
+            for (i = 74; flaws_str_B[i] != ' '; i--);
+            mr_asprintf(flaws_str_C, "%s", flaws_str_B + i + 1);
+            flaws_str_B[i] = '\0';
+        } else {
+            mr_asprintf(flaws_str_C, "");
+        }
         mr_free(flaws_str);