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

Timestamp:

Feb 7, 2007, 11:55:11 PM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r1082:1105 $SVN_M/branches/stable

File:

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

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

@@ -351 +351 @@
  */
     void
-     finish(int signal) {
+     finish(int signal_code) {
         char *command = NULL;
 
+<<<<<<< .courant
+=======
+        /*  if (signal_code==0) { popup_and_OK("Please press <enter> to quit."); } */
+
+        /* newtPopHelpLine(); */
+
+>>>>>>> .fusion-droit.r1105
         register_pid(0, "mondo");
         chdir("/");
@@ -378 +385 @@
             }
         }
+<<<<<<< .courant
         printf(_("Execution run ended; result=%d\n"), signal);
         printf(_("Type 'less %s' to see the output log\n"), MONDO_LOGFILE);
+=======
+//  system("clear");
+//  iamhere("Finished calling newtFinished");
+        printf("Execution run ended; result=%d\n", signal_code);
+        printf("Type 'less %s' to see the output log\n", MONDO_LOGFILE);
+>>>>>>> .fusion-droit.r1105
         free_libmondo_global_strings();
-        exit(signal);
+        exit(signal_code);
     }
 
@@ -650 +664 @@
     void
      popup_and_OK(char *prompt) {
-        char ch;
+        int ch;
 
         assert_string_is_neither_NULL_nor_zerolength(prompt);