X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fcommon.h;h=32b9ab3ac57b1825a9655fc36da898a6602cd19b;hb=84a55f12e5880196623d4193bf1d7f5141e6b0d5;hp=9905817d5cce4115e5dc5dcadd06d0490df9ac64;hpb=df59690240b9a41d59ebe9e809faffd93f340020;p=chaz%2Ftar diff --git a/src/common.h b/src/common.h index 9905817..32b9ab3 100644 --- a/src/common.h +++ b/src/common.h @@ -60,6 +60,8 @@ #define obstack_chunk_alloc xmalloc #define obstack_chunk_free free #include +#include +#include #include @@ -70,9 +72,6 @@ /* Information gleaned from the command line. */ -/* Name of this program. */ -GLOBAL const char *program_name; - /* Main command option. */ enum subcommand @@ -320,32 +319,41 @@ GLOBAL const char **archive_name_cursor; /* Output index file name. */ GLOBAL char const *index_file_name; +/* Opaque structure for keeping directory meta-data */ +struct directory; + /* Structure for keeping track of filenames and lists thereof. */ struct name { struct name *next; /* Link to the next element */ struct name *prev; /* Link to the previous element */ + + char *name; /* File name or globbing pattern */ + size_t length; /* cached strlen (name) */ + int matching_flags; /* wildcard flags if name is a pattern */ + bool cmdline; /* true if this name was given in the + command line */ + int change_dir; /* Number of the directory to change to. Set with the -C option. */ uintmax_t found_count; /* number of times a matching file has been found */ - int matching_flags; /* this name is a regexp, not literal */ - size_t length; /* cached strlen(name) */ - char *name; - - /* The following members are used for incremental dumps only */ - char const *dir_contents; /* directory contents */ + /* The following members are used for incremental dumps only, + if this struct name represents a directory; + see incremen.c */ + struct directory *directory;/* directory meta-data and contents */ struct name *parent; /* pointer to the parent hierarchy */ struct name *child; /* pointer to the first child */ struct name *sibling; /* pointer to the next sibling */ - char *caname; /* canonical name */ + char *caname; /* canonical name */ }; /* Obnoxious test to see if dimwit is trying to dump the archive. */ GLOBAL dev_t ar_dev; GLOBAL ino_t ar_ino; +GLOBAL int seek_option; GLOBAL bool seekable_archive; GLOBAL dev_t root_device; @@ -391,6 +399,7 @@ extern char *volume_label; extern char *continued_file_name; extern uintmax_t continued_file_size; extern uintmax_t continued_file_offset; +extern off_t records_written; size_t available_space_after (union block *pointer); off_t current_block_ordinal (void); @@ -437,14 +446,14 @@ bool cachedir_file_p (const char *name); bool file_dumpable_p (struct tar_stat_info *st); void create_archive (void); void pad_archive (off_t size_left); -void dump_file (const char *st, int top_level, dev_t parent_device); +void dump_file (const char *st, bool top_level, dev_t parent_device); union block *start_header (struct tar_stat_info *st); void finish_header (struct tar_stat_info *st, union block *header, off_t block_ordinal); 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); +union block *start_private_header (const char *name, size_t size, time_t t); void write_eot (void); void check_links (void); void exclusion_tag_warning (const char *dirname, const char *tagname, @@ -505,16 +514,21 @@ char *dumpdir_locate (dumpdir_t dump, const char *name); char *dumpdir_next (dumpdir_iter_t itr); char *dumpdir_first (dumpdir_t dump, int all, dumpdir_iter_t *pitr); -const char *scan_directory (char *dir_name, dev_t device, bool cmdline); -const char *append_incremental_renames (const char *dump); +struct directory *scan_directory (char *dir, dev_t device, bool cmdline); +void name_fill_directory (struct name *name, dev_t device, bool cmdline); +const char *directory_contents (struct directory *dir); +const char *safe_directory_contents (struct directory *dir); + +void rebase_directory (struct directory *dir, + const char *samp, size_t slen, + const char *repl, size_t rlen); + +void append_incremental_renames (struct directory *dir); void read_directory_file (void); void write_directory_file (void); void purge_directory (char const *directory_name); void list_dumpdir (char *buffer, size_t size); void update_parent_directory (const char *name); -void rebase_directory (const char *name, size_t old_prefix_len, - const char *old_prefix, - const char *new_prefix); size_t dumpdir_size (const char *p); bool is_dumpdir (struct tar_stat_info *stat_info); @@ -543,7 +557,8 @@ char const *tartime (struct timespec t, bool full_time); #define GID_FROM_HEADER(where) gid_from_header (where, sizeof (where)) #define MAJOR_FROM_HEADER(where) major_from_header (where, sizeof (where)) #define MINOR_FROM_HEADER(where) minor_from_header (where, sizeof (where)) -#define MODE_FROM_HEADER(where) mode_from_header (where, sizeof (where)) +#define MODE_FROM_HEADER(where, hbits) \ + mode_from_header (where, sizeof (where), hbits) #define OFF_FROM_HEADER(where) off_from_header (where, sizeof (where)) #define SIZE_FROM_HEADER(where) size_from_header (where, sizeof (where)) #define TIME_FROM_HEADER(where) time_from_header (where, sizeof (where)) @@ -553,12 +568,12 @@ char const *tartime (struct timespec t, bool full_time); gid_t gid_from_header (const char *buf, size_t size); major_t major_from_header (const char *buf, size_t size); minor_t minor_from_header (const char *buf, size_t size); -mode_t mode_from_header (const char *buf, size_t size); +mode_t mode_from_header (const char *buf, size_t size, unsigned *hbits); off_t off_from_header (const char *buf, size_t size); size_t size_from_header (const char *buf, size_t size); time_t time_from_header (const char *buf, size_t size); uid_t uid_from_header (const char *buf, size_t size); -uintmax_t uintmax_from_header (const char * buf, size_t size); +uintmax_t uintmax_from_header (const char *buf, size_t size); void list_archive (void); void print_for_mkdir (char *dirname, int length, mode_t mode); @@ -578,6 +593,8 @@ char *quote_copy_string (const char *str); int unquote_string (char *str); char *zap_slashes (char *name); char *normalize_filename (const char *name); +void replace_prefix (char **pname, const char *samp, size_t slen, + const char *repl, size_t rlen); void code_ns_fraction (int ns, char *p); char const *code_timespec (struct timespec ts, char *sbuf); @@ -616,6 +633,10 @@ void readlink_diag (char const *name); void savedir_diag (char const *name); void seek_diag_details (char const *name, off_t offset); void stat_diag (char const *name); +void file_removed_diag (const char *name, bool top_level, + void (*diagfn) (char const *name)); +void dir_removed_diag (char const *name, bool top_level, + void (*diagfn) (char const *name)); void write_error_details (char const *name, size_t status, size_t size); void write_fatal (char const *name) __attribute__ ((noreturn)); void write_fatal_details (char const *name, ssize_t status, size_t size) @@ -643,12 +664,13 @@ void name_add_dir (const char *name); void name_term (void); const char *name_next (int change_dirs); void name_gather (void); -struct name *addname (char const *string, int change_dir, struct name *parent); +struct name *addname (char const *string, int change_dir, + bool cmdline, struct name *parent); bool name_match (const char *name); void names_notfound (void); void collect_and_sort_names (void); struct name *name_scan (const char *name); -char *name_from_list (void); +struct name const *name_from_list (void); void blank_name_list (void); char *new_name (const char *dir_name, const char *name); size_t stripped_prefix_len (char const *file_name, size_t num); @@ -680,6 +702,7 @@ 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); +void set_exit_status (int val); /* Module update.c. */ @@ -695,7 +718,7 @@ void xheader_decode_global (struct xheader *xhdr); void xheader_store (char const *keyword, struct tar_stat_info *st, void const *data); void xheader_read (struct xheader *xhdr, union block *header, size_t size); -void xheader_write (char type, char *name, struct xheader *xhdr); +void xheader_write (char type, char *name, time_t t, struct xheader *xhdr); void xheader_write_global (struct xheader *xhdr); void xheader_finish (struct xheader *hdr); void xheader_destroy (struct xheader *hdr); @@ -804,3 +827,11 @@ extern int warning_option; } \ while (0) +/* Module unlink.c */ + +void queue_deferred_unlink (const char *name, bool is_dir); +void finish_deferred_unlinks (void); + +/* Module exit.c */ +extern void (*fatal_exit_hook) (void); +