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

Timestamp:

Aug 29, 2009, 3:22:10 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Some more fgets => mr_getline transformations
• XWIN define is gone

File:

• branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.c (modified) (4 diffs)

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

@@ -533 +533 @@
 
     system("grep Pers /proc/mdstat > /tmp/raid-personalities.txt 2> /dev/null");
-    mr_asprintf(personalities, "%s", last_line_of_file("/tmp/raid-personalities.txt"));
+    personalities = last_line_of_file("/tmp/raid-personalities.txt");
     mr_asprintf(prompt, "Please enter the RAID level you want. %s", personalities);
     mr_free(personalities);
@@ -2291 +2291 @@
     if (does_file_exist("/tmp/NFS-SERVER-PATH")) {
         mr_free(idev);
-        mr_asprintf(idev, "%s", last_line_of_file("/tmp/NFS-SERVER-MOUNT"));
+        idev = last_line_of_file("/tmp/NFS-SERVER-MOUNT");
         mr_asprintf(isodir_format, "nfs");
         mr_free(isodir_path);
-        mr_asprintf(isodir_path, "%s", last_line_of_file("/tmp/NFS-SERVER-PATH"));
+        isodir_path = last_line_of_file("/tmp/NFS-SERVER-PATH");
     }
 
@@ -2861 +2861 @@
   /** char *************************************************************/
     char output = '\0';
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
 
   /** newt *************************************************************/
@@ -2873 +2873 @@
 
     if (g_text_mode) {
-        for (output = 'z'; !strchr("AICE", output); output = tmp[0]) {
-            printf
-                ("Which mode - (A)utomatic, (I)nteractive, \n(C)ompare only, or (E)xit to shell?\n--> ");
-            fgets(tmp, MAX_STR_LEN - 1, stdin);
+        while (!strchr("AICE", output)) {
+            printf("Which mode - (A)utomatic, (I)nteractive, \n(C)ompare only, or (E)xit to shell?\n--> ");
+            mr_getline(tmp, stdin);
+            output = tmp[0];
+            free(tmp);
         }
         return (output);
     }
 
-    newtPushHelpLine
-        ("   Do you want to 'nuke' your system, restore interactively, or just compare?");
+    newtPushHelpLine("   Do you want to 'nuke' your system, restore interactively, or just compare?");
     newtOpenWindow(24, 3, 32, 17, "How should I restore?");
     b1 = newtButton(7, 1, "Automatically");