Changeset 900 in MondoRescue for trunk/mondo/src/common/newt-specific.c

Timestamp:

Oct 24, 2006, 8:49:18 AM (18 years ago)

Author:

Bruno Cornec

Message:

Huge patch to introduce low level functions that will bw used everywhere (mr_free, mr_asprintf, ...)
Nearly linking now due to that.

File:

• trunk/mondo/src/common/newt-specific.c (modified) (49 diffs)

trunk/mondo/src/common/newt-specific.c

@@ -26 +26 @@
 #include "libmondo-fork-EXT.h"
 #include "newt-specific-EXT.h"
+#include "mr_mem.h"
 
 /*@unused@*/
@@ -116 +117 @@
                     ("---promptdialogYN---1--- %s\r\n---promptdialogYN---Q--- [yes] [no] ---\r\n--> ",
                      prompt);
-                (void) getline(&tmp, &n, stdin);
+                mr_getline(&tmp, &n, stdin);
                 if (tmp[strlen(tmp) - 1] == '\n')
                     tmp[strlen(tmp) - 1] = '\0';
@@ -125 +126 @@
                 }
                 if (strstr(_("yesYES"), tmp)) {
-                    paranoid_free(tmp);
+                    mr_free(tmp);
                     return (TRUE);
                 } else if (strstr(_("NOno"), tmp)) {
-                    paranoid_free(tmp);
+                    mr_free(tmp);
                     return (FALSE);
                 } else {
@@ -161 +162 @@
                 ("---promptdialogOKC---1--- %s\r\n---promptdialogOKC---Q--- [OK] [Cancel] ---\r\n--> ",
                  prompt);
-            (void) getline(&tmp, &n, stdin);
+            mr_getline(&tmp, &n, stdin);
             if (tmp[strlen(tmp) - 1] == '\n')
                 tmp[strlen(tmp) - 1] = '\0';
@@ -170 +171 @@
             }
             if (strstr(_("okOKOkYESyes"), tmp)) {
-                paranoid_free(tmp);
+                mr_free(tmp);
                 return (TRUE);
             } else {
-                paranoid_free(tmp);
+                mr_free(tmp);
                 return (FALSE);
             }
@@ -243 +244 @@
     char *tmp = NULL;
 
-    asprintf(&tmp,"kill `ps %s | grep \" %s \" | awk '{print $1;}' | grep -vx \"\\?\"`", ps_options, str);
+    mr_asprintf(&tmp,"kill `ps %s | grep \" %s \" | awk '{print $1;}' | grep -vx \"\\?\"`", ps_options, str);
 run_program_and_log_output(tmp, TRUE);
-    paranoid_free(tmp);
+    mr_free(tmp);
 }
 
@@ -264 +265 @@
         /*@ end vars **************************************************** */
 
-        asprintf(&fatalstr, "-------FATAL ERROR---------");
+        mr_asprintf(&fatalstr, "-------FATAL ERROR---------");
         set_signals(FALSE);     // link to external func
         g_exiting = TRUE;
@@ -297 +298 @@
         sync();
         if (g_tmpfs_mountpt != NULL) {
-            asprintf(&tmp, "umount %s", g_tmpfs_mountpt);
+            mr_asprintf(&tmp, "umount %s", g_tmpfs_mountpt);
             chdir("/");
             for (i = 0; i < 10 && run_program_and_log_output(tmp, 5); i++) {
@@ -304 +305 @@
                 run_program_and_log_output(tmp, 5);
             }
-            paranoid_free(tmp);
+            mr_free(tmp);
         }
 
