Changeset 3190 in MondoRescue for branches/3.1/mondo/src/common/newt-specific.c

Timestamp:

Sep 25, 2013, 8:55:43 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Modification to 3.1 branch to make it extremely similar to 3.0. What remains are function rewrite with allocation in the function and desallocation outside of the function. Will be next step

File:

• branches/3.1/mondo/src/common/newt-specific.c (modified) (14 diffs)

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

@@ -122 +122 @@
 
         /*@ buffers ********************************************************** */
-        int i;
-        char *tmp;
+        int i = 0;
+        char *tmp = NULL;
 
         assert_string_is_neither_NULL_nor_zerolength(prompt);
@@ -173 +173 @@
         int i;
 
+        assert_string_is_neither_NULL_nor_zerolength(prompt);
         if (g_fail_immediately) {
             // We consider the user aborted by using the -F option
@@ -326 +327 @@
         paranoid_system("killall mindi 2> /dev/null");
         kill_anything_like_this("/mondo/do-not");
-        kill_anything_like_this("tmp.mondo");
+        kill_anything_like_this("mondo.tmp");
         kill_anything_like_this("ntfsclone");
         sync();
@@ -420 +421 @@
         free_newt_stuff();
         if (!g_text_mode) {
-            log_msg(1, "Calling newtFinished()");
-            newtFinished();
+            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);
@@ -440 +446 @@
         char *command = NULL;
         char *tmp = NULL;
+        char *p = NULL;
 
         /*@ pointers ********************************************************* */
@@ -465 +472 @@
                 for (err_log_lines[i][0] = '\0';
                      strlen(err_log_lines[i]) < 2 && !feof(fin);) {
-                    if (fgets(err_log_lines[i], MAX_NEWT_COMMENT_LEN, fin)) {
-                        //FIXME
+                    p = fgets(err_log_lines[i], MAX_NEWT_COMMENT_LEN, fin);
+                    if (!p) {
+                        // FIXME
                     }
                     /* Commented to make valgrind happy and avoid crash
@@ -571 +579 @@
 
         /*@ buffers ********************************************************* */
-        char *title = NULL;
         char *tmp = NULL;
 
@@ -580 +587 @@
         assert(ttl != NULL);
         malloc_string(tmp);
-        mr_asprintf(title, "%s", ttl);
-        strcpy(g_isoform_header_str, title);
-        if (g_text_mode) {
-            log_msg(0, title);
-        } else {
-            strcpy(tmp, title);
+        strcpy(g_isoform_header_str, ttl);
+        if (g_text_mode) {
+            log_msg(0, ttl);
+        } else {
+            strcpy(tmp, ttl);
             center_string(tmp, 80);
             newtPushHelpLine(tmp);
@@ -596 +602 @@
             g_isoform_header = newtLabel(1, 1, g_isoform_header_str);
             g_isoform_scale = newtScale(3, 3, 34, 100);
-            newtCenteredWindow(40, 7, title);
+            newtCenteredWindow(40, 7, ttl);
             g_isoform_main = newtForm(NULL, NULL, 0);
             g_isoform_timeline = newtLabel(1, 5, "                    ");
@@ -607 +613 @@
         }
         update_evalcall_form(0);
-        mr_free(title);
         paranoid_free(tmp);
     }
@@ -971 +976 @@
                 }
                 if (percentage >= 3) {
-                    mr_strcat(taskprogress, "] %3d%% done; %2ld:%02ld to go", percentage, time_remaining / 60, time_remaining % 60);
+                    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);
@@ -1225 +1230 @@
         mr_free(title_sz);
         mr_free(minimsg_sz);
-        paranoid_free(outstr);
         return (output);
     }
@@ -1369 +1373 @@
         log_msg(2, "Loading %s", source_file);
         for (filelist->entries = 0; filelist->entries <= ARBITRARY_MAXIMUM; ) {
-            if (tmp != NULL) {
-                mr_free(tmp);
-            }
+            mr_free(tmp);
             if (feof(fin)) {
                 break;
@@ -1568 +1570 @@
             }
         }
-
         newtFormDestroy(myForm);
         newtPopWindow();