X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fcommon.h;h=8bd86407dbfda3c8b24a726a7f76724fc0b517dd;hb=ecbcb7b6d74c2d69386c8d7e435486a4690c9993;hp=f6f38446eb3e8206585933b844d8973b9aaf7b65;hpb=a59c819beb4886ee43f16dfd80ec1151fda1abe6;p=chaz%2Ftar diff --git a/src/common.h b/src/common.h index f6f3844..8bd8640 100644 --- a/src/common.h +++ b/src/common.h @@ -357,6 +357,11 @@ struct name GLOBAL dev_t ar_dev; GLOBAL ino_t ar_ino; +/* Flags for reading, searching, and fstatatting files. */ +GLOBAL int open_read_flags; +GLOBAL int open_searchdir_flags; +GLOBAL int fstatat_flags; + GLOBAL int seek_option; GLOBAL bool seekable_archive; @@ -446,12 +451,14 @@ enum dump_status }; void add_exclusion_tag (const char *name, enum exclusion_tag_type type, - bool (*)(const char*)); -bool cachedir_file_p (const char *name); + bool (*predicate) (int)); +bool cachedir_file_p (int fd); +char *get_directory_entries (struct tar_stat_info *st); void create_archive (void); void pad_archive (off_t size_left); -void dump_file (const char *st, bool top_level, dev_t parent_device); +void dump_file (struct tar_stat_info *parent, char const *name, + char const *fullname); union block *start_header (struct tar_stat_info *st); void finish_header (struct tar_stat_info *st, union block *header, off_t block_ordinal); @@ -461,9 +468,11 @@ union block * write_extended (bool global, struct tar_stat_info *st, union block *start_private_header (const char *name, size_t size, time_t t); void write_eot (void); void check_links (void); +int subfile_open (struct tar_stat_info const *dir, char const *file, int flags); +void restore_parent_fd (struct tar_stat_info const *st); void exclusion_tag_warning (const char *dirname, const char *tagname, const char *message); -enum exclusion_tag_type check_exclusion_tags (const char *dirname, +enum exclusion_tag_type check_exclusion_tags (struct tar_stat_info const *st, const char **tag_file_name); #define OFF_TO_CHARS(val, where) off_to_chars (val, where, sizeof (where)) @@ -493,8 +502,7 @@ void delete_archive_members (void); /* Module incremen.c. */ -struct directory *scan_directory (char *dir, dev_t device, bool cmdline); -void name_fill_directory (struct name *name, dev_t device, bool cmdline); +struct directory *scan_directory (struct tar_stat_info *st); const char *directory_contents (struct directory *dir); const char *safe_directory_contents (struct directory *dir); @@ -507,7 +515,7 @@ 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 update_parent_directory (struct tar_stat_info *st); size_t dumpdir_size (const char *p); bool is_dumpdir (struct tar_stat_info *stat_info); @@ -602,7 +610,10 @@ bool maybe_backup_file (const char *file_name, bool this_is_the_archive); void undo_last_backup (void); int deref_stat (bool deref, char const *name, struct stat *buf); +int fd_utimensat (int fd, int parentfd, char const *file, + struct timespec const ts[2], int atflag); +extern int chdir_current; int chdir_arg (char const *dir); void chdir_do (int dir); int chdir_count (void); @@ -627,8 +638,8 @@ pid_t xfork (void); void xpipe (int fd[2]); void *page_aligned_alloc (void **ptr, size_t size); -int set_file_atime (int fd, char const *file, - struct timespec const timespec[2]); +int set_file_atime (int fd, char const *file, struct timespec atime, + int atflag); /* Module names.c. */ @@ -680,6 +691,7 @@ void usage (int); int confirm (const char *message_action, const char *name); void tar_stat_init (struct tar_stat_info *st); +bool tar_stat_close (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); @@ -795,7 +807,7 @@ void checkpoint_run (bool do_write); /* The warnings composing WARN_VERBOSE_WARNINGS are enabled by default in verbose mode */ #define WARN_VERBOSE_WARNINGS (WARN_RENAME_DIRECTORY|WARN_NEW_DIRECTORY) -#define WARN_ALL (0xffffffff & ~WARN_VERBOSE_WARNINGS) +#define WARN_ALL (~WARN_VERBOSE_WARNINGS) void set_warning_option (const char *arg);