@@ -312 +313 @@
 
         if (g_selfmounted_isodir) {
-            asprintf(&command, "umount %s", g_selfmounted_isodir);
+            mr_asprintf(&command, "umount %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 5);
-            asprintf(&command, "rmdir %s", g_selfmounted_isodir);
+            mr_asprintf(&command, "rmdir %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 5);
-            paranoid_free(g_selfmounted_isodir);
+            mr_free(g_selfmounted_isodir);
         }
 
@@ -322 +323 @@
             log_msg(0, fatalstr);
             log_msg(0, error_string);
-            //      popup_and_OK (error_string);
             newtFinished();
         }
 
-        system
-            ("gzip -9c "MONDO_LOGFILE" > /tmp/MA.log.gz 2> /dev/null");
         printf
                 (_("If you require technical support, please contact the mailing list.\n"));
@@ -334 +332 @@
                 (_("The list's members can help you, if you attach that file to your e-mail.\n"));
         printf(_("Log file: %s\n"), MONDO_LOGFILE);
-        if (does_file_exist("/tmp/MA.log.gz")) {
-            printf
-                (_("FYI, I have gzipped the log and saved it to /tmp/MA.log.gz\n"));
-        }
         printf(_("Mondo has aborted.\n"));
         register_pid(0, "mondo");   // finish() does this too, FYI
@@ -357 +351 @@
      finish(int signal) {
         char *command = NULL;
-
-        /*  if (signal==0) { popup_and_OK("Please press <enter> to quit."); } */
-
-        /* newtPopHelpLine(); */
 
         register_pid(0, "mondo");
@@ -371 +361 @@
         }
         if (g_selfmounted_isodir) {
-            asprintf(&command, "umount %s", g_selfmounted_isodir);
+            mr_asprintf(&command, "umount %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
-            asprintf(&command, "rmdir %s", g_selfmounted_isodir);
+            mr_asprintf(&command, "rmdir %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
-            paranoid_free(g_selfmounted_isodir);
-        }
-//  iamhere("foo");
-        /* system("clear"); */
-//  iamhere("About to call newtFinished");
+            mr_free(g_selfmounted_isodir);
+        }
         if (!g_text_mode) {
             if (does_file_exist("/THIS-IS-A-RAMDISK")) {
@@ -389 +376 @@
             }
         }
-//  system("clear");
-//  iamhere("Finished calling newtFinished");
         printf(_("Execution run ended; result=%d\n"), signal);
         printf(_("Type 'less %s' to see the output log\n"), MONDO_LOGFILE);
@@ -428 +413 @@
         }
         if (grep_for_me[0] != '\0') {
-            asprintf(&command, "grep '%s' %s | tail -n%d",
+            mr_asprintf(&command, "grep '%s' %s | tail -n%d",
                      grep_for_me, filename, g_noof_log_lines);
         } else {
-            asprintf(&command, "tail -n%d %s", g_noof_log_lines, filename);
+            mr_asprintf(&command, "tail -n%d %s", g_noof_log_lines, filename);
         }
         fin = popen(command, "r");
@@ -440 +425 @@
                 for (;
                     strlen(err_log_lines[i]) < 2 && !feof(fin);) {
-                    getline(&(err_log_lines[i]), &n, fin);
+                    mr_getline(&(err_log_lines[i]), &n, fin);
                     strip_spaces(err_log_lines[i]);
                     if (!strncmp(err_log_lines[i], "root:", 5)) {
-                        asprintf(&tmp, "%s", err_log_lines[i] + 6);
-                        paranoid_free(err_log_lines[i]);
+                        mr_asprintf(&tmp, "%s", err_log_lines[i] + 6);
+                        mr_free(err_log_lines[i]);
                         err_log_lines[i] = tmp;
                     }
@@ -455 +440 @@
         }
         refresh_log_screen();
-        paranoid_free(command);
+        mr_free(command);
     }
 
@@ -477 +462 @@
 
         va_start(args, fmt);
-        vasprintf(&output, fmt, args);
+        mr_vasprintf(&output, fmt, args);
         log_msg(0, output);
         if (strlen(output) > 80) {
@@ -489 +474 @@
 
         if (err_log_lines) {
-            paranoid_free(err_log_lines[0]);
+            mr_free(err_log_lines[0]);
             for (i = 1; i < g_noof_log_lines; i++) {
                 err_log_lines[i - 1] = err_log_lines[i];
@@ -549 +534 @@
 
         assert(ttl != NULL);
-        asprintf(&title, ttl);
+        mr_asprintf(&title, ttl);
         // BERLIOS: We need to unallocate it somewhere
-        asprintf(&g_isoform_header_str, title);
+        mr_asprintf(&g_isoform_header_str, title);
         //  center_string (title, 80);
         if (g_text_mode) {
             log_msg(0, title);
         } else {
-            asprintf(&tmp, title);
+            mr_asprintf(&tmp, title);
             /* BERLIOS: center_string is now broken replace it ! */
             //center_string(tmp, 80);
             newtPushHelpLine(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
         }
         /* BERLIOS: center_string is now broken replace it ! */
@@ -581 +566 @@
         }
         update_evalcall_form(0);
-        paranoid_free(title);
+        mr_free(title);
     }
 
@@ -613 +598 @@
         assert(b3 != NULL);
 
-        asprintf(&blurb1, b1);
-        asprintf(&blurb2, b2);
-        asprintf(&blurb3, b3);
-        asprintf(&b1c, b1);
+        mr_asprintf(&blurb1, b1);
+        mr_asprintf(&blurb2, b2);
+        mr_asprintf(&blurb3, b3);
+        mr_asprintf(&b1c, b1);
         /* BERLIOS: center_string is now broken replace it ! */
         //center_string(b1c, 80);
@@ -627 +612 @@
         g_current_progress = 0;
         // BERLIOS: We need to unallocate them
-        asprintf(&g_blurb_str_1, blurb1);
-        asprintf(&g_blurb_str_2, blurb3);
-        asprintf(&g_blurb_str_3, blurb2);
+        mr_asprintf(&g_blurb_str_1, blurb1);
+        mr_asprintf(&g_blurb_str_2, blurb3);
+        mr_asprintf(&g_blurb_str_3, blurb2);
         if (g_text_mode) {
             log_msg(0, blurb1);
@@ -651 +636 @@
         }
         update_progress_form_full(blurb1, blurb2, blurb3);
-        paranoid_free(b1c);
-        paranoid_free(blurb1);
-        paranoid_free(blurb2);
-        paranoid_free(blurb3);
+        mr_free(b1c);
+        mr_free(blurb1);
+        mr_free(blurb2);
+        mr_free(blurb3);
     }
 
@@ -710 +695 @@
                 ("---promptstring---1--- %s\r\n---promptstring---2--- %s\r\n---promptstring---Q---\r\n-->  ",
                  title, b);
-            paranoid_free(output);
-            (void) getline(&output, &n, stdin);
+            mr_free(output);
+            mr_getline(&output, &n, stdin);
             if (output[strlen(output) - 1] == '\n')
                 output[strlen(output) - 1] = '\0';
             return (ret);
         }
-        asprintf(&blurb, b);
+        mr_asprintf(&blurb, b);
         text = newtTextboxReflowed(2, 1, blurb, 48, 5, 5, 0);
 
@@ -732 +717 @@
         //center_string(blurb, 80);
         newtPushHelpLine(blurb);
-        paranoid_free(blurb);
+        mr_free(blurb);
 
         b_res = newtRunForm(myForm);
@@ -741 +726 @@
             // Copy entry_value before destroying the form
             // clearing potentially output before
-            paranoid_alloc(output,*entry_value);
+            mr_allocstr(output,*entry_value);
         }
         newtFormDestroy(myForm);
