Changeset 3192 in MondoRescue for branches/3.0/mondo/src/common/newt-specific.c

Timestamp:

Sep 25, 2013, 9:03:25 AM (11 years ago)

Author:

Bruno Cornec

Message:

• revert r3188 & r3189 as I started to work on branch 3.0 before deciding it was much better to do it in 3.2. This will allow some small maintenance work on 3.0 if needed, while pushing all the rest to 3.2 and providing early access to it.

File:

• branches/3.0/mondo/src/common/newt-specific.c (modified) (88 diffs)

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

@@ -97 +97 @@
     extern int g_current_media_number;
     pid_t g_main_pid = 0;       ///< The PID of the main Mondo process.
-    long g_maximum_progress = 999L; ///< The maximum amount of progress (100%) for the currently opened progress form.
+    long g_maximum_progress = 999;  ///< The maximum amount of progress (100%) for the currently opened progress form.
     long g_current_progress = -999; ///< The current amount of progress (filelist #, etc.) for the currently opened progress form.
-    long g_start_time = 0L;     ///< The time (in seconds since the epoch) that the progress form was opened.
+    long g_start_time = 0;      ///< The time (in seconds since the epoch) that the progress form was opened.
     bool g_text_mode = TRUE;    ///< If FALSE, use a newt interface; if TRUE, use an ugly (but more compatible) dumb terminal interface.
+    char g_xmondo_stdin[MAX_NEWT_COMMENT_LEN],  ///< ... @bug Unneeded w/current XMondo.
+     g_xmondo_stdout[MAX_NEWT_COMMENT_LEN]; ///< .... @bug Unneeded w/current XMondo.
+    bool g_called_by_xmondo = FALSE;    ///< @bug Unneeded w/current XMondo.
     char *g_selfmounted_isodir; ///< Holds the NETFS mountpoint if mounted via mondoarchive.
 
 /* @} - end of globalGroup */
+
+//int g_fd_in=-1, g_fd_out=-1;
 
     void popup_and_OK(char *);
@@ -120 +125 @@
 
         /*@ buffers ********************************************************** */
-        int i = 0;
-        char *tmp = NULL;
+        int i;
+        char *p;
 
         assert_string_is_neither_NULL_nor_zerolength(prompt);
@@ -131 +136 @@
         }
         if (g_text_mode) {
+
+            char *tmp;
+            tmp = malloc(MAX_NEWT_COMMENT_LEN);
+
             while (1) {
-                sync();
-                printf("---promptdialogYN---1--- %s\n---promptdialogYN---Q--- [yes] [no] ---\n--> ", prompt);
-                mr_getline(tmp, stdin);
+                paranoid_system("sync");
+                printf
+                    ("---promptdialogYN---1--- %s\n---promptdialogYN---Q--- [yes] [no] ---\n--> ",
+                     prompt);
+                p= fgets(tmp, MAX_NEWT_COMMENT_LEN, stdin);
+                if (!p) {
+                    //FIXME
+                }
                 if (tmp[strlen(tmp) - 1] == '\n')
                     tmp[strlen(tmp) - 1] = '\0';
@@ -143 +157 @@
                 }
                 if (strstr("yesYES", tmp)) {
-                    mr_free(tmp);
+                    paranoid_free(tmp);
                     return (TRUE);
                 } else if (strstr("NOno", tmp)) {
-                    mr_free(tmp);
+                    paranoid_free(tmp);
                     return (FALSE);
                 } else {
-                    sync();
-                    printf("Please enter either YES or NO (or yes or no, or y or n, or...)\n");
+                    paranoid_system("sync");
+                    printf
+                        ("Please enter either YES or NO (or yes or no, or y or n, or...)\n");
                 }
             }
@@ -168 +183 @@
 
         /*@ buffer *********************************************************** */
-        char *tmp = NULL;
+        char *tmp;
+        char *p;
         int i;
 
@@ -177 +193 @@
             finish(1);
         }
-
+        tmp = malloc(MAX_NEWT_COMMENT_LEN);
         if (g_text_mode) {
-            sync();
-            printf("---promptdialogOKC---1--- %s\n---promptdialogOKC---Q--- [OK] [Cancel] ---\n--> ", prompt);
-            mr_getline(tmp, stdin);
+            paranoid_system("sync");
+            printf
+                ("---promptdialogOKC---1--- %s\n---promptdialogOKC---Q--- [OK] [Cancel] ---\n--> ",
+                 prompt);
+            p = fgets(tmp, MAX_NEWT_COMMENT_LEN, stdin);
+            if (!p) {
+                // FIXME
+            }
             if (tmp[strlen(tmp) - 1] == '\n')
                 tmp[strlen(tmp) - 1] = '\0';
@@ -190 +211 @@
             }
             if (strstr("okOKOkYESyes", tmp)) {
-                mr_free(tmp);
+                paranoid_free(tmp);
                 return (TRUE);
             } else {
-                mr_free(tmp);
+                paranoid_free(tmp);
                 return (FALSE);
             }
         } else {
+            paranoid_free(tmp);
             return (popup_with_buttons(prompt, " Okay ", "Cancel"));
         }
@@ -242 +264 @@
         }
         if (g_current_progress == -999) {
-            log_msg(2, "Trying to close the progress form when it ain't open!");
+            log_msg(2,
+                    "Trying to close the progress form when it ain't open!");
             return;
         }
@@ -278 +301 @@
         mr_asprintf(tmp1,"kill `%s`", tmp);
         run_program_and_log_output(tmp1, TRUE);
-        mr_free(tmp1);
-    }
-    mr_free(tmp);
+        paranoid_free(tmp1);
+    }
+    paranoid_free(tmp);
 }
 
