X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fcommon.h;h=e7f4c684176f42932b652f09b88cf0ffecd343ad;hb=49ea4c50575f66e8f0450e463e1d882eed6255ec;hp=6f496abe2ac429e65fad9b3053de7534b759689d;hpb=ceaef104436417df6972e34580fa6ec765d477f9;p=chaz%2Ftar diff --git a/src/common.h b/src/common.h index 6f496ab..e7f4c68 100644 --- a/src/common.h +++ b/src/common.h @@ -252,6 +252,8 @@ GLOBAL size_t strip_name_components; GLOBAL bool show_omitted_dirs_option; GLOBAL bool sparse_option; +GLOBAL unsigned tar_sparse_major; +GLOBAL unsigned tar_sparse_minor; GLOBAL bool starting_file_option; @@ -294,7 +296,7 @@ GLOBAL int archive; /* Nonzero when outputting to /dev/null. */ GLOBAL bool dev_null_output; -/* Timestamps: */ +/* Timestamps: */ GLOBAL struct timespec start_time; /* when we started execution */ GLOBAL struct timespec volume_start_time; /* when the current volume was opened*/ @@ -382,6 +384,7 @@ size_t available_space_after (union block *pointer); off_t current_block_ordinal (void); void close_archive (void); void closeout_volume_number (void); +void compute_duration (void); union block *find_next_block (void); void flush_read (void); void flush_write (void); @@ -543,10 +546,6 @@ enum read_header tar_checksum (union block *header, bool silent); void skip_file (off_t size); void skip_member (void); -/* Module mangle.c. */ - -void extract_mangle (void); - /* Module misc.c. */ void assign_string (char **dest, const char *src); @@ -579,6 +578,7 @@ void undo_last_backup (void); int deref_stat (bool deref, char const *name, struct stat *buf); +void closeopen (void); int chdir_arg (char const *dir); void chdir_do (int dir); @@ -610,7 +610,7 @@ int gname_to_gid (char const *gname, gid_t *pgid); void uid_to_uname (uid_t uid, char **uname); int uname_to_uid (char const *uname, uid_t *puid); -void init_names (void); +void name_init (void); void name_add_name (const char *name, int matching_flags); void name_add_dir (const char *name); void name_term (void); @@ -678,7 +678,7 @@ 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_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); @@ -707,7 +707,6 @@ int sys_exec_info_script (const char **archive_name, int volume_number); void report_difference (struct tar_stat_info *st, const char *message, ...); /* Module sparse.c */ -bool sparse_file_p (struct tar_stat_info *st); bool sparse_member_p (struct tar_stat_info *st); bool sparse_fixup_header (struct tar_stat_info *st); enum dump_status sparse_dump_file (int, struct tar_stat_info *st); @@ -724,5 +723,3 @@ bool utf8_convert (bool to_utf, char const *input, char **output); void set_transform_expr (const char *expr); bool transform_name (char **pinput); bool transform_name_fp (char **pinput, char *(*fun)(char *)); - -