Merge commit 'upstream/3.2.0'

[debian/amanda] / recover-src / amrecover.h

diff --git a/recover-src/amrecover.h b/recover-src/amrecover.h
index 79a9a922b495196d83372d13fe22b9c6e49ef655..e63e7f41277fec5a47b74b81783d6b67ab497fa1 100644 (file)
--- a/recover-src/amrecover.h
+++ b/recover-src/amrecover.h
@@ -31,6 +31,8 @@
 
 #include "amanda.h"
 #include "amfeatures.h"
+#include "amxml.h"
+#include "conffile.h"
 
 #define STARTUP_TIMEOUT 60
 
@@ -51,6 +53,7 @@ extern char *config;
 extern char *dump_datestamp;           /* date we are restoring */
 extern char *dump_hostname;            /* which machine we are restoring */
 extern char *disk_name;                        /* disk we are restoring */
+extern dle_t *dump_dle;
 extern char *mount_point;              /* where disk was mounted */
 extern char *disk_path;                        /* path relative to mount point */
 extern char dump_date[STR_SIZE];       /* date on which we are restoring */
@@ -63,6 +66,7 @@ extern char *our_features_string;
 extern am_feature_t *indexsrv_features;
 extern am_feature_t *tapesrv_features;
 extern pid_t extract_restore_child_pid;
+extern proplist_t proplist;
 
 extern void free_dir_item(DIR_ITEM *item);
 
@@ -82,14 +86,19 @@ extern void list_disk(char *amdevice);
 extern void set_host(const char *host);
 extern void list_host(void);
 extern int set_date(char *date);
-extern void set_directory(char *dir);
-extern void cd_glob(char *dir);
-extern void cd_regex(char *dir);
-extern void cd_dir(char *dir, char *default_dir);
+extern int set_directory(char *dir, int verbose);
+extern void local_cd(char *dir);
+extern int cd_glob(char *dir, int verbose);
+extern int cd_regex(char *dir, int verbose);
+extern int cd_dir(char *dir, char *default_dir, int verbose);
 extern void set_tape(char *tape);
+extern void set_device(char *host, char *device);
 extern void show_directory(void);
 extern void set_mode(int mode);
 extern void show_mode(void);
+extern void set_property_name(char *name, int append);
+extern void add_property_value(char *value);
+extern void list_property(void);
 
 extern void list_disk_history(void);
 extern void list_directory(void);
@@ -110,10 +119,8 @@ extern void delete_file(char *path, char *regex);
 
 extern void extract_files(void);
 
-#ifdef SAMBA_CLIENT
 #define SAMBA_SMBCLIENT 0
 #define SAMBA_TAR       1
-#endif
 
 extern char *get_security(void);
 extern void stop_amindexd(void);