Rename some files to avoid duplicate filenames in tree.

tools/Makefile.in

@@ -21,7 +21,7 @@ top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
 SOURCES=\
-	archive.c \
+	archiver.c \
 	dumpconfig.c \
 	lvchange.c \
 	lvcreate.c \
@@ -41,7 +41,7 @@ SOURCES=\
 	pvmove.c \
 	pvremove.c \
 	pvscan.c \
-	report.c \
+	reporter.c \
 	toollib.c \
 	vgcfgbackup.c \
 	vgcfgrestore.c \

tools/archiver.h

@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2001 Sistina Software (UK) Limited.
+ *
+ * This file is released under the GPL.
+ */
+
+#ifndef _LVM_TOOL_ARCHIVE_H
+#define _LVM_TOOL_ARCHIVE_H
+
+#include "metadata.h"
+
+/*
+ * FIXME: This file is going to merge with the archiving code in
+ * lib/format_text at some point.
+ */
+
+/*
+ * There are two operations that come under the general area of
+ * backups.  'Archiving' occurs just before a volume group
+ * configuration is changed.  The user may configure when
+ * archived files are expired.  Typically archives will be stored
+ * in /etc/lvm/archive.
+ *
+ * A 'backup' is a redundant copy of the *current* volume group
+ * configuration.  As such it should be taken just after the
+ * volume group is changed.  Only 1 backup file will exist.
+ * Typically backups will be stored in /etc/lvm/backups.
+ */
+
+int archive_init(const char *dir,
+		 unsigned int keep_days, unsigned int keep_min);
+void archive_exit(void);
+
+void archive_enable(int flag);
+int archive(struct volume_group *vg);
+int archive_display(struct cmd_context *cmd, const char *vg_name);
+
+int backup_init(const char *dir);
+void backup_exit(void);
+
+void backup_enable(int flag);
+int backup(struct volume_group *vg);
+int backup_remove(const char *vg_name);
+
+struct volume_group *backup_read_vg(struct cmd_context *cmd,
+				    const char *vg_name, const char *file);
+int backup_restore_vg(struct cmd_context *cmd, struct volume_group *vg);
+int backup_restore_from_file(struct cmd_context *cmd, const char *vg_name,
+			     const char *file);
+int backup_restore(struct cmd_context *cmd, const char *vg_name);
+
+int backup_to_file(const char *file, const char *desc, struct volume_group *vg);
+
+#endif

tools/tools.h

@@ -13,7 +13,7 @@
 
 #include "log.h"
 #include "activate.h"
-#include "archive.h"
+#include "archiver.h"
 #include "lvmcache.h"
 #include "config.h"
 #include "defaults.h"