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

Timestamp:

Jun 19, 2013, 8:34:46 AM (11 years ago)

Author:

Bruno Cornec

Message:

• First pass on svn merge -r 2935:3146 ../3.0

File:

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

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

@@ -57 +57 @@
  */
     bool g_exiting = FALSE;
+
+// Decide whether we should continue to ask questions or exit (cron use case)
+extern bool g_fail_immediately;
 
 /**
@@ -122 +125 @@
         char *tmp;
 
-         assert_string_is_neither_NULL_nor_zerolength(prompt);
-
+        assert_string_is_neither_NULL_nor_zerolength(prompt);
+
+        if (g_fail_immediately) {
+            // We consider the user aborted by using the -F option
+            log_msg(3, "Exiting at first interaction request due to -F");
+            finish(1);
+        }
         if (g_text_mode) {
             while (1) {
@@ -163 +171 @@
         /*@ buffer *********************************************************** */
         char *tmp = NULL;
+        char *p;
         int i;
 
-        assert_string_is_neither_NULL_nor_zerolength(prompt);
+        if (g_fail_immediately) {
+            // We consider the user aborted by using the -F option
+            log_msg(3, "Exiting at first interaction request due to -F");
+            finish(1);
+        }
 
         if (g_text_mode) {
@@ -318 +331 @@
         sync();
 
-        chdir("/");
+        if (chdir("/")) {
+            // FIXME
+        }
         if (g_selfmounted_isodir) {
             mr_asprintf(command, "umount -d %s", g_selfmounted_isodir);
@@ -369 +384 @@
 
         /*  Before removing dir, make sure we're out of them */
-        chdir("/tmp");
+        if (chdir("/tmp")) {
+            // FIXME
+        }
         run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
         if (g_selfmounted_isodir) {
@@ -385 +402 @@
                 log_msg(8,"erasing tempdir %s",bkpinfo->tmpdir);
                 mr_asprintf(command, "rm -Rf %s", bkpinfo->tmpdir);
-                system(command);
+                paranoid_system(command);
                 mr_free(command);
             }
@@ -394 +411 @@
                 log_msg(8,"erasing scratchdir %s",bkpinfo->scratchdir);
                 mr_asprintf(command, "rm -Rf %s", bkpinfo->scratchdir);
-                system(command);
+                paranoid_system(command);
                 mr_free(command);
             }
@@ -424 +441 @@
         char *command = NULL;
         char *tmp = NULL;
+        char *p = NULL;
 
         /*@ pointers ********************************************************* */
@@ -763 +781 @@
         /*@ buffers *********************************************************** */
         char *prompt = NULL;
+        char *q;
 
         /*@ newt ************************************************************** */
@@ -1130 +1149 @@
         static char *possible_responses[] = { "none", "cdr", "cdrw", "dvd", "tape", "cdstream", "udev", "netfs", "iso", NULL };
         char *outstr = NULL;
+        char *p;
         t_bkptype backup_type;
         int i;
@@ -1286 +1306 @@
         newtPushHelpLine("   Please specify the level of compression that you want.");
         newtCenteredWindow(34, 13, "How much compression?");
-        b1 = newtButton(4, 1, "Maximum");
-        b2 = newtButton(18, 1, "Average");
-        b3 = newtButton(4, 5, "Minimum");
-        b4 = newtButton(18, 5, " None  ");
+        b1 = newtButton(4, 1, "Maximum (9)");
+        b2 = newtButton(18, 1, "Average (4)");
+        b3 = newtButton(4, 5, "Minimum (1)");
+        b4 = newtButton(18, 5, " None (0) ");
         b5 = newtButton(4, 9, "         Exit        ");
         myForm = newtForm(NULL, NULL, 0);
@@ -1327 +1347 @@
         bool done;
         char *tmp = NULL;
+        char *p;
         char *tmp1 = NULL;
         FILE *fin, *fout;
@@ -1563 +1584 @@
 }                               /* extern "C" */
 #endif
-
-
-void wait_until_software_raids_are_prepped(char *mdstat_file, int wait_for_percentage);