Changeset 3141 in MondoRescue for branches/3.0/mondo/src

Timestamp:

Jun 13, 2013, 6:05:57 PM (13 years ago)

Author:

Bruno Cornec

Message:

r5345@localhost: bruno | 2013-06-13 12:46:54 +0200

• Solving #702 by adding a -F option which is meant to be used especially when mondoarchive is launched from cron, to avoid going into a loop where mondoarchive asks questions to the admin, where they cannot be answerd, which fills the logs and the underlying file system. With -F mondoarchive will exits at the first interaction request instead.

Location:

branches/3.0/mondo/src

Files:

• common/libmondo-cli.c (modified) (2 diffs)
• common/libmondo-filelist.c (modified) (2 diffs)
• common/newt-specific.c (modified) (3 diffs)
• mondoarchive/mondoarchive.c (modified) (1 diff)
• mondoarchive/mondoarchive.h (modified) (1 diff)
• mondorestore/mondorestore.c (modified) (1 diff)

branches/3.0/mondo/src/common/libmondo-cli.c

@@ -20 +20 @@
 extern int g_loglevel;
 extern bool g_text_mode;
+extern bool g_fail_immediately;
 extern char g_startdir[MAX_STR_LEN];    ///< ????? @bug ?????
 extern char *MONDO_OPTIONS;
@@ -909 +910 @@
                 ("Please install LZOP. You can't use '-L' until you do.\n");
         }
+    }
+
+    if (flag_set['F']) {
+        log_msg(3, "-F means we will fail immediately at the first interaction request");
+        g_fail_immediately = TRUE;
     }
 

branches/3.0/mondo/src/common/libmondo-filelist.c

@@ -214 +214 @@
     char *incoming = NULL;
     char *tmp = NULL;
-    char *p = NULL;
 
     /*@ pointers *********************************** */
@@ -920 +919 @@
     for (tmp1 = fgets(fname, MAX_STR_LEN, pin); !feof(pin);
          tmp1 = fgets(fname, MAX_STR_LEN, pin)) {
-        if ((fname[strlen(fname) - 1] == 13
-             || fname[strlen(fname) - 1] == 10) && strlen(fname) > 0) {
+        if (((fname[strlen(fname) - 1] == 13) || (fname[strlen(fname) - 1] == 10)) && (strlen(fname) > 0)) {
             fname[strlen(fname) - 1] = '\0';
         }

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

@@ -55 +55 @@
  */
     bool g_exiting = FALSE;
+
+// Decide whether we should continue to ask questions or exit (cron use case)
+extern bool g_fail_immediately;
 
 /**
@@ -125 +128 @@
         char *p;
 
-         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) {
 
@@ -179 +187 @@
         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);
+        }
         tmp = malloc(MAX_NEWT_COMMENT_LEN);
-        assert_string_is_neither_NULL_nor_zerolength(prompt);
         if (g_text_mode) {
             paranoid_system("sync");

branches/3.0/mondo/src/mondoarchive/mondoarchive.c

@@ -45 +45 @@
  */
 bool g_ISO_restore_mode = FALSE;
+
+/* Whether we should fail immediately at first error */
+bool g_fail_immediately = FALSE;
 
 /* Do we use extended attributes and acl ?

branches/3.0/mondo/src/mondoarchive/mondoarchive.h

@@ -9 +9 @@
  */
 char *MONDO_LOGFILE = "/var/log/mondoarchive.log";
-char *MONDO_OPTIONS = "0123456789A:B:C:DE:GHI:J:K:LM:NOP:QRS:T:UVWb:c:d:ef:gik:l:mn:op:rs:tuw:x:z";
+char *MONDO_OPTIONS = "0123456789A:B:C:DE:FGHI:J:K:LM:NOP:QRS:T:UVWb:c:d:ef:gik:l:mn:op:rs:tuw:x:z";
 
 /* No restriction on ps options */

branches/3.0/mondo/src/mondorestore/mondorestore.c

@@ -63 +63 @@
  */
 bool g_ISO_restore_mode = FALSE;    /* are we in Iso Mode? */
+
+/* Whether we should fail immediately at first error */
+bool g_fail_immediately = FALSE;
 
 /**