X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=common-src%2Ffileheader.h;h=e92eb8e2285c5a6a1d124989e51011d20c2f0bcd;hb=2627875b7d18858bc1f9f7652811e4d8c15a23eb;hp=ea7bda5eeca33de70c3de12f08b06695922e7cce;hpb=d3b2175e084f88c8736ad7073eacbf4670147aec;p=debian%2Famanda

diff --git a/common-src/fileheader.h b/common-src/fileheader.h
index ea7bda5..e92eb8e 100644
--- a/common-src/fileheader.h
+++ b/common-src/fileheader.h
@@ -31,15 +31,15 @@
 #ifndef FILEHEADER_H
 #define FILEHEADER_H
 
-#include "amanda.h"
-#include "util.h"		/* for bstrncmp() */
+#include <glib.h>
+#include <stdio.h>
 
 #define STRMAX		256
 
 typedef char string_t[STRMAX];
 typedef enum {
-    F_UNKNOWN, F_WEIRD, F_TAPESTART, F_TAPEEND, 
-    F_DUMPFILE, F_CONT_DUMPFILE, F_SPLIT_DUMPFILE, F_EMPTY
+    F_UNKNOWN = 0, F_WEIRD = -1, F_TAPESTART = 1, F_TAPEEND = 2, 
+    F_DUMPFILE = 3, F_CONT_DUMPFILE = 4, F_SPLIT_DUMPFILE = 5, F_EMPTY = -2
 } filetype_t;
 
 typedef struct file_s {
@@ -53,7 +53,7 @@ typedef struct file_s {
     string_t name;	/* hostname or label */
     string_t disk;
     string_t program;
-    string_t dumper;
+    string_t application;
     string_t srvcompprog;
     string_t clntcompprog;
     string_t srv_encrypt;
@@ -65,6 +65,7 @@ typedef struct file_s {
     string_t srv_decrypt_opt;
     string_t clnt_decrypt_opt;
     string_t cont_filename;
+    char     *dle_str;
     int is_partial;
     int partnum;
     int totalparts; /* -1 == UNKNOWN */
@@ -73,11 +74,30 @@ typedef struct file_s {
 
 /* local functions */
 
+/* Makes a serialized header from the dumpfile_t representation. The
+ * return value is allocated using malloc(), so you must free it.
+ *
+ * Build_header guarantees that the buffer returned is exactly
+ * 'size' bytes, with any extra bytes zeroed out. */
+char *  build_header        (const dumpfile_t *file, size_t size);
+
 void	fh_init(dumpfile_t *file);
 void	parse_file_header(const char *buffer, dumpfile_t *file, size_t buflen);
-void	build_header(char *buffer, const dumpfile_t *file, size_t buflen);
 void	print_header(FILE *outf, const dumpfile_t *file);
 int	known_compress_type(const dumpfile_t *file);
 void	dump_dumpfile_t(const dumpfile_t *file);
 
+/* Returns TRUE if the two headers are equal, FALSE otherwise. */
+gboolean headers_are_equal(dumpfile_t * a, dumpfile_t * b);
+
+/* Returns an allocated duplicate header. */
+dumpfile_t * dumpfile_copy(dumpfile_t* from);
+void dumpfile_copy_in_place(dumpfile_t *dest, dumpfile_t* source);
+
+/* Frees associated storage */
+void dumpfile_free_data(dumpfile_t* info);
+
+/* Frees the header and associated storage */
+void dumpfile_free(dumpfile_t* info);
+
 #endif /* !FILEHEADER_H */