Changeset 2316 in MondoRescue for branches/2.2.10/mondo/src/common/newt-specific.c

Timestamp:

Aug 18, 2009, 2:34:29 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3327@localhost: bruno | 2009-08-04 00:17:46 +0200
popup_and_get_string and build_partition_name now return an allocated string

File:

• branches/2.2.10/mondo/src/common/newt-specific.c (modified) (7 diffs)

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

@@ -358 +358 @@
             log_msg(0, fatalstr);
             log_msg(0, error_string);
-            //      popup_and_OK (error_string);
             newtFinished();
         }
@@ -400 +399 @@
      finish(int signal) {
         char *command = NULL;
-
-        /*  if (signal==0) { popup_and_OK("Please press <enter> to quit."); } */
-
-        /* newtPopHelpLine(); */
 
         chdir("/");
@@ -750 +745 @@
  * @param title The title of the dialog box.
  * @param b The blurb (e.g. what you want the user to enter).
- * @param output The string to put the user's answer in.
- * @param maxsize The size in bytes allocated to @p output.
- * @return TRUE if the user pressed OK, FALSE if they pressed Cancel.
- */
-    bool popup_and_get_string(char *title, char *b, char *output,
-                              int maxsize) {
+ * @param input The string given originaly as default
+ * @return output string if the user pressed OK, NULL if they pressed Cancel.
+ */
+    char *popup_and_get_string(char *title, char *b, char *input) {
 
         /*@ newt ************************************************************ */
@@ -769 +762 @@
 
         /*@ buffers ********************************************************** */
-        char *blurb;
-        char *original_contents;
-
-        blurb = malloc(MAX_NEWT_COMMENT_LEN);
-        original_contents = malloc(MAX_NEWT_COMMENT_LEN);
+        char *blurb = NULL;
+        char *output = NULL;
+
         assert_string_is_neither_NULL_nor_zerolength(title);
         assert(b != NULL);
-        assert(output != NULL);
 
         if (g_text_mode) {
-            printf
-                ("---promptstring---1--- %s\n---promptstring---2--- %s\n---promptstring---Q---\n-->  ",
-                 title, b);
-            (void) fgets(output, maxsize, stdin);
+            printf("---promptstring---1--- %s\n---promptstring---2--- %s\n---promptstring---Q--- [%s]\n-->  ", title, b, input);
+            mr_getline(&output, stdin);
+            if (! strcmp(output,"\n")) {
+                /* take default if ENTER was typed */
+                mr_free(output);
+                mr_asprintf(&output, "%s", input);
+            }
             if (output[strlen(output) - 1] == '\n')
                 output[strlen(output) - 1] = '\0';
-            paranoid_free(blurb);
-            paranoid_free(original_contents);
-            return (TRUE);
-        }
-        strcpy(blurb, b);
+            return (output);
+        }
+
+        mr_asprintf(&blurb, "%s", b);
         text = newtTextboxReflowed(2, 1, blurb, 48, 5, 5, 0);
-        strcpy(original_contents, output);
-        output[0] = '\0';
         type_here =
             newtEntry(2, newtTextboxGetNumLines(text) + 2,
-                      original_contents, 50,
+                      input, 50,
 #ifdef __cplusplus
                       0, NEWT_FLAG_RETURNEXIT
@@ -804 +794 @@
         b_1 = newtButton(6, newtTextboxGetNumLines(text) + 4, "  OK  ");
         b_2 = newtButton(18, newtTextboxGetNumLines(text) + 4, "Cancel");
-        //  newtOpenWindow (8, 5, 54, newtTextboxGetNumLines (text) + 9, title);
         newtCenteredWindow(54, newtTextboxGetNumLines(text) + 9, title);
         myForm = newtForm(NULL, NULL, 0);
@@ -811 +800 @@
         newtPushHelpLine(blurb);
         b_res = newtRunForm(myForm);
-        strcpy(output, entry_value);
+
+        if (b_res == b_1) {
+            mr_asprintf(&output, "%s", newtEntryGetValue(type_here));
+        }
         newtPopHelpLine();
         newtFormDestroy(myForm);
         newtPopWindow();
-        if (b_res == b_2) {
-            strcpy(output, original_contents);
-            paranoid_free(blurb);
-            paranoid_free(original_contents);
-            return (FALSE);
-        } else {
-            paranoid_free(blurb);
-            paranoid_free(original_contents);
-            return (TRUE);
-        }
+        mr_free(blurb);
+
+        return (output);
     }
 
@@ -1179 +1164 @@
         } else {
             mr_asprintf(&timeline_str, "%2ld:%02ld taken               %2ld:%02ld remaining  ", (long) time_taken / 60, (long) time_taken % 60, (long) time_remaining / 60, (long) time_remaining % 60);
-            mr_asprintf(percentline_str, " %3d%% done                 %3d%% to go", percentage, 100 - percentage);
+            mr_asprintf(&percentline_str, " %3d%% done                 %3d%% to go", percentage, 100 - percentage);
 
             center_string(blurb1, 54);