Changeset 1917 in MondoRescue for branches/2.2.6/mondo/src/mondoarchive

Timestamp:

Apr 17, 2008, 1:29:45 AM (17 years ago)

Author:

Bruno Cornec

Message:

mondo.libmondo-cli.patch (Mark Pinkerton <Mark.Pinkerton_at_emageon.com>) modified to not duplicate the newt initialization stuff (we should rather remove them in mondoarchive)

Location:

branches/2.2.6/mondo/src/mondoarchive

Files:

• Makefile.am (modified) (1 diff)
• main.c (modified) (3 diffs)
• mondoarchive.h (modified) (1 diff)

branches/2.2.6/mondo/src/mondoarchive/Makefile.am

@@ -4 +4 @@
 
 ## Headers
-noinst_HEADERS       = mondo-cli-EXT.h mondo-cli.h mondoarchive.h
+noinst_HEADERS       = mondoarchive.h
 
 ## The program
 sbin_PROGRAMS        = mondoarchive
-mondoarchive_SOURCES = main.c mondo-cli.c
+mondoarchive_SOURCES = main.c
 mondoarchive_LDADD   = ${top_builddir}/src/common/libmondo.a

branches/2.2.6/mondo/src/mondoarchive/main.c

@@ -116 +116 @@
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
-#include "mondo-cli-EXT.h"
+#include "../common/libmondo-cli-EXT.h"
 #include "../common/libmondo-tools-EXT.h"
 #include "mondoarchive.h"
@@ -137 +137 @@
 
 /***************** global vars, used only by main.c ******************/
-bool g_skip_floppies;
+extern bool g_skip_floppies;
 long diffs;
 
 extern t_bkptype g_backup_media_type;
 extern int g_loglevel;
+
+/**
+ * Whether we're restoring from ISOs. Obviously not, since this is the
+ * backup program.
+ * @note You @b MUST declare this variable somewhere in your program if
+ * you use libmondo. Otherwise the link will fail.
+ * @ingroup globalGroup
+ */
+bool g_ISO_restore_mode = FALSE;
+
+/* Do we use extended attributes and acl ?
+ *  * By default no, use --acl & --attr options to force their usage */
+char *g_getfacl = NULL;
+char *g_getfattr = NULL;
 
 /* Reference to global bkpinfo */
@@ -242 +256 @@
 }
 
-/* Return a string containing the date */
-char *mr_date(void) {
-    
-    time_t tcurr;
-
-    tcurr = time(NULL);
-    return(ctime(&tcurr));
-}
-
-/*-----------------------------------------------------------*/
-
-
 
 /**

branches/2.2.6/mondo/src/mondoarchive/mondoarchive.h

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