Changeset 1086 in MondoRescue for trunk/mondo/src/common/newt-specific.c
- Timestamp:
- Feb 2, 2007, 11:21:27 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/mondo/src/common/newt-specific.c
r1081 r1086 199 199 usleep(500000); 200 200 if (g_text_mode) { 201 log_msg(2, "Closing evalcall form");201 mr_msg(2, "Closing evalcall form"); 202 202 return; 203 203 } … … 219 219 } 220 220 if (g_current_progress == -999) { 221 log_msg(2,221 mr_msg(2, 222 222 "Trying to close the progress form when it ain't open!"); 223 223 return; … … 227 227 sleep(1); 228 228 if (g_text_mode) { 229 log_msg(2, "Closing progress form");229 mr_msg(2, "Closing progress form"); 230 230 return; 231 231 } … … 270 270 set_signals(FALSE); // link to external func 271 271 g_exiting = TRUE; 272 log_msg(1, "%s - '%s'", fatalstr, error_string);272 mr_msg(1, "%s - '%s'", fatalstr, error_string); 273 273 printf("%s - %s\n", fatalstr, error_string); 274 274 if (getpid() == g_mastermind_pid) { 275 log_msg(2, "mastermind %d is exiting", (int) getpid());275 mr_msg(2, "mastermind %d is exiting", (int) getpid()); 276 276 kill(g_main_pid, SIGTERM); 277 277 finish(1); … … 280 280 if (getpid() != g_main_pid) { 281 281 if (g_mastermind_pid != 0 && getpid() != g_mastermind_pid) { 282 log_msg(2, "non-m/m %d is exiting", (int) getpid());282 mr_msg(2, "non-m/m %d is exiting", (int) getpid()); 283 283 kill(g_main_pid, SIGTERM); 284 284 finish(1); … … 286 286 } 287 287 288 log_msg(3, "OK, I think I'm the main PID.");288 mr_msg(3, "OK, I think I'm the main PID."); 289 289 if (already_exiting) { 290 log_msg(3, "...I'm already exiting. Give me time, Julian!");290 mr_msg(3, "...I'm already exiting. Give me time, Julian!"); 291 291 finish(1); 292 292 } 293 293 294 294 already_exiting = TRUE; 295 log_msg(2, "I'm going to do some cleaning up now.");295 mr_msg(2, "I'm going to do some cleaning up now."); 296 296 paranoid_system("killall mindi 2> /dev/null"); 297 297 kill_anything_like_this("/mondo/do-not"); … … 303 303 chdir("/"); 304 304 for (i = 0; i < 10 && run_program_and_log_output(tmp, 5); i++) { 305 log_msg(2, "Waiting for child processes to terminate");305 mr_msg(2, "Waiting for child processes to terminate"); 306 306 sleep(1); 307 307 run_program_and_log_output(tmp, 5); … … 323 323 324 324 if (!g_text_mode) { 325 log_msg(0, fatalstr);326 log_msg(0, error_string);325 mr_msg(0, fatalstr); 326 mr_msg(0, error_string); 327 327 newtFinished(); 328 328 } … … 337 337 register_pid(0, "mondo"); // finish() does this too, FYI 338 338 if (!g_main_pid) { 339 log_msg(3, "FYI - g_main_pid is blank");339 mr_msg(3, "FYI - g_main_pid is blank"); 340 340 } 341 341 finish(254); … … 371 371 if (!g_text_mode) { 372 372 if (does_file_exist("/THIS-IS-A-RAMDISK")) { 373 log_msg(1, "Calling newtFinished()");373 mr_msg(1, "Calling newtFinished()"); 374 374 newtFinished(); 375 375 } else { 376 log_msg(1, "Calling newtSuspend()");376 mr_msg(1, "Calling newtSuspend()"); 377 377 newtSuspend(); 378 378 } … … 465 465 va_start(args, fmt); 466 466 mr_asprintf(&output, fmt, args); 467 log_msg(0, output);467 mr_msg(0, output); 468 468 if (strlen(output) > 80) { 469 469 output[80] = '\0'; … … 508 508 mvaddstr_and_log_it(int y, int x, char *output) { 509 509 assert_string_is_neither_NULL_nor_zerolength(output); 510 log_msg(0, output);510 mr_msg(0, output); 511 511 if (g_text_mode) { 512 512 printf("%s\n", output); … … 541 541 // center_string (title, 80); 542 542 if (g_text_mode) { 543 log_msg(0, title);543 mr_msg(0, title); 544 544 } else { 545 545 mr_asprintf(&tmp, title); … … 553 553 g_isoform_starttime = get_time(); 554 554 if (g_text_mode) { 555 log_msg(0, g_isoform_header_str);555 mr_msg(0, g_isoform_header_str); 556 556 } else { 557 557 g_isoform_header = newtLabel(1, 1, g_isoform_header_str); … … 618 618 mr_asprintf(&g_blurb_str_3, blurb2); 619 619 if (g_text_mode) { 620 log_msg(0, blurb1);621 log_msg(0, blurb2);622 log_msg(0, blurb3);620 mr_msg(0, blurb1); 621 mr_msg(0, blurb2); 622 mr_msg(0, blurb3); 623 623 } else { 624 624 g_blurb1 = newtLabel(2, 1, blurb1); … … 654 654 assert_string_is_neither_NULL_nor_zerolength(prompt); 655 655 656 log_msg(0, prompt);656 mr_msg(0, prompt); 657 657 if (g_text_mode) { 658 658 printf … … 1054 1054 char *p; 1055 1055 1056 // log_msg(1, "'%s' '%s' '%s'", blurb1, blurb2, blurb3);1056 // mr_msg(1, "'%s' '%s' '%s'", blurb1, blurb2, blurb3); 1057 1057 if (!g_text_mode) { 1058 1058 assert(blurb1 != NULL); … … 1072 1072 blurb1, blurb2, blurb3, g_current_progress, 1073 1073 g_maximum_progress); 1074 log_msg(0, tmp);1074 mr_msg(0, tmp); 1075 1075 mr_free(tmp); 1076 1076 g_current_progress = g_maximum_progress; … … 1123 1123 1124 1124 if (percentage > 100) { 1125 log_msg(2, _("percentage = %d"), percentage);1125 mr_msg(2, _("percentage = %d"), percentage); 1126 1126 } 1127 1127 mr_asprintf(&taskprogress, … … 1340 1340 if (!(fin = fopen(source_file, "r"))) { 1341 1341 log_OS_error(source_file); 1342 log_msg(2, "Can't open %s; therefore, cannot popup list",1342 mr_msg(2, "Can't open %s; therefore, cannot popup list", 1343 1343 source_file); 1344 1344 return (1); 1345 1345 } 1346 log_msg(2, "Loading %s", source_file);1346 mr_msg(2, "Loading %s", source_file); 1347 1347 for (filelist->entries = 0; filelist->entries <= ARBITRARY_MAXIMUM; 1348 1348 filelist->entries++) { … … 1404 1404 (void *) &dummy_fle, 1405 1405 sizeof(struct s_filelist_entry)); 1406 log_msg(2, "Swapping %s and %s",1406 mr_msg(2, "Swapping %s and %s", 1407 1407 filelist->el[i].filename, 1408 1408 filelist->el[i + 1].filename); … … 1478 1478 assert_string_is_neither_NULL_nor_zerolength(source_file); 1479 1479 if (g_text_mode) { 1480 log_msg(2, "Text mode. Therefore, no popup list.");1480 mr_msg(2, "Text mode. Therefore, no popup list."); 1481 1481 return; 1482 1482 } 1483 log_msg(2, "Examining file %s", source_file);1483 mr_msg(2, "Examining file %s", source_file); 1484 1484 1485 1485 lng = count_lines_in_file(source_file); 1486 1486 if (lng < 1) { 1487 log_msg(2, "No lines in file. Therefore, no popup list.");1487 mr_msg(2, "No lines in file. Therefore, no popup list."); 1488 1488 return; 1489 1489 } else if (lng >= ARBITRARY_MAXIMUM) { 1490 log_msg(2, "Too many files differ for me to list.");1490 mr_msg(2, "Too many files differ for me to list."); 1491 1491 return; 1492 1492 } … … 1498 1498 1499 1499 if (load_filelist_into_array(filelist, source_file)) { 1500 log_msg(2, "Can't open %s; therefore, cannot popup list",1500 mr_msg(2, "Can't open %s; therefore, cannot popup list", 1501 1501 source_file); 1502 1502 return; 1503 1503 } 1504 log_msg(2, "%d files loaded into filelist array",1504 mr_msg(2, "%d files loaded into filelist array", 1505 1505 filelist->entries); 1506 1506 for (i = 0; i < filelist->entries; i++) {
Note:
See TracChangeset
for help on using the changeset viewer.