@@ -779 +764 @@
                 printf("%s (%s or %s) --> ", p, button1, button2);
             }
-            for (asprintf(&tmp, " ");
+            for (mr_asprintf(&tmp, " ");
                  strcmp(tmp, button1) && (strlen(button2) == 0
                                           || strcmp(tmp, button2));) {
                 printf("--> ");
-                paranoid_free(tmp);
-                (void) getline(&tmp, &n, stdin);
+                mr_free(tmp);
+                mr_getline(&tmp, &n, stdin);
             }
             if (!strcmp(tmp, button1)) {
-                paranoid_free(tmp);
+                mr_free(tmp);
                 return (TRUE);
             } else {
-                paranoid_free(tmp);
+                mr_free(tmp);
                 return (FALSE);
             }
         }
 
-        asprintf(&prompt, p);
+        mr_asprintf(&prompt, p);
         text = newtTextboxReflowed(1, 1, prompt, 40, 5, 5, 0);
         b_1 =
@@ -816 +801 @@
         //center_string(prompt, 80);
         newtPushHelpLine(prompt);
-        paranoid_free(prompt);
+        mr_free(prompt);
         b_res = newtRunForm(myForm);
         newtPopHelpLine();
@@ -943 +928 @@
             || percentage > g_isoform_old_progress) {
             g_isoform_old_progress = percentage;
-            asprintf(&timeline_str,
+            mr_asprintf(&timeline_str,
                      _("%2ld:%02ld taken            %2ld:%02ld remaining"),
                      time_taken / 60, time_taken % 60, time_remaining / 60,
@@ -968 +953 @@
                 *p = '\0';
 
-                asprintf(&pcline_str, " Working%s%s %c", tmp1, tmp2,
+                mr_asprintf(&pcline_str, " Working%s%s %c", tmp1, tmp2,
                          special_dot_char(g_mysterious_dot_counter));
-                paranoid_free(tmp1);
-                paranoid_free(tmp2);
+                mr_free(tmp1);
+                mr_free(tmp2);
             } else {
-                asprintf(&pcline_str,
+                mr_asprintf(&pcline_str,
                          _(" %3d%% done              %3d%% to go"),
                          percentage, 100 - percentage);
@@ -992 +977 @@
 
                 if (percentage >= 3) {
-                    asprintf(&taskprogress,
+                    mr_asprintf(&taskprogress,
                              "TASK:  [%s%s] %3d%% done; %2ld:%02ld to go",
                              tmp1, tmp2, percentage, time_remaining / 60,
@@ -1000 +985 @@
                     printf("---evalcall---2--- %s\r\n", taskprogress);
                     printf("---evalcall---E---\r\n");
-                    paranoid_free(taskprogress);
+                    mr_free(taskprogress);
                 }
             } else {
@@ -1010 +995 @@
                 }
             }
-            paranoid_free(timeline_str);
-            paranoid_free(pcline_str);
+            mr_free(timeline_str);
+            mr_free(pcline_str);
         }
         if (!g_text_mode) {
@@ -1032 +1017 @@
             return;
         }
-        paranoid_free(g_blurb_str_2);
-        asprintf(&g_blurb_str_2, blurb3);
+        mr_free(g_blurb_str_2);
+        mr_asprintf(&g_blurb_str_2, blurb3);
         update_progress_form_full(g_blurb_str_1, g_blurb_str_2,
                                   g_blurb_str_3);
@@ -1081 +1066 @@
         } else {
             if (g_current_progress > g_maximum_progress) {
-                asprintf(&tmp,
+                mr_asprintf(&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);
-                paranoid_free(tmp);
+                mr_free(tmp);
                 g_current_progress = g_maximum_progress;
             }
@@ -1108 +1093 @@
         /* BERLIOS/ Is it useful here ? */
         //g_mysterious_dot_counter = (g_mysterious_dot_counter + 1) % 27;
-        asprintf(&timeline_str,
+        mr_asprintf(&timeline_str,
                  "%2ld:%02ld taken               %2ld:%02ld remaining  ",
                  time_taken / 60, time_taken % 60, time_remaining / 60,
                  time_remaining % 60);
-        asprintf(&percentline_str,
+        mr_asprintf(&percentline_str,
                  " %3d%% done                 %3d%% to go", percentage,
                  100 - percentage);
@@ -1138 +1123 @@
                 log_msg(2, _("percentage = %d"), percentage);
             }
-            asprintf(&taskprogress,
+            mr_asprintf(&taskprogress,
                      _("TASK:  [%s%s] %3d%% done; %2ld:%02ld to go"), tmp1,
                      tmp2, percentage, time_remaining / 60,
@@ -1144 +1129 @@
 
             printf(_("---progress-form---4--- %s\r\n"), taskprogress);
-            paranoid_free(taskprogress);
+            mr_free(taskprogress);
         } else {
             /* BERLIOS: center_string is now broken replace it ! */
@@ -1162 +1147 @@
             newtRefresh();
         }
-        paranoid_free(percentline_str);
-        paranoid_free(timeline_str);
+        mr_free(percentline_str);
+        mr_free(timeline_str);
     }
 
@@ -1214 +1199 @@
                 }
                 printf(")\n--> ");
-                (void) getline(&outstr, &n, stdin);
+                mr_getline(&outstr, &n, stdin);
                 strip_spaces(outstr);
                 for (i = 0; possible_responses[i]; i++) {
@@ -1222 +1207 @@
                 }
             }
-            paranoid_free(outstr);
+            mr_free(outstr);
             return (backup_type);
         }
         newtDrawRootText(18, 0, WELCOME_STRING);
         if (restoring) {
-            asprintf(&title_sz,
+            mr_asprintf(&title_sz,
                      _("Please choose the backup media from which you want to read data."));
-            asprintf(&minimsg_sz, _("Read from:"));
-        } else {
-            asprintf(&title_sz,
+            mr_asprintf(&minimsg_sz, _("Read from:"));
+        } else {
+            mr_asprintf(&title_sz,
                      _("Please choose the backup media to which you want to archive data."));
-            asprintf(&minimsg_sz, _("Backup to:"));
+            mr_asprintf(&minimsg_sz, _("Backup to:"));
         }
         newtPushHelpLine(title_sz);
-        paranoid_free(title_sz);
+        mr_free(title_sz);
 
         //  newtOpenWindow (23, 3, 34, 17, minimsg_sz);
         newtCenteredWindow(34, 17, minimsg_sz);
-        paranoid_free(minimsg_sz);
+        mr_free(minimsg_sz);
 
         b1 = newtButton(1, 1, _("CD-R disks "));
@@ -1363 +1348 @@
                 break;
             }
-            (void) getline(&tmp, &n, fin);
+            mr_getline(&tmp, &n, fin);
             i = (int) strlen(tmp);
             if (i < 2) {
@@ -1385 +1370 @@
             filelist->el[filelist->entries].severity =
                 severity_of_difference(tmp, reason);
-            paranoid_free(reason);
+            mr_free(reason);
             strcpy(filelist->el[filelist->entries].filename, tmp);
             if (feof(fin)) {
@@ -1394 +1379 @@
         if (filelist->entries >= ARBITRARY_MAXIMUM) {
             log_to_screen(_("Arbitrary limits suck, man!"));
-            paranoid_free(tmp);
+            mr_free(tmp);
             return (1);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         for (done = FALSE; !done;) {
@@ -1442 +1427 @@
         assert(flentry != NULL);
         if (flentry->severity == 0) {
-            asprintf(&comment, "0     %93s", flentry->filename);
+            mr_asprintf(&comment, "0     %93s", flentry->filename);
         } else if (flentry->severity == 1) {
-            asprintf(&comment, "low   %93s", flentry->filename);
+            mr_asprintf(&comment, "low   %93s", flentry->filename);
         } else if (flentry->severity == 2) {
-            asprintf(&comment, "med   %93s", flentry->filename);
-        } else {
-            asprintf(&comment, "high  %93s", flentry->filename);
+            mr_asprintf(&comment, "med   %93s", flentry->filename);
+        } else {
+            mr_asprintf(&comment, "high  %93s", flentry->filename);
         }
         iamhere("leaving");
@@ -1525 +1510 @@
                                    keylist[i]);
         }
-        asprintf(&differ_sz,
+        mr_asprintf(&differ_sz,
                  _("  %ld files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list."),
                  i);
         newtPushHelpLine(differ_sz);
-        paranoid_free(differ_sz);
+        mr_free(differ_sz);
 
         bClose = newtCompactButton(10, 15, _(" Close  "));
         bSelect = newtCompactButton(30, 15, _(" Select "));
-        asprintf(&tmp, "%-10s               %-20s", _("Priority"),
+        mr_asprintf(&tmp, "%-10s               %-20s", _("Priority"),
                  _("Filename"));
         headerMsg = newtLabel(2, 1, tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         newtOpenWindow(5, 4, 70, 16, _("Non-matching files"));
@@ -1558 +1543 @@
                         severity_of_difference(filelist->el[currline].
                                                filename, reason);
-                        asprintf(&tmp, "%s --- %s",
+                        mr_asprintf(&tmp, "%s --- %s",
                                  filelist->el[currline].filename, reason);
                         popup_and_OK(tmp);
-                        paranoid_free(tmp);
-                        paranoid_free(reason);
+                        mr_free(tmp);
+                        mr_free(reason);
                     }
                 }