@@ -289 +312 @@
  * @note This function never returns.
  */
-void fatal_error(char *error_string) {
-
+    void
+     fatal_error(char *error_string) {
         /*@ buffers ***************************************************** */
-        char *command = NULL;
+        char fatalstr[MAX_NEWT_COMMENT_LEN] =
+            "-------FATAL ERROR---------";
+        char *tmp;
+        char *command;
         static bool already_exiting = FALSE;
 
         /*@ end vars **************************************************** */
 
+        malloc_string(command);
+        tmp = malloc(MAX_NEWT_COMMENT_LEN);
         set_signals(FALSE);     // link to external func
         g_exiting = TRUE;
@@ -304 +332 @@
             log_msg(2, "mastermind %d is exiting", (int) getpid());
             kill(g_main_pid, SIGTERM);
+            paranoid_free(tmp);
             finish(1);
         }
@@ -311 +340 @@
                 log_msg(2, "non-m/m %d is exiting", (int) getpid());
                 kill(g_main_pid, SIGTERM);
+                paranoid_free(tmp);
                 finish(1);
             }
@@ -318 +348 @@
         if (already_exiting) {
             log_msg(3, "...I'm already exiting. Give me time, Julian!");
+            paranoid_free(tmp);
             finish(1);
         }
@@ -328 +359 @@
         kill_anything_like_this("ntfsclone");
         sync();
+        /*
+        sprintf(tmp, "umount %s", g_tmpfs_mountpt);
+        for (i = 0; i < 10 && run_program_and_log_output(tmp, 5); i++) {
+            log_msg(2, "Waiting for child processes to terminate");
+            sleep(1);
+            run_program_and_log_output(tmp, 5);
+        }
+        */
 
         if (chdir("/")) {
@@ -333 +372 @@
         }
         if (g_selfmounted_isodir) {
-            mr_asprintf(command, "umount -d %s", g_selfmounted_isodir);
+            sprintf(command, "umount -d %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 5);
-            mr_free(command);
-            mr_asprintf(command, "rmdir %s", g_selfmounted_isodir);
+            sprintf(command, "rmdir %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 5);
-            mr_free(command);
         }
 
         if (!g_text_mode) {
-            log_msg(0, "-------FATAL ERROR---------");
+            log_msg(0, fatalstr);
             log_msg(0, error_string);
+            //      popup_and_OK (error_string);
+            newtFinished();
         }
 
         printf("---FATALERROR--- %s\n", error_string);
-        printf("If you require technical support, please contact the mailing list.\n");
+        printf
+                ("If you require technical support, please contact the mailing list.\n");
         printf("See http://www.mondorescue.org for details.\n");
-        printf("The list's members can help you, if you attach that file to your e-mail.\n");
+        printf
+                ("The list's members can help you, if you attach that file to your e-mail.\n");
         printf("Log file: %s\n", MONDO_LOGFILE);
         printf("Mondo has aborted.\n");
@@ -355 +396 @@
             log_msg(3, "FYI - g_main_pid is blank");
         }
+        paranoid_free(tmp);
+        paranoid_free(command);
         finish(254);
     }
@@ -377 +420 @@
  * @note This function never returns.
  */
