Changeset 1107 in MondoRescue for branches/stable/mondo/src/common/newt-specific.c
- Timestamp:
- Feb 8, 2007, 12:09:34 AM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/stable/mondo/src/common/newt-specific.c
r1103 r1107 213 213 usleep(500000); 214 214 if (g_text_mode) { 215 log_msg(2, "Closing evalcall form");215 mr_msg(2, "Closing evalcall form"); 216 216 return; 217 217 } … … 233 233 } 234 234 if (g_current_progress == -999) { 235 log_msg(2,235 mr_msg(2, 236 236 "Trying to close the progress form when it ain't open!"); 237 237 return; … … 241 241 sleep(1); 242 242 if (g_text_mode) { 243 log_msg(2, "Closing progress form");243 mr_msg(2, "Closing progress form"); 244 244 return; 245 245 } … … 285 285 set_signals(FALSE); // link to external func 286 286 g_exiting = TRUE; 287 log_msg(1, "Fatal error received - '%s'", error_string);287 mr_msg(1, "Fatal error received - '%s'", error_string); 288 288 printf("Fatal error... %s\n", error_string); 289 289 if (getpid() == g_mastermind_pid) { 290 log_msg(2, "mastermind %d is exiting", (int) getpid());290 mr_msg(2, "mastermind %d is exiting", (int) getpid()); 291 291 kill(g_main_pid, SIGTERM); 292 292 mr_free(tmp); … … 296 296 if (getpid() != g_main_pid) { 297 297 if (g_mastermind_pid != 0 && getpid() != g_mastermind_pid) { 298 log_msg(2, "non-m/m %d is exiting", (int) getpid());298 mr_msg(2, "non-m/m %d is exiting", (int) getpid()); 299 299 kill(g_main_pid, SIGTERM); 300 300 mr_free(tmp); … … 303 303 } 304 304 305 log_msg(3, "OK, I think I'm the main PID.");305 mr_msg(3, "OK, I think I'm the main PID."); 306 306 if (already_exiting) { 307 log_msg(3, "...I'm already exiting. Give me time, Julian!");307 mr_msg(3, "...I'm already exiting. Give me time, Julian!"); 308 308 mr_free(tmp); 309 309 finish(1); … … 311 311 312 312 already_exiting = TRUE; 313 log_msg(2, "I'm going to do some cleaning up now.");313 mr_msg(2, "I'm going to do some cleaning up now."); 314 314 paranoid_system("killall mindi 2> /dev/null"); 315 315 kill_anything_like_this("/mondo/do-not"); … … 320 320 chdir("/"); 321 321 for (i = 0; i < 10 && run_program_and_log_output(tmp, 5); i++) { 322 log_msg(2, "Waiting for child processes to terminate");322 mr_msg(2, "Waiting for child processes to terminate"); 323 323 sleep(1); 324 324 run_program_and_log_output(tmp, 5); … … 337 337 338 338 if (!g_text_mode) { 339 log_msg(0, fatalstr);340 log_msg(0, error_string);339 mr_msg(0, fatalstr); 340 mr_msg(0, error_string); 341 341 // popup_and_OK (error_string); 342 342 newtFinished(); … … 359 359 register_pid(0, "mondo"); // finish() does this too, FYI 360 360 if (!g_main_pid) { 361 log_msg(3, "FYI - g_main_pid is blank");361 mr_msg(3, "FYI - g_main_pid is blank"); 362 362 } 363 363 mr_free(tmp); … … 402 402 if (!g_text_mode) { 403 403 if (does_file_exist("/THIS-IS-A-RAMDISK")) { 404 log_msg(1, "Calling newtFinished()");404 mr_msg(1, "Calling newtFinished()"); 405 405 newtFinished(); 406 406 } else { 407 log_msg(1, "Calling newtSuspend()");407 mr_msg(1, "Calling newtSuspend()"); 408 408 newtSuspend(); 409 409 } … … 504 504 va_start(args, fmt); 505 505 vsprintf(output, fmt, args); 506 log_msg(0, output);506 mr_msg(0, output); 507 507 output[80] = '\0'; 508 508 va_end(args); … … 549 549 mvaddstr_and_log_it(int y, int x, char *output) { 550 550 assert_string_is_neither_NULL_nor_zerolength(output); 551 log_msg(0, output);551 mr_msg(0, output); 552 552 if (g_text_mode) { 553 553 printf("%s\n", output); … … 583 583 // center_string (title, 80); 584 584 if (g_text_mode) { 585 log_msg(0, title);585 mr_msg(0, title); 586 586 } else { 587 587 strcpy(tmp, title); … … 592 592 g_isoform_starttime = get_time(); 593 593 if (g_text_mode) { 594 log_msg(0, g_isoform_header_str);594 mr_msg(0, g_isoform_header_str); 595 595 } else { 596 596 g_isoform_header = newtLabel(1, 1, g_isoform_header_str); … … 661 661 strcpy(g_blurb_str_3, blurb2); 662 662 if (g_text_mode) { 663 log_msg(0, blurb1);664 log_msg(0, blurb2);665 log_msg(0, blurb3);663 mr_msg(0, blurb1); 664 mr_msg(0, blurb2); 665 mr_msg(0, blurb3); 666 666 } else { 667 667 g_blurb1 = newtLabel(2, 1, blurb1); … … 697 697 assert_string_is_neither_NULL_nor_zerolength(prompt); 698 698 699 log_msg(0, prompt);699 mr_msg(0, prompt); 700 700 if (g_text_mode) { 701 701 printf … … 1104 1104 char *tmp; 1105 1105 1106 // log_msg(1, "'%s' '%s' '%s'", blurb1, blurb2, blurb3);1106 // mr_msg(1, "'%s' '%s' '%s'", blurb1, blurb2, blurb3); 1107 1107 percentline_str = mr_malloc(MAX_NEWT_COMMENT_LEN); 1108 1108 timeline_str = mr_malloc(MAX_NEWT_COMMENT_LEN); … … 1128 1128 blurb1, blurb2, blurb3, g_current_progress, 1129 1129 g_maximum_progress); 1130 log_msg(0, tmp);1130 mr_msg(0, tmp); 1131 1131 g_current_progress = g_maximum_progress; 1132 1132 } … … 1169 1169 } 1170 1170 if (percentage > 100) { 1171 log_msg(2, "percentage = %d", percentage);1171 mr_msg(2, "percentage = %d", percentage); 1172 1172 } 1173 1173 sprintf(taskprogress + strlen(taskprogress), … … 1402 1402 if (!(fin = fopen(source_file, "r"))) { 1403 1403 log_OS_error(source_file); 1404 log_msg(2, "Can't open %s; therefore, cannot popup list",1404 mr_msg(2, "Can't open %s; therefore, cannot popup list", 1405 1405 source_file); 1406 1406 mr_free(tmp); 1407 1407 return (1); 1408 1408 } 1409 log_msg(2, "Loading %s", source_file);1409 mr_msg(2, "Loading %s", source_file); 1410 1410 for (filelist->entries = 0; filelist->entries <= ARBITRARY_MAXIMUM; 1411 1411 filelist->entries++) { … … 1459 1459 (void *) &dummy_fle, 1460 1460 sizeof(struct s_filelist_entry)); 1461 log_msg(2, "Swapping %s and %s",1461 mr_msg(2, "Swapping %s and %s", 1462 1462 filelist->el[i].filename, 1463 1463 filelist->el[i + 1].filename); … … 1544 1544 assert_string_is_neither_NULL_nor_zerolength(source_file); 1545 1545 if (g_text_mode) { 1546 log_msg(2, "Text mode. Therefore, no popup list.");1546 mr_msg(2, "Text mode. Therefore, no popup list."); 1547 1547 goto free_to_go; 1548 1548 } 1549 log_msg(2, "Examining file %s", source_file);1549 mr_msg(2, "Examining file %s", source_file); 1550 1550 1551 1551 lng = count_lines_in_file(source_file); 1552 1552 if (lng < 1) { 1553 log_msg(2, "No lines in file. Therefore, no popup list.");1553 mr_msg(2, "No lines in file. Therefore, no popup list."); 1554 1554 mr_free(reason); 1555 1555 goto free_to_go; 1556 1556 } else if (lng >= ARBITRARY_MAXIMUM) { 1557 log_msg(2, "Too many files differ for me to list.");1557 mr_msg(2, "Too many files differ for me to list."); 1558 1558 goto free_to_go; 1559 1559 } … … 1565 1565 1566 1566 if (load_filelist_into_array(filelist, source_file)) { 1567 log_msg(2, "Can't open %s; therefore, cannot popup list",1567 mr_msg(2, "Can't open %s; therefore, cannot popup list", 1568 1568 source_file); 1569 1569 mr_free(reason); 1570 1570 return; 1571 1571 } 1572 log_msg(2, "%d files loaded into filelist array",1572 mr_msg(2, "%d files loaded into filelist array", 1573 1573 filelist->entries); 1574 1574 for (i = 0; i < filelist->entries; i++) {
Note:
See TracChangeset
for help on using the changeset viewer.