Changeset 1594 in MondoRescue for branches/stable/mondo/src/common/newt-specific.c

Timestamp:

Aug 26, 2007, 12:26:06 PM (17 years ago)

Author:

Bruno Cornec

Message:

Use of conf file entries (iso_burning_*, media_device, media_size)
and adapatation of the rest of the code to that (including bkpinfo)

File:

• branches/stable/mondo/src/common/newt-specific.c (modified) (3 diffs)

branches/stable/mondo/src/common/newt-specific.c

@@ -698 +698 @@
 
     /*@ buffers ********************************************************** */
-    char *blurb = NULL;
-    char *original_contents = NULL;
     bool ret = TRUE;
+    size_t n = 0;
 
     assert_string_is_neither_NULL_nor_zerolength(title);
@@ -706 +705 @@
     assert(output != NULL);
 
+    n = strlen(output) + 1;
     if (g_text_mode) {
         printf
             ("---promptstring---1--- %s\n---promptstring---2--- %s\n---promptstring---Q---\n-->  ",
              title, b);
-        (void) fgets(output, maxsize, stdin);
-        if (output[strlen(output) - 1] == '\n')
+        mr_getline(&output, &n, stdin);
+        if ((strlen(output) > 1) && (output[strlen(output) - 1] == '\n')) {
             output[strlen(output) - 1] = '\0';
+        }
         return(ret);
     }
-    mr_asprintf(&blurb, b);
-    text = newtTextboxReflowed(2, 1, blurb, 48, 5, 5, 0);
-    mr_asprintf(&original_contents, output);
-    output[0] = '\0';
+
+    text = newtTextboxReflowed(2, 1, b, 48, 5, 5, 0);
     type_here =
         newtEntry(2, newtTextboxGetNumLines(text) + 2,
-                  original_contents, 50,
-#ifdef __cplusplus
-                  0, NEWT_FLAG_RETURNEXIT
-#else
+                  output, 50,
                   (void *) &entry_value, NEWT_FLAG_RETURNEXIT
-#endif
         );
     b_1 = newtButton(6, newtTextboxGetNumLines(text) + 4, _("  OK  "));
@@ -736 +731 @@
     center_string(blurb, 80);
     */
-    newtPushHelpLine(blurb);
-    mr_free(blurb);
+    newtPushHelpLine(b);
 
     b_res = newtRunForm(myForm);
-    strcpy(output, entry_value);
     newtPopHelpLine();
     if (b_res == b_2) {
-        strcpy(output, original_contents);
         ret = FALSE;
+    } else {
+        mr_allocstr(output, newtEntryGetValue(entry_value));
     }
     newtFormDestroy(myForm);
     newtPopWindow();
-    mr_free(original_contents);
     return(ret);
 }