-void finish(int signal) {
-
+    void
+     finish(int signal) {
         char *command = NULL;
+
+        /*  if (signal==0) { popup_and_OK("Please press <enter> to quit."); } */
+
+        /* newtPopHelpLine(); */
 
         /*  Before removing dir, make sure we're out of them */
@@ -389 +436 @@
             mr_asprintf(command, "umount -d %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
-            mr_free(command);
-
+            paranoid_free(command);
             mr_asprintf(command, "rmdir %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
-            mr_free(command);
-        }
+            paranoid_free(command);
+        }
+        if (!g_text_mode) {
+            if (does_file_exist("/THIS-IS-A-RAMDISK")) {
+                log_msg(1, "Calling newtFinished()");
+                newtFinished();
+            } else {
+                log_msg(1, "Calling newtSuspend()");
+                newtSuspend();
+            }
+        }
+        printf("Execution run ended; result=%d\n", signal);
+        printf("Type 'less %s' to see the output log\n", MONDO_LOGFILE);
         if (bkpinfo->tmpdir) {
             log_msg(8,"tempdir is %s",bkpinfo->tmpdir);
@@ -419 +476 @@
         mr_free(bkpinfo->exclude_paths);
         mr_free(bkpinfo->subdir);
+
         /* Then free the structure */
         paranoid_free(bkpinfo);
-
         free_libmondo_global_strings();
         free_newt_stuff();
-        if (!g_text_mode) {
-            if (does_file_exist("/THIS-IS-A-RAMDISK")) {
-                log_msg(1, "Calling newtFinished()");
-                newtFinished();
-            } else {
-                log_msg(1, "Calling newtSuspend()");
-                newtSuspend();
-            }
-        }
-        printf("Execution run ended; result=%d\n", signal);
-        printf("Type 'less %s' to see the output log\n", MONDO_LOGFILE);
         exit(signal);
     }
+
+
+
 
 
@@ -445 +494 @@
  * @param grep_for_me If not "", then only give lines in @p filename that match this regular expression.
  */
-void log_file_end_to_screen(char *filename, char *grep_for_me) {
+    void
+     log_file_end_to_screen(char *filename, char *grep_for_me) {
 
         /*@ buffers ********************************************************** */
@@ -465 +515 @@
         }
         if (grep_for_me[0] != '\0') {
-            mr_asprintf(command, "grep '%s' %s | tail -n%d", grep_for_me, filename, g_noof_log_lines);
-        } else {
-            mr_asprintf(command, "tail -n%d %s", g_noof_log_lines, filename);
+            mr_asprintf(command, "grep '%s' %s | tail -n%d",
+                    grep_for_me, filename, g_noof_log_lines);
+        } else {
+            mr_asprintf(command, "tail -n%d %s", g_noof_log_lines,
+                    filename);
         }
         fin = popen(command, "r");
@@ -505 +557 @@
  * @note The message is also written to the logfile.
  */
-void log_to_screen(const char *fmt, ...) {
+    void
+     log_to_screen(const char *fmt, ...) {
 
         /*@ int ************************************************************** */
@@ -561 +614 @@
  * @param output The string to write.
  */
-void mvaddstr_and_log_it(int y, int x, char *output) {
-
+    void
+     mvaddstr_and_log_it(int y, int x, char *output) {
         assert_string_is_neither_NULL_nor_zerolength(output);
         log_msg(0, output);
@@ -580 +633 @@
  * @param ttl The title to use for the evalcall form.
  */
-void open_evalcall_form(char *ttl) {
+    void
+     open_evalcall_form(char *ttl) {
 
         /*@ buffers ********************************************************* */
-        char *tmp = NULL;
+        char *title;
+        char *tmp;
 
         /*@ initialize ****************************************************** */
         g_isoform_old_progress = -1;
         g_mysterious_dot_counter = 0;
+        malloc_string(title);
+        malloc_string(tmp);
 
         assert(ttl != NULL);
-        malloc_string(tmp);
-        strcpy(g_isoform_header_str, ttl);
+        strcpy(title, ttl);
+        strcpy(g_isoform_header_str, title);
+//  center_string (title, 80);
         if (g_text_mode) {
-            log_msg(0, ttl);
-        } else {
-            strcpy(tmp, ttl);
+            log_msg(0, title);
+        } else {
+            strcpy(tmp, title);
             center_string(tmp, 80);
             newtPushHelpLine(tmp);
@@ -606 +664 @@
             g_isoform_header = newtLabel(1, 1, g_isoform_header_str);
             g_isoform_scale = newtScale(3, 3, 34, 100);
-            newtCenteredWindow(40, 7, ttl);
+            //      newtOpenWindow (20, 6, 40, 7, title);      // "Please Wait");
+            newtCenteredWindow(40, 7, title);
             g_isoform_main = newtForm(NULL, NULL, 0);
             g_isoform_timeline = newtLabel(1, 5, "                    ");
@@ -618 +677 @@
         update_evalcall_form(0);
         paranoid_free(tmp);
+        paranoid_free(title);
     }
 
@@ -631 +691 @@
  * @param max_val The maximum amount of progress (number of filesets, etc.)
  */
-void open_progress_form(char *title, char *b1, char *b2, char *b3, long max_val) {
+    void
+     open_progress_form(char *title, char *b1, char *b2, char *b3,
+                        long max_val) {
 
         /*@ buffers ********************************************************* */
         char *b1c;
-        char *blurb1 = NULL;
-        char *blurb2 = NULL;
-        char *blurb3 = NULL;
+        char *blurb1;
+        char *blurb2;
+        char *blurb3;
 
         /*@ initialize ****************************************************** */
@@ -643 +705 @@
 
         malloc_string(b1c);
+        malloc_string(blurb1);
+        malloc_string(blurb2);
+        malloc_string(blurb3);
 
         assert(title != NULL);
@@ -649 +714 @@
         assert(b3 != NULL);
 
-        mr_asprintf(blurb1,  "%s", b1);
-        mr_asprintf(blurb2,  "%s", b2);
-        mr_asprintf(blurb3,  "%s", b3);
-
+        strcpy(blurb1, b1);
+        strcpy(blurb2, b2);
+        strcpy(blurb3, b3);
         strcpy(b1c, b1);
         center_string(b1c, 80);
@@ -673 +737 @@
             g_blurb2 = newtLabel(2, 2, blurb3);
             g_blurb3 = newtLabel(2, 4, blurb2);
+            //      newtOpenWindow (10, 4, 60, 11, title);
             newtCenteredWindow(60, 11, title);
-            g_scale = newtScale(3, 6, 54, (long long)g_maximum_progress);
+            g_scale = newtScale(3, 6, 54, g_maximum_progress);
             g_progressForm = newtForm(NULL, NULL, 0);
             g_percentline = newtLabel(10, 9, "                       ");
             g_timeline = newtLabel(10, 8, "                    ");
-            newtFormAddComponents(g_progressForm, g_percentline, g_timeline, g_scale, g_blurb1, g_blurb3, g_blurb2, NULL);
+            newtFormAddComponents(g_progressForm, g_percentline,
+                                  g_timeline, g_scale, g_blurb1, g_blurb3,
+                                  g_blurb2, NULL);
             newtPushHelpLine(b1c);
             newtDrawForm(g_progressForm);
@@ -685 +752 @@
         update_progress_form_full(blurb1, blurb2, blurb3);
         paranoid_free(b1c);
-        mr_free(blurb1);
-        mr_free(blurb2);
-        mr_free(blurb3);
+        paranoid_free(blurb1);
+        paranoid_free(blurb2);
+        paranoid_free(blurb3);
     }
 
@@ -694 +761 @@
  * @param prompt The message.
  */
-void popup_and_OK(char *prompt) {
-
+    void
+     popup_and_OK(char *prompt) {
         char ch;
 
@@ -702 +769 @@
         log_msg(0, prompt);
         if (g_text_mode) {
-            printf("---promptpopup---1--- %s\n---promptpopup---Q--- [OK] ---\n--> ", prompt);
+            printf
+                ("---promptpopup---1--- %s\n---promptpopup---Q--- [OK] ---\n--> ",
+                 prompt);
             while (((ch = getchar()) != '\n') && (ch != EOF));
         } else {
@@ -717 +786 @@
  * @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) {
+    bool popup_and_get_string(char *title, char *b, char *output,
+                              int maxsize) {
 
         /*@ newt ************************************************************ */
@@ -731 +801 @@
 
         /*@ buffers ********************************************************** */
-        char *blurb = NULL;
+        char *blurb;
         char *p;
-        char *original_contents = NULL;
-
+        char *original_contents;
+
+        blurb = malloc(MAX_NEWT_COMMENT_LEN);
+        original_contents = malloc(MAX_NEWT_COMMENT_LEN);
         assert_string_is_neither_NULL_nor_zerolength(title);
         assert(b != NULL);
@@ -740 +812 @@
 
         if (g_text_mode) {
-            printf("---promptstring---1--- %s\n---promptstring---2--- %s\n---promptstring---Q---\n-->  ", title, b);
+            printf
+                ("---promptstring---1--- %s\n---promptstring---2--- %s\n---promptstring---Q---\n-->  ",
+                 title, b);
             p = fgets(output, maxsize, stdin);
             if (!p) {
@@ -747 +821 @@
             if (output[strlen(output) - 1] == '\n')
                 output[strlen(output) - 1] = '\0';
+            paranoid_free(blurb);
+            paranoid_free(original_contents);
             return (TRUE);
         }
-        
-        blurb = malloc(MAX_NEWT_COMMENT_LEN);
         strcpy(blurb, b);
         text = newtTextboxReflowed(2, 1, blurb, 48, 5, 5, 0);
-        mr_asprintf(original_contents, "%s", output);
+        strcpy(original_contents, output);
         output[0] = '\0';
-        type_here = newtEntry(2, newtTextboxGetNumLines(text) + 2, original_contents, 50,
+        type_here =
+            newtEntry(2, newtTextboxGetNumLines(text) + 2,
+                      original_contents, 50,
 #ifdef __cplusplus
                       0, NEWT_FLAG_RETURNEXIT
@@ -764 +840 @@
         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);
@@ -774 +851 @@
         newtFormDestroy(myForm);
         newtPopWindow();
-        paranoid_free(blurb);
-
         if (b_res == b_2) {
             strcpy(output, original_contents);
-            mr_free(original_contents);
+            paranoid_free(blurb);
+            paranoid_free(original_contents);
             return (FALSE);
         } else {
-            mr_free(original_contents);
+            paranoid_free(blurb);
+            paranoid_free(original_contents);
             return (TRUE);
         }
@@ -794 +871 @@
  * @return TRUE if @p button1 was pushed, FALSE otherwise.
  */
-bool popup_with_buttons(char *p, char *button1, char *button2) {
+    bool popup_with_buttons(char *p, char *button1, char *button2) {
 
         /*@ buffers *********************************************************** */
-        char *prompt = NULL;
+        char *prompt;
+        char *q;
 
         /*@ newt ************************************************************** */
@@ -809 +887 @@
         assert(button1 != NULL);
         assert(button2 != NULL);
+        prompt = malloc(MAX_NEWT_COMMENT_LEN);
         if (g_text_mode) {
             if (strlen(button2) == 0) {
@@ -815 +894 @@
                 printf("%s (%s or %s) --> ", p, button1, button2);
             }
-            mr_getline(prompt, stdin);
-            while (strcmp(prompt, button1) && (strlen(button2) == 0 || strcmp(prompt, button2))) {
+            for (prompt[0] = '\0';
+                 strcmp(prompt, button1) && (strlen(button2) == 0
+                                          || strcmp(prompt, button2));) {
                 printf("--> ");
-                mr_free(prompt);
-                mr_getline(prompt, stdin);
+                q = fgets(prompt, MAX_NEWT_COMMENT_LEN, stdin);
+                if (!q) {
+                    // FIXME
+                }
             }
             if (!strcmp(prompt, button1)) {
-                mr_free(prompt);
+                paranoid_free(prompt);
                 return (TRUE);
             } else {
-                mr_free(prompt);
+                paranoid_free(prompt);
                 return (FALSE);
             }
         }
 
-        prompt = malloc(MAX_NEWT_COMMENT_LEN);
         strncpy(prompt, p, MAX_NEWT_COMMENT_LEN - 1);
         prompt[MAX_NEWT_COMMENT_LEN - 1] = '\0';
         text = newtTextboxReflowed(1, 1, prompt, 40, 5, 5, 0);
-        b_1 = newtButton(20 - ((button2[0] != '\0') ? strlen(button1) + 2 : strlen(button1) / 2), newtTextboxGetNumLines(text) + 3, button1);
+        b_1 =
+            newtButton(20 -
+                       ((button2[0] !=
+                         '\0') ? strlen(button1) +
+                        2 : strlen(button1) / 2),
+                       newtTextboxGetNumLines(text) + 3, button1);
         if (button2[0] != '\0') {
-            b_2 = newtButton(24, newtTextboxGetNumLines(text) + 3, button2);
+            b_2 =
+                newtButton(24, newtTextboxGetNumLines(text) + 3, button2);
         } else {
             b_2 = NULL;
         }
+        //  newtOpenWindow (25, 5, 46, newtTextboxGetNumLines (text) + 7, "Alert");
         newtCenteredWindow(46, newtTextboxGetNumLines(text) + 7, "Alert");
         myForm = newtForm(NULL, NULL, 0);
@@ -865 +953 @@
  * on the screen.
  */
-void refresh_log_screen() {
+    void
+     refresh_log_screen() {
 
         /*@ int *********************************************************** */
@@ -892 +981 @@
  * only allocate some memory.
  */
-void setup_newt_stuff() {
+    void
+     setup_newt_stuff() {
 
         /*@ int *********************************************************** */
@@ -901 +991 @@
             newtInit();
             newtCls();
-            newtPushHelpLine("Welcome to Mondo Rescue, by Dev Team and the Internet. All rights reversed.");
+            newtPushHelpLine
+                ("Welcome to Mondo Rescue, by Dev Team and the Internet. All rights reversed.");
+            /*  newtDrawRootText(28,0,"Welcome to Mondo Rescue"); */
             newtDrawRootText(18, 0, WELCOME_STRING);
             newtRefresh();
@@ -908 +1000 @@
         }
 
-        err_log_lines = (char **) mr_malloc(sizeof(char *) * g_noof_log_lines);
+        err_log_lines =
+            (char **) malloc(sizeof(char *) * g_noof_log_lines);
+        if (!err_log_lines) {
+            fatal_error("Out of memory");
+        }
 
         for (i = 0; i < g_noof_log_lines; i++) {
-            err_log_lines[i] = (char *) mr_malloc(MAX_NEWT_COMMENT_LEN);
+            err_log_lines[i] = (char *) malloc(MAX_NEWT_COMMENT_LEN);
+            if (!err_log_lines[i]) {
+                fatal_error("Out of memory");
+            }
         }
 
@@ -925 +1024 @@
  * @param denom The denomenator of the ratio.
  */
-void update_evalcall_form_ratio(int num, int denom) {
+    void
+     update_evalcall_form_ratio(int num, int denom) {
 
         /*@ long ************************************************************ */
-        long current_time = 0L;
-        long time_taken = 0L;
-        long time_total_est = 0L;
-        long time_remaining = 0L;
+        long current_time = 0;
+        long time_taken = 0;
+        long time_total_est = 0;
+        long time_remaining = 0;
 
         /*@ buffers ********************************************************** */
-        char *timeline_str = NULL;
+        char *timeline_str;
         char *pcline_str = NULL;
         char *taskprogress = NULL;
@@ -943 +1043 @@
         int j = 0;
 
+        malloc_string(timeline_str);
+        timeline_str[0] = '\0';
+//  log_it("update_eval_call_form called");
         if (num * 100 < denom) {
             percentage = 1;
@@ -955 +1058 @@
             time_remaining = time_total_est - time_taken;
         } else {
-            time_remaining = 0L;
+            time_remaining = 0;
         }
         if (!g_text_mode) {
@@ -966 +1069 @@
             || percentage > g_isoform_old_progress) {
             g_isoform_old_progress = percentage;
-            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);
+            sprintf(timeline_str,
+                    "%2ld:%02ld taken            %2ld:%02ld remaining",
+                    (long) time_taken / 60, (long) time_taken % 60, (long) time_remaining / 60,
+                    (long) time_remaining % 60);
             if (percentage < 3) {
                 mr_asprintf(pcline_str, " Working");
@@ -977 +1083 @@
                 mr_strcat(pcline_str, " %c", special_dot_char(g_mysterious_dot_counter));
             } else {
-                mr_asprintf(pcline_str, " %3d%% done              %3d%% to go", percentage, 100 - percentage);
+                mr_asprintf(pcline_str, " %3d%% done              %3d%% to go",
+                        percentage, 100 - percentage);
             }
             if (g_text_mode) {
@@ -988 +1095 @@
                 }
                 if (percentage >= 3) {
-                    mr_strcat(taskprogress, "] %3d%% done; %2ld:%02ld to go", percentage, (long) time_remaining / 60, (long) time_remaining % 60);
-                    printf("---evalcall---1--- %s\n", g_isoform_header_str);
+                    mr_strcat(taskprogress, "] %3d%% done; %2ld:%02ld to go", percentage,
+                            (long) time_remaining / 60, (long) time_remaining % 60);
+                    printf("---evalcall---1--- %s\n",
+                           g_isoform_header_str);
                     printf("---evalcall---2--- %s\n", taskprogress);
                     printf("---evalcall---E---\n");
                 }
-                mr_free(taskprogress);
+                paranoid_free(taskprogress);
             } else {
-                newtScaleSet(g_isoform_scale, (unsigned long long) percentage);
+                newtScaleSet(g_isoform_scale,
+                             (unsigned long long) percentage);
                 if (g_isoform_pcline) {
                     newtLabelSetText(g_isoform_pcline, pcline_str);
@@ -1003 +1113 @@
                 }
             }
-            mr_free(pcline_str);
-            mr_free(timeline_str);
+            paranoid_free(pcline_str);
         }
         if (!g_text_mode) {
+//      log_it("refreshing");
             newtDrawForm(g_isoform_main);
             newtRefresh();
         }
+        paranoid_free(timeline_str);
     }
 
@@ -1018 +1129 @@
  * @param curr The current amount of progress (percentage) in the evalcall form.
  */
-void update_evalcall_form(int curr) {
-
+    void
+     update_evalcall_form(int curr) {
         update_evalcall_form_ratio(curr, 100);
-}
+    }
 
 
@@ -1030 +1141 @@
  * @param blurb3 The new third line of the blurb; use @p g_blurb_str_2 (no, that's not a typo) to keep it the same.
  */
-void update_progress_form(char *blurb3) {
-
+    void
+     update_progress_form(char *blurb3) {
+        /*  log_it("update_progress_form --- called"); */
         if (g_current_progress == -999) {
+            /* log_it("You're trying to update progress form when it ain't open. Aww, that's OK. I'll let it go. It's a bit naughty but it's a nonfatal error. No prob, Bob."); */
             return;
         }
         strcpy(g_blurb_str_2, blurb3);
-        update_progress_form_full(g_blurb_str_1, g_blurb_str_2, g_blurb_str_3);
-}
+        update_progress_form_full(g_blurb_str_1, g_blurb_str_2,
+                                  g_blurb_str_3);
+    }
 
 
@@ -1046 +1160 @@
  * @param blurb3 The third line of the blurb. Use @p g_blurb_str_2 (no, that's not a typo either) to keep it the same.
  */
-void update_progress_form_full(char *blurb1, char *blurb2, char *blurb3) {
-
+    void
+     update_progress_form_full(char *blurb1, char *blurb2, char *blurb3) {
         /*@ long ***************************************************** */
         long current_time = 0L;
@@ -1059 +1173 @@
 
         /*@ buffers *************************************************** */
-        char *percentline_str = NULL;
-        char *timeline_str = NULL;
+        char *percentline_str;
+        char *timeline_str;
         char *taskprogress = NULL;
-
+        char *tmp;
+
+//  log_msg(1, "'%s' '%s' '%s'", blurb1, blurb2, blurb3);
+        percentline_str = malloc(MAX_NEWT_COMMENT_LEN);
+        timeline_str = malloc(MAX_NEWT_COMMENT_LEN);
+        malloc_string(tmp);
         if (!g_text_mode) {
             assert(blurb1 != NULL);
@@ -1070 +1189 @@
         }
 
+        percentline_str[0] = '\0';
+
         current_time = get_time();
         time_taken = current_time - g_start_time;
@@ -1076 +1197 @@
         } else {
             if (g_current_progress > g_maximum_progress) {
-                log_msg(0, "update_progress_form_full(%s,%s,%s) --- g_current_progress=%ld; g_maximum_progress=%ld", blurb1, blurb2, blurb3, g_current_progress, g_maximum_progress);
+                sprintf(tmp,
+                        "update_progress_form_full(%s,%s,%s) --- g_current_progress=%ld; g_maximum_progress=%ld",
+                        blurb1, blurb2, blurb3, g_current_progress,
+                        g_maximum_progress);
+                log_msg(0, tmp);
                 g_current_progress = g_maximum_progress;
             }
-            percentage = (int) ((g_current_progress * 100L) / g_maximum_progress);
+            percentage =
+                (int) ((g_current_progress * 100L) / g_maximum_progress);
         }
         if (percentage < 1) {
@@ -1088 +1214 @@
         }
         if (g_current_progress) {
-            time_total_est = time_taken * (long) g_maximum_progress / (long) g_current_progress;
+            time_total_est =
+                time_taken * (long) g_maximum_progress /
+                (long) (g_current_progress);
             time_remaining = time_total_est - time_taken;
         } else {
@@ -1094 +1222 @@
         }
         g_mysterious_dot_counter = (g_mysterious_dot_counter + 1) % 27;
+        sprintf(timeline_str,
+                "%2ld:%02ld taken               %2ld:%02ld remaining  ",
+                (long) time_taken / 60, time_taken % 60, time_remaining / 60,
+                time_remaining % 60);
+        sprintf(percentline_str, " %3d%% done                 %3d%% to go",
+                percentage, 100 - percentage);
+
         if (g_text_mode) {
             printf("---progress-form---1--- %s\n", blurb1);
@@ -1109 +1244 @@
                 log_msg(2, "percentage = %d", percentage);
             }
-            mr_strcat(taskprogress, "] %3d%% done; %2ld:%02ld to go", percentage, (long) time_remaining / 60, (long) time_remaining % 60);
+            mr_strcat(taskprogress, "] %3d%% done; %2ld:%02ld to go", percentage,
+                            (long) time_remaining / 60, (long) time_remaining % 60);
             printf("---progress-form---4--- %s\n", taskprogress);
             paranoid_free(taskprogress);
         } 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);
-
             center_string(blurb1, 54);
             center_string(blurb2, 54);
@@ -1132 +1265 @@
                 newtLabelSetText(g_timeline, timeline_str);
             }
-            mr_free(timeline_str);
-
             if (g_percentline) {
                 newtLabelSetText(g_percentline, percentline_str);
             }
-            mr_free(percentline_str);
-
             newtDrawForm(g_progressForm);
             newtRefresh();
         }
-    }
+        paranoid_free(percentline_str);
+        paranoid_free(timeline_str);
+        paranoid_free(tmp);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
 
 
@@ -1153 +1297 @@
  * @return The backup type chosen, or @c none if the user chose "Exit to shell".
  */
-t_bkptype which_backup_media_type(bool restoring) {
+    t_bkptype which_backup_media_type(bool restoring) {
 
         /*@ char ************************************************************ */
@@ -1160 +1304 @@
 
         /*@ newt ************************************************************ */
-        char *title_sz = NULL;
-        char *minimsg_sz = NULL;
-        static t_bkptype possible_bkptypes[] = { none, cdr, cdrw, dvd, tape, cdstream, udev, netfs, iso };
-        static char *possible_responses[] = { "none", "cdr", "cdrw", "dvd", "tape", "cdstream", "udev", "netfs", "iso", NULL };
-        char *outstr = NULL;
+        char *title_sz;
+        char *minimsg_sz;
+        static t_bkptype possible_bkptypes[] =
+            { none, cdr, cdrw, dvd, tape, cdstream, udev, netfs, iso };
+        static char *possible_responses[] =
+            { "none", "cdr", "cdrw", "dvd", "tape", "cdstream", "udev",
+"netfs", "iso", NULL };
+        char *outstr;
+        char *p;
         t_bkptype backup_type;
         int i;
@@ -1179 +1327 @@
         newtComponent myForm;
 
+        title_sz = malloc(MAX_NEWT_COMMENT_LEN);
+        minimsg_sz = malloc(MAX_NEWT_COMMENT_LEN);
+        outstr = malloc(MAX_NEWT_COMMENT_LEN);
         if (g_text_mode) {
             for (backup_type = none; backup_type == none;) {
@@ -1187 +1338 @@
                 }
                 printf(")\n--> ");
-                mr_getline(outstr, stdin);
-                mr_strip_spaces(outstr);
+                p = fgets(outstr, MAX_NEWT_COMMENT_LEN, stdin);
+                if (!p) {
+                    // FIXME
+                }
+                strip_spaces(outstr);
                 for (i = 0; possible_responses[i]; i++) {
                     if (!strcmp(possible_responses[i], outstr)) {
@@ -1194 +1348 @@
                     }
                 }
-                mr_free(outstr);
-            }
+            }
+            paranoid_free(title_sz);
+            paranoid_free(minimsg_sz);
+            paranoid_free(outstr);
             return (backup_type);
         }
         newtDrawRootText(18, 0, WELCOME_STRING);
         if (restoring) {
-            mr_asprintf(title_sz, "Please choose the backup media from which you want to read data.");
-            mr_asprintf(minimsg_sz, "Read from:");
-        } else {
-            mr_asprintf(title_sz, "Please choose the backup media to which you want to archive data.");
-            mr_asprintf(minimsg_sz, "Backup to:");
+            strcpy(title_sz,
+                   "Please choose the backup media from which you want to read data.");
+            strcpy(minimsg_sz, "Read from:");
+        } else {
+            strcpy(title_sz,
+                   "Please choose the backup media to which you want to archive data.");
+            strcpy(minimsg_sz, "Backup to:");
         }
         newtPushHelpLine(title_sz);
+        //  newtOpenWindow (23, 3, 34, 17, minimsg_sz);
         newtCenteredWindow(34, 17, minimsg_sz);
         b1 = newtButton(1, 1, "CD-R disks ");
@@ -1240 +1399 @@
         }
         newtPopHelpLine();
-        mr_free(title_sz);
-        mr_free(minimsg_sz);
+        paranoid_free(title_sz);
+        paranoid_free(minimsg_sz);
+        paranoid_free(outstr);
         return (output);
     }
@@ -1263 +1423 @@
         newtComponent b2;
         newtComponent b3;
-        newtComponent b4;
+        //newtComponent b4;
         newtComponent b5;
         newtComponent b_res;
@@ -1275 +1435 @@
         b2 = newtButton(18, 1, "gzip");
         b3 = newtButton(4, 5, "lzo");
-        b4 = newtButton(18, 5, "lzma");
+        //b4 = newtButton(18, 5, "lzma");
         b5 = newtButton(4, 9, "         Exit        ");
         myForm = newtForm(NULL, NULL, 0);
@@ -1288 +1448 @@
         } else if (b_res == b3) {
             mr_asprintf(output, "%s", "lzo");
-        } else if (b_res == b4) {
-            mr_asprintf(output, "%s", "lzma");
+        //} else if (b_res == b4) {
+            //mr_asprintf(output, "%s", "lzma");
         }
         newtPopHelpLine();
@@ -1301 +1461 @@
  * @return The compression level (0-9) chosen, or -1 for "Exit".
  */
-int which_compression_level() {
+    int
+     which_compression_level() {
 
         /*@ char ************************************************************ */
@@ -1318 +1479 @@
 
         newtDrawRootText(18, 0, WELCOME_STRING);
-        newtPushHelpLine("   Please specify the level of compression that you want.");
+        newtPushHelpLine
+            ("   Please specify the level of compression that you want.");
+        //  newtOpenWindow (23, 3, 34, 13, "How much compression?");
         newtCenteredWindow(34, 13, "How much compression?");
         b1 = newtButton(4, 1, "Maximum (9)");
@@ -1355 +1518 @@
  * @param source_file The file containing a list of filenames to load into @p filelist.
  */
-int load_filelist_into_array(struct s_filelist *filelist, char *source_file) {
-
+    int load_filelist_into_array(struct s_filelist *filelist,
+                                 char *source_file) {
         int i;
         int j = 0;
         bool done;
-        char *tmp = NULL;
+        char *tmp;
+        char *p;
         char *tmp1 = NULL;
         FILE *fin, *fout;
@@ -1379 +1543 @@
         if (!(fout = fopen(tmp1, "a"))) {
             log_msg(2, "Can't write to %s", tmp1);
-            mr_free(tmp1);
             return(1);
             }
 
+        malloc_string(tmp);
         log_msg(2, "Loading %s", source_file);
-        for (filelist->entries = 0; filelist->entries <= ARBITRARY_MAXIMUM; ) {
-            mr_free(tmp);
+        for (filelist->entries = 0; filelist->entries <= ARBITRARY_MAXIMUM;
+             filelist->entries++) {
+          god_i_hate_gotos:
             if (feof(fin)) {
                 break;
             }
-            mr_getline(tmp, fin);
+            p = fgets(tmp, MAX_NEWT_COMMENT_LEN, fin);
+            if (!p) {
+                // FIXME
+            }
             i = (int) strlen(tmp);
             if (i < 2) {
-                continue;
+                goto god_i_hate_gotos;
             }
             if (tmp[i - 1] < 32) {
@@ -1398 +1566 @@
             }
             if (i < 2) {
-                continue;
+                goto god_i_hate_gotos;
             }
             if (!does_file_exist(tmp) && !feof(fin)) {
                 j++;
                 fprintf(fout, "%s\n", tmp);
-                continue;
-            }
-            filelist->el[filelist->entries].severity = severity_of_difference(tmp, NULL);
+
+                goto god_i_hate_gotos;
+            }
+            filelist->el[filelist->entries].severity =
+                severity_of_difference(tmp, NULL);
             strcpy(filelist->el[filelist->entries].filename, tmp);
             if (feof(fin)) {
                 break;
             }
-            filelist->entries++;
-        }
-        mr_free(tmp);
+        }
         paranoid_fclose(fin);
         paranoid_fclose(fout);
@@ -1418 +1586 @@
             log_to_screen("%d files listed in %s/changed.files have been deleted since backup was made\nand are referenced in %s", j, bkpinfo->tmpdir,tmp1);
         }
-        mr_free(tmp1);
+        paranoid_free(tmp1);
         if (filelist->entries >= ARBITRARY_MAXIMUM) {
             log_to_screen("Arbitrary limits suck, man!");
+            paranoid_free(tmp);
             return (1);
         }
@@ -1448 +1617 @@
             }
         }
+        paranoid_free(tmp);
         log_it("leaving");
         return (0);
     }
+
 
 
@@ -1459 +1630 @@
  * @note The returned value points to static storage that will be overwritten with each call.
  */
-char *filelist_entry_to_string(struct s_filelist_entry *flentry) {
+    char *filelist_entry_to_string(struct s_filelist_entry *flentry) {
         static char comment[100];
         char *tmp = NULL;
 
-        log_msg(8, "entering");
+        log_it("entering");
         assert(flentry != NULL);
         if (flentry->severity == 0) {
@@ -1477 +1648 @@
         mr_strcat(tmp, flentry->filename);
         strncpy(comment, tmp, 99);
-        mr_free(tmp);
+        paranoid_free(tmp);
 
         log_it("leaving");
         return (comment);
     }
+
+
+
 
 
@@ -1489 +1663 @@
  * @param source_file The file containing a list of changed files.
  */
-void popup_changelist_from_file(char *source_file) {
-
-        char *reason = NULL;
+    void popup_changelist_from_file(char *source_file) {
+        char *reason;
         newtComponent myForm;
         newtComponent bClose;
@@ -1512 +1685 @@
 
         /*@ buffers ********************************************************* */
-        char *tmp = NULL;
-        char *differ_sz = NULL;
+        char *tmp;
+        char *differ_sz;
 
         struct s_filelist *filelist;
+        malloc_string(reason);
+        tmp = malloc(5000);
+        malloc_string(differ_sz);
         assert_string_is_neither_NULL_nor_zerolength(source_file);
         if (g_text_mode) {
             log_msg(2, "Text mode. Therefore, no popup list.");
-            return;
+            goto free_to_go;
         }
         log_msg(2, "Examining file %s", source_file);
@@ -1526 +1702 @@
         if (lng < 1) {
             log_msg(2, "No lines in file. Therefore, no popup list.");
-            return;
+            paranoid_free(reason);
+            goto free_to_go;
         } else if (lng >= ARBITRARY_MAXIMUM) {
             log_msg(2, "Too many files differ for me to list.");
-            return;
+            goto free_to_go;
         }
 
@@ -1538 +1715 @@
 
         if (load_filelist_into_array(filelist, source_file)) {
-            log_msg(2, "Can't open %s; therefore, cannot popup list", source_file);
+            log_msg(2, "Can't open %s; therefore, cannot popup list",
+                    source_file);
+            paranoid_free(reason);
             return;
         }
-        log_msg(2, "%d files loaded into filelist array", filelist->entries);
+        log_msg(2, "%d files loaded into filelist array",
+                filelist->entries);
         for (i = 0; i < filelist->entries; i++) {
             keylist[i] = (void *) i;
@@ -1550 +1730 @@
                                    keylist[i]);
         }
-        mr_asprintf(differ_sz, "  %ld files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list.", i);
+        sprintf(differ_sz,
+                "  %ld files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list.",
+                i);
         newtPushHelpLine(differ_sz);
-        mr_free(differ_sz);
-
         bClose = newtCompactButton(10, 15, " Close  ");
         bSelect = newtCompactButton(30, 15, " Select ");
-        mr_asprintf(tmp, "%-10s               %-20s", "Priority", "Filename");
+        sprintf(tmp, "%-10s               %-20s", "Priority", "Filename");
         headerMsg = newtLabel(2, 1, tmp);
-        mr_free(tmp);
-
         newtOpenWindow(5, 4, 70, 16, "Non-matching files");
         myForm = newtForm(NULL, NULL, 0);
-        newtFormAddComponents(myForm, headerMsg, fileListbox, bClose, bSelect, NULL);
-
+        newtFormAddComponents(myForm, headerMsg, fileListbox, bClose,
+                              bSelect, NULL);
         while (!finished) {
             b_res = newtRunForm(myForm);
@@ -1578 +1756 @@
                     currline = i;
                     if (filelist->entries > 0) {
-                        malloc_string(reason);
-                        severity_of_difference(filelist->el[currline].  filename, &reason);
-                        mr_asprintf(tmp, "%s --- %s", filelist->el[currline].filename, reason);
-
+                        severity_of_difference(filelist->el[currline].
+                                               filename, reason);
+                        sprintf(tmp, "%s --- %s",
+                                filelist->el[currline].filename, reason);
                         popup_and_OK(tmp);
-                        mr_free(tmp);
-                        paranoid_free(reason);
                     }
                 }
@@ -1592 +1768 @@
         newtPopWindow();
         newtPopHelpLine();
+      free_to_go:
+        paranoid_free(reason);
+        paranoid_free(tmp);
+        paranoid_free(differ_sz);
         return;
     }