Changeset 1924 in MondoRescue for branches/stable/mondo/src/mondoarchive

Timestamp:

Apr 18, 2008, 1:41:41 AM (16 years ago)

Author:

Bruno Cornec

Message:

svn merge -r 1902:1923 $SVN_M/branches/2.2.6

Location:

branches/stable/mondo/src/mondoarchive

Files:

• Makefile.am (modified) (1 diff)
• mondo-cli-EXT.h (deleted)
• mondo-cli.c (deleted)
• mondo-cli.h (deleted)
• mondoarchive.c (modified) (1 diff)
• mondoarchive.h (modified) (1 diff)

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

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

branches/stable/mondo/src/mondoarchive/mondoarchive.c

@@ -59 +59 @@
 
 /****************** subroutines used only here ******************/
+
+/**
+ * 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 */

branches/stable/mondo/src/mondoarchive/mondoarchive.h

@@ -17 +17 @@
  */
 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 */