From 7200f4f5f715ff558da63258b7cdc6b489078cf6 Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Wed, 9 Nov 2005 13:08:13 +0000
Subject: [PATCH] (save_name,save_sizeleft,save_totsize): Remove globals.
 (volume_label,continued_file_name,continued_file_size): New variables.
 (flush_read,flush_write): Pointers to functions
 (mv_begin,mv_end,mv_total_size,mv_size_left): New functions (write_extended):
 New function.

---
 src/common.h | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/common.h b/src/common.h
index c1effd4..cbcd2c7 100644
--- a/src/common.h
+++ b/src/common.h
@@ -317,7 +317,8 @@ GLOBAL bool unquote_option;
 GLOBAL bool test_label_option; /* Test archive volume label and exit */
 
 GLOBAL bool show_stored_names_option; /* When creating archive in verbose mode,
-					 list member names as stored in the archive */
+					 list member names as stored in the
+					 archive */
 
 
 /* Declarations for each module.  */
@@ -336,18 +337,19 @@ extern enum access_mode access_mode;
 /* Module buffer.c.  */
 
 extern FILE *stdlis;
-extern char *save_name;
-extern off_t save_sizeleft;
-extern off_t save_totsize;
 extern bool write_archive_to_stdout;
+extern char *volume_label;
+extern char *continued_file_name;
+extern uintmax_t continued_file_size;
+extern uintmax_t continued_file_offset;
 
 size_t available_space_after (union block *);
 off_t current_block_ordinal (void);
 void close_archive (void);
 void closeout_volume_number (void);
 union block *find_next_block (void);
-void flush_read (void);
-void flush_write (void);
+void (*flush_read) (void);
+void (*flush_write) (void);
 void flush_archive (void);
 void init_volume_number (void);
 void open_archive (enum access_mode);
@@ -361,6 +363,12 @@ void archive_read_error (void);
 off_t seek_archive (off_t size);
 void set_start_time (void);
 
+void mv_begin (struct tar_stat_info *st);
+void mv_end (void);
+void mv_total_size (off_t size);
+void mv_size_left (off_t size);
+
+
 /* Module create.c.  */
 
 enum dump_status
@@ -378,6 +386,8 @@ void dump_file (char *, int, dev_t);
 union block *start_header (struct tar_stat_info *st);
 void finish_header (struct tar_stat_info *, union block *, off_t);
 void simple_finish_header (union block *header);
+union block * write_extended (char type, struct tar_stat_info *st,
+			      union block *old_header);
 union block *start_private_header (const char *name, size_t size);
 void write_eot (void);
 void check_links (void);
-- 
2.44.0