/* The checksum field is filled with this while the checksum is computed. */
#define CHKBLANKS " " /* 8 blanks, no null */
-/* Old GNU stores zero-terminated file name */
-#define OLDGNU_NAME_FIELD_SIZE 99
-
/* Some constants from POSIX are given names. */
#define NAME_FIELD_SIZE 100
#define PREFIX_FIELD_SIZE 155
#define UNAME_FIELD_SIZE 32
#define GNAME_FIELD_SIZE 32
-/* FIXME */
-#define MAXOCTAL11 017777777777L
-#define MAXOCTAL7 07777777
-
\f
/* Some various global definitions. */
#include <modechange.h>
#include <quote.h>
#include <safe-read.h>
+#include <stat-time.h>
#include <timespec.h>
#define obstack_chunk_alloc xmalloc
#define obstack_chunk_free free
#include <obstack.h>
-#include <paxerror.h>
+#include <paxlib.h>
/* Log base 2 of common values. */
#define LG_8 3
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;
GLOBAL bool multi_volume_option;
-/* The same variable holds the time, whether mtime or ctime. Just fake a
- non-existing option, for making the code clearer, elsewhere. */
-#define newer_ctime_option newer_mtime_option
-
/* Specified threshold date and time. Files having an older time stamp
do not get archived (also see after_date_option above). */
GLOBAL struct timespec newer_mtime_option;
/* Return true if the struct stat ST's M time is less than
newer_mtime_option. */
#define OLDER_STAT_TIME(st, m) \
- ((st).st_##m##time < newer_mtime_option.tv_sec \
- || ((st).st_##m##time == newer_mtime_option.tv_sec \
- && TIMESPEC_NS ((st).st_##m##tim) < newer_mtime_option.tv_nsec))
+ (timespec_cmp (get_stat_##m##time (&(st)), newer_mtime_option) < 0)
+
+/* Likewise, for struct tar_stat_info ST. */
+#define OLDER_TAR_STAT_TIME(st, m) \
+ (timespec_cmp ((st).m##time, newer_mtime_option) < 0)
/* Zero if there is no recursion, otherwise FNM_LEADING_DIR. */
GLOBAL int recursion_option;
GLOBAL bool dev_null_output;
/* Timestamp for when we started execution. */
-#if HAVE_CLOCK_GETTIME
- GLOBAL struct timespec start_timespec;
-# define start_time (start_timespec.tv_sec)
-#else
- GLOBAL time_t start_time;
-#endif
+GLOBAL struct timespec start_time;
GLOBAL struct tar_stat_info current_stat_info;
/* Unquote filenames */
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 */
+
\f
/* Declarations for each module. */
/* 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);
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
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);
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);
-void string_to_chars (char *, char *, size_t);
+void string_to_chars (char const *, char *, size_t);
/* Module diffarch.c. */
void read_directory_file (void);
void write_directory_file (void);
void purge_directory (char const *);
+void list_dumpdir (char *buffer, size_t size);
+void update_parent_directory (const char *name);
+
+size_t dumpdir_size (const char *p);
+void get_gnu_dumpdir (void);
/* Module list.c. */
void decode_header (union block *, struct tar_stat_info *,
enum archive_format *, int);
-char const *tartime (time_t);
+char const *tartime (struct timespec, bool);
#define GID_FROM_HEADER(where) gid_from_header (where, sizeof (where))
#define MAJOR_FROM_HEADER(where) major_from_header (where, sizeof (where))
char *quote_copy_string (const char *);
int unquote_string (char *);
+void code_ns_fraction (int, char *);
+char const *code_timespec (struct timespec, char *);
+enum { BILLION = 1000000000, LOG10_BILLION = 9 };
+enum { TIMESPEC_STRSIZE_BOUND =
+ UINTMAX_STRSIZE_BOUND + LOG10_BILLION + sizeof "-." - 1 };
+
size_t dot_dot_prefix_len (char const *);
enum remove_option
char *name_from_list (void);
void blank_name_list (void);
char *new_name (const char *, const char *);
-char *safer_name_suffix (char const *, bool);
size_t stripped_prefix_len (char const *file_name, size_t num);
bool all_names_found (struct tar_stat_info *);
bool contains_dot_dot (char const *);
-bool removed_prefixes_p (void);
-
#define ISFOUND(c) ((occurrence_option == 0) ? (c)->found_count : \
(c)->found_count == occurrence_option)
#define WASFOUND(c) ((occurrence_option == 0) ? (c)->found_count : \
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);
/* Module update.c. */
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);
void xheader_write (char, char *, struct xheader *);
void xheader_write_global (void);
void xheader_set_option (char *string);
+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_stat_nanoseconds (struct tar_stat_info *);
void sys_detect_dev_null_output (void);
void sys_save_archive_dev_ino (void);
void sys_drain_input_pipe (void);
projects / chaz / tar / blobdiff