Changeset 2357 in MondoRescue for branches/2.2.10/mondo/src/common/newt-specific.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/common/newt-specific.c (modified) (19 diffs)

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

@@ -124 +124 @@
         /*@ buffers ********************************************************** */
         int i;
+        char *tmp;
 
          assert_string_is_neither_NULL_nor_zerolength(prompt);
 
         if (g_text_mode) {
-
-            char *tmp;
-            tmp = malloc(MAX_NEWT_COMMENT_LEN);
-
             while (1) {
                 system("sync");
-                printf
-                    ("---promptdialogYN---1--- %s\n---promptdialogYN---Q--- [yes] [no] ---\n--> ",
-                     prompt);
-                (void) fgets(tmp, MAX_NEWT_COMMENT_LEN, stdin);
+                printf("---promptdialogYN---1--- %s\n---promptdialogYN---Q--- [yes] [no] ---\n--> ", prompt);
+                mr_getline(tmp, stdin);
                 if (tmp[strlen(tmp) - 1] == '\n')
                     tmp[strlen(tmp) - 1] = '\0';
@@ -146 +141 @@
                 }
                 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 {
                     system("sync");
-                    printf
-                        ("Please enter either YES or NO (or yes or no, or y or n, or...)\n");
+                    printf("Please enter either YES or NO (or yes or no, or y or n, or...)\n");
                 }
             }
@@ -172 +166 @@
 
         /*@ buffer *********************************************************** */
-        char *tmp;
+        char *tmp = NULL;
         int i;
 
-        tmp = malloc(MAX_NEWT_COMMENT_LEN);
         assert_string_is_neither_NULL_nor_zerolength(prompt);
+
         if (g_text_mode) {
             system("sync");
-            printf
-                ("---promptdialogOKC---1--- %s\n---promptdialogOKC---Q--- [OK] [Cancel] ---\n--> ",
-                 prompt);
-            (void) fgets(tmp, MAX_NEWT_COMMENT_LEN, stdin);
+            printf("---promptdialogOKC---1--- %s\n---promptdialogOKC---Q--- [OK] [Cancel] ---\n--> ", prompt);
+            mr_getline(tmp, stdin);
             if (tmp[strlen(tmp) - 1] == '\n')
                 tmp[strlen(tmp) - 1] = '\0';
@@ -191 +183 @@
             }
             if (strstr("okOKOkYESyes", tmp)) {
-                paranoid_free(tmp);
+                mr_free(tmp);
                 return (TRUE);
             } else {
-                paranoid_free(tmp);
+                mr_free(tmp);
                 return (FALSE);
             }
         } else {
-            paranoid_free(tmp);
             return (popup_with_buttons(prompt, " Okay ", "Cancel"));
         }
@@ -431 +422 @@
  * @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 ********************************************************** */
@@ -462 +452 @@
                 for (err_log_lines[i][0] = '\0';
                      strlen(err_log_lines[i]) < 2 && !feof(fin);) {
-                    (void) fgets(err_log_lines[i], MAX_NEWT_COMMENT_LEN,
-                                 fin);
+                    (void) fgets(err_log_lines[i], MAX_NEWT_COMMENT_LEN, fin);
                     /* Commented to make valgrind happy and avoid crash
                     strip_spaces(err_log_lines[i]);
@@ -787 +776 @@
 
         /*@ buffers *********************************************************** */
-        char *prompt;
+        char *prompt = NULL;
 
         /*@ newt ************************************************************** */
@@ -799 +788 @@
         assert(button1 != NULL);
         assert(button2 != NULL);
-        prompt = malloc(MAX_NEWT_COMMENT_LEN);
         if (g_text_mode) {
             if (strlen(button2) == 0) {
@@ -806 +794 @@
                 printf("%s (%s or %s) --> ", p, button1, button2);
             }
-            for (prompt[0] = '\0';
-                 strcmp(prompt, button1) && (strlen(button2) == 0
-                                          || strcmp(prompt, button2));) {
+            mr_getline(prompt, stdin);
+            while (strcmp(prompt, button1) && (strlen(button2) == 0 || strcmp(prompt, button2))) {
                 printf("--> ");
-                (void) fgets(prompt, MAX_NEWT_COMMENT_LEN, stdin);
+                mr_free(prompt);
+                mr_getline(prompt, stdin);
             }
             if (!strcmp(prompt, button1)) {
-                paranoid_free(prompt);
+                mr_free(prompt);
                 return (TRUE);
             } else {
-                paranoid_free(prompt);
+                mr_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';
@@ -1166 +1155 @@
             { "none", "cdr", "cdrw", "dvd", "tape", "cdstream", "udev",
 "nfs", "iso", NULL };
-        char *outstr;
+        char *outstr = NULL;
         t_bkptype backup_type;
         int i;
@@ -1181 +1170 @@
         newtComponent myForm;
 
-        outstr = malloc(MAX_NEWT_COMMENT_LEN);
         if (g_text_mode) {
             for (backup_type = none; backup_type == none;) {
@@ -1190 +1178 @@
                 }
                 printf(")\n--> ");
-                (void) fgets(outstr, MAX_NEWT_COMMENT_LEN, stdin);
-                strip_spaces(outstr);
+                mr_getline(outstr, stdin);
+                mr_strip_spaces(outstr);
                 for (i = 0; possible_responses[i]; i++) {
                     if (!strcmp(possible_responses[i], outstr)) {
@@ -1197 +1185 @@
                     }
                 }
-            }
-            paranoid_free(outstr);
+                mr_free(outstr);
+            }
             return (backup_type);
         }
@@ -1319 +1307 @@
         int j = 0;
         bool done;
-        char *tmp;
+        char *tmp = NULL;
         char *tmp1 = NULL;
         FILE *fin, *fout;
@@ -1338 +1326 @@
         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;
-             filelist->entries++) {
+        for (filelist->entries = 0; filelist->entries <= ARBITRARY_MAXIMUM; filelist->entries++) {
           god_i_hate_gotos:
+            if (tmp != NULL) {
+                mr_free(tmp);
+            }
             if (feof(fin)) {
                 break;
             }
-            (void) fgets(tmp, MAX_NEWT_COMMENT_LEN, fin);
+            mr_getline(tmp, fin);
             i = (int) strlen(tmp);
             if (i < 2) {
@@ -1366 +1356 @@
                 goto god_i_hate_gotos;
             }
-            filelist->el[filelist->entries].severity =
-                severity_of_difference(tmp, NULL);
+            filelist->el[filelist->entries].severity = severity_of_difference(tmp, NULL);
             strcpy(filelist->el[filelist->entries].filename, tmp);
             if (feof(fin)) {
@@ -1373 +1362 @@
             }
         }
+        mr_free(tmp);
         paranoid_fclose(fin);
         paranoid_fclose(fout);
@@ -1378 +1368 @@
             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);
         }
-        paranoid_free(tmp1);
+        mr_free(tmp1);
         if (filelist->entries >= ARBITRARY_MAXIMUM) {
             log_to_screen("Arbitrary limits suck, man!");
-            paranoid_free(tmp);
             return (1);
         }
@@ -1409 +1398 @@
             }
         }
-        paranoid_free(tmp);
         log_it("leaving");
         return (0);