X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fcommon.h;h=de5c8832fbb325eca8920421a6530901a7477e1f;hb=89e65f936dabe759bf9483e20ae512f37ca81912;hp=f288068cd0000a8b1eb35aacec8a5cd02b9df348;hpb=588232f8599d8fa9bee25da781721feca72327d0;p=chaz%2Ftar

diff --git a/src/common.h b/src/common.h
index f288068..de5c883 100644
--- a/src/common.h
+++ b/src/common.h
@@ -114,7 +114,13 @@ GLOBAL bool utc_option;
    than newer_mtime_option.  */
 GLOBAL int after_date_option;
 
-GLOBAL bool atime_preserve_option;
+enum atime_preserve
+{
+  no_atime_preserve,
+  replace_atime_preserve,
+  system_atime_preserve
+};
+GLOBAL enum atime_preserve atime_preserve_option;
 
 GLOBAL bool backup_option;
 
@@ -248,6 +254,9 @@ GLOBAL bool touch_option;
 GLOBAL char *to_command_option;
 GLOBAL bool ignore_command_error_option;
 
+/* Restrict some potentially harmful tar options */
+GLOBAL bool restrict_option;
+
 /* Return true if the extracted files are not being written to disk */
 #define EXTRACT_OVER_PIPE (to_stdout_option || to_command_option)
 
@@ -317,7 +326,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,10 +346,11 @@ 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);
@@ -361,6 +372,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 +395,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 (bool global, 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);
@@ -394,15 +413,15 @@ void check_links (void);
 #define UNAME_TO_CHARS(name,buf) string_to_chars (name, buf, sizeof(buf))
 #define GNAME_TO_CHARS(name,buf) string_to_chars (name, buf, sizeof(buf))
 
-void gid_to_chars (gid_t, char *, size_t);
-void major_to_chars (major_t, char *, size_t);
-void minor_to_chars (minor_t, char *, size_t);
-void mode_to_chars (mode_t, char *, size_t);
-void off_to_chars (off_t, char *, size_t);
-void size_to_chars (size_t, char *, size_t);
-void time_to_chars (time_t, char *, size_t);
-void uid_to_chars (uid_t, char *, size_t);
-void uintmax_to_chars (uintmax_t, char *, size_t);
+bool gid_to_chars (gid_t, char *, size_t);
+bool major_to_chars (major_t, char *, size_t);
+bool minor_to_chars (minor_t, char *, size_t);
+bool mode_to_chars (mode_t, char *, size_t);
+bool off_to_chars (off_t, char *, size_t);
+bool size_to_chars (size_t, char *, size_t);
+bool time_to_chars (time_t, char *, size_t);
+bool uid_to_chars (uid_t, char *, size_t);
+bool uintmax_to_chars (uintmax_t, char *, size_t);
 void string_to_chars (char const *, char *, size_t);
 
 /* Module diffarch.c.  */
@@ -600,6 +619,9 @@ void request_stdin (const char *);
 void tar_stat_init (struct tar_stat_info *st);
 void tar_stat_destroy (struct tar_stat_info *st);
 void usage (int) __attribute__ ((noreturn));
+int tar_timespec_cmp (struct timespec a, struct timespec b);
+const char *archive_format_string (enum archive_format fmt);
+const char *subcommand_string (enum subcommand c);
 
 /* Module update.c.  */
 
@@ -611,7 +633,7 @@ void update_archive (void);
 
 void xheader_decode (struct tar_stat_info *);
 void xheader_decode_global (void);
-void xheader_store (char const *, struct tar_stat_info const *, void *);
+void xheader_store (char const *, struct tar_stat_info const *, void const *);
 void xheader_read (union block *, size_t);
 void xheader_write (char type, char *name, struct xheader *xhdr);
 void xheader_write_global (void);
@@ -626,7 +648,9 @@ void xheader_string_begin (void);
 void xheader_string_add (char const *s);
 void xheader_string_end (char const *keyword);
 bool xheader_keyword_deleted_p (const char *kw);
-
+char *xheader_format_name (struct tar_stat_info *st, const char *fmt,
+			   size_t n);
+     
 /* Module system.c */
 
 void sys_detect_dev_null_output (void);
@@ -645,6 +669,7 @@ size_t sys_write_archive_buffer (void);
 bool sys_get_archive_stat (void);
 int sys_exec_command (char *file_name, int typechar, struct tar_stat_info *st);
 void sys_wait_command (void);
+int sys_exec_info_script (const char **archive_name, int volume_number);
 
 /* Module compare.c */
 void report_difference (struct tar_stat_info *st, const char *message, ...);