X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fcommon.h;h=e5e619d83bb1dd38523cd7432611dfd85771c3c0;hb=45a574151ae64ae4f9b0d99302f7da6d9d8451a9;hp=2af403c102535725e4279b2526242071edd5b3b1;hpb=166b7c7d028c3dbcfded5c834b9bf752d2fb41f0;p=chaz%2Ftar diff --git a/src/common.h b/src/common.h index 2af403c..e5e619d 100644 --- a/src/common.h +++ b/src/common.h @@ -1,7 +1,7 @@ /* Common declarations for the tar program. Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001, - 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, + 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it @@ -85,7 +85,8 @@ enum subcommand DIFF_SUBCOMMAND, /* -d */ EXTRACT_SUBCOMMAND, /* -x */ LIST_SUBCOMMAND, /* -t */ - UPDATE_SUBCOMMAND /* -u */ + UPDATE_SUBCOMMAND, /* -u */ + TEST_LABEL_SUBCOMMAND, /* --test-label */ }; GLOBAL enum subcommand subcommand_option; @@ -104,6 +105,8 @@ GLOBAL bool absolute_names_option; /* Display file times in UTC */ GLOBAL bool utc_option; +/* Output file timestamps to the full resolution */ +GLOBAL bool full_time_option; /* This variable tells how to interpret newer_mtime_option, below. If zero, files get archived if their mtime is not less than newer_mtime_option. @@ -334,12 +337,12 @@ struct 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 */ - + /* The following members are used for incremental dumps only, if this struct name represents a directory; see incremen.c */ @@ -362,8 +365,6 @@ GLOBAL dev_t root_device; /* Unquote filenames */ GLOBAL bool unquote_option; -GLOBAL bool test_label_option; /* Test archive volume label and exit */ - /* Show file or archive names after transformation. In particular, when creating archive in verbose mode, list member names as stored in the archive */ @@ -403,6 +404,8 @@ extern uintmax_t continued_file_size; extern uintmax_t continued_file_offset; extern off_t records_written; +char *drop_volume_label_suffix (const char *label); + size_t available_space_after (union block *pointer); off_t current_block_ordinal (void); void close_archive (void); @@ -424,9 +427,10 @@ 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_begin_write (const char *file_name, off_t totsize, off_t sizeleft); + +void mv_begin_read (struct tar_stat_info *st); void mv_end (void); -void mv_total_size (off_t size); void mv_size_left (off_t size); void buffer_write_global_xheader (void); @@ -445,7 +449,6 @@ void add_exclusion_tag (const char *name, enum exclusion_tag_type type, bool (*)(const char*)); 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, bool top_level, dev_t parent_device); @@ -462,29 +465,12 @@ void exclusion_tag_warning (const char *dirname, const char *tagname, const char *message); enum exclusion_tag_type check_exclusion_tags (const char *dirname, const char **tag_file_name); - -#define GID_TO_CHARS(val, where) gid_to_chars (val, where, sizeof (where)) -#define MAJOR_TO_CHARS(val, where) major_to_chars (val, where, sizeof (where)) -#define MINOR_TO_CHARS(val, where) minor_to_chars (val, where, sizeof (where)) -#define MODE_TO_CHARS(val, where) mode_to_chars (val, where, sizeof (where)) + #define OFF_TO_CHARS(val, where) off_to_chars (val, where, sizeof (where)) -#define SIZE_TO_CHARS(val, where) size_to_chars (val, where, sizeof (where)) #define TIME_TO_CHARS(val, where) time_to_chars (val, where, sizeof (where)) -#define UID_TO_CHARS(val, where) uid_to_chars (val, where, sizeof (where)) -#define UINTMAX_TO_CHARS(val, where) uintmax_to_chars (val, where, sizeof (where)) -#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)) - -bool gid_to_chars (gid_t gid, char *buf, size_t size); -bool major_to_chars (major_t m, char *buf, size_t size); -bool minor_to_chars (minor_t m, char *buf, size_t size); -bool mode_to_chars (mode_t m, char *buf, size_t size); + bool off_to_chars (off_t off, char *buf, size_t size); -bool size_to_chars (size_t v, char *buf, size_t size); bool time_to_chars (time_t t, char *buf, size_t size); -bool uid_to_chars (uid_t uid, char *buf, size_t size); -bool uintmax_to_chars (uintmax_t v, char *buf, size_t size); -void string_to_chars (char const *s, char *buf, size_t size); /* Module diffarch.c. */ @@ -506,15 +492,6 @@ bool rename_directory (char *src, char *dst); void delete_archive_members (void); /* Module incremen.c. */ -typedef struct dumpdir *dumpdir_t; -typedef struct dumpdir_iter *dumpdir_iter_t; - -dumpdir_t dumpdir_create0 (const char *contents, const char *cmask); -dumpdir_t dumpdir_create (const char *contents); -void dumpdir_free (dumpdir_t); -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); struct directory *scan_directory (char *dir, dev_t device, bool cmdline); void name_fill_directory (struct name *name, dev_t device, bool cmdline); @@ -547,6 +524,17 @@ enum read_header HEADER_FAILURE /* ill-formed header, or bad checksum */ }; +/* Operation mode for read_header: */ + +enum read_header_mode +{ + read_header_auto, /* process extended headers automatically */ + read_header_x_raw, /* return raw extended headers (return + HEADER_SUCCESS_EXTENDED) */ + read_header_x_global /* when POSIX global extended header is read, + decode it and return + HEADER_SUCCESS_EXTENDED */ +}; extern union block *current_header; extern enum archive_format current_format; extern size_t recent_long_name_blocks; @@ -556,35 +544,21 @@ void decode_header (union block *header, struct tar_stat_info *stat_info, enum archive_format *format_pointer, int do_user_group); 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, 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)) -#define UID_FROM_HEADER(where) uid_from_header (where, sizeof (where)) #define UINTMAX_FROM_HEADER(where) uintmax_from_header (where, sizeof (where)) -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, 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); void list_archive (void); +void test_archive_label (void); void print_for_mkdir (char *dirname, int length, mode_t mode); void print_header (struct tar_stat_info *st, union block *blk, off_t block_ordinal); void read_and (void (*do_something) (void)); enum read_header read_header (union block **return_block, struct tar_stat_info *info, - bool raw_extended_headers); + enum read_header_mode m); enum read_header tar_checksum (union block *header, bool silent); void skip_file (off_t size); void skip_member (void); @@ -592,7 +566,6 @@ void skip_member (void); /* Module misc.c. */ void assign_string (char **dest, const char *src); -char *quote_copy_string (const char *str); int unquote_string (char *str); char *zap_slashes (char *name); char *normalize_filename (const char *name); @@ -630,6 +603,7 @@ void undo_last_backup (void); int deref_stat (bool deref, char const *name, struct stat *buf); +extern int chdir_current; int chdir_arg (char const *dir); void chdir_do (int dir); int chdir_count (void); @@ -659,6 +633,7 @@ int set_file_atime (int fd, char const *file, /* Module names.c. */ +extern size_t name_count; extern struct name *gnu_list_name; void gid_to_gname (gid_t gid, char **gname); @@ -677,6 +652,7 @@ struct name *addname (char const *string, int change_dir, void remname (struct name *name); bool name_match (const char *name); void names_notfound (void); +void label_notfound (void); void collect_and_sort_names (void); struct name *name_scan (const char *name); struct name const *name_from_list (void); @@ -703,7 +679,6 @@ bool contains_dot_dot (char const *name); void usage (int); int confirm (const char *message_action, const char *name); -void request_stdin (const char *option); void tar_stat_init (struct tar_stat_info *st); void tar_stat_destroy (struct tar_stat_info *st); @@ -721,7 +696,6 @@ void update_archive (void); /* Module xheader.c. */ -void xheader_init (struct xheader *xhdr); void xheader_decode (struct tar_stat_info *stat); void xheader_decode_global (struct xheader *xhdr); void xheader_store (char const *keyword, struct tar_stat_info *st, @@ -787,12 +761,11 @@ bool utf8_convert (bool to_utf, char const *input, char **output); void set_transform_expr (const char *expr); bool transform_name (char **pinput, int type); -bool transform_member_name (char **pinput, int type); bool transform_name_fp (char **pinput, int type, char *(*fun)(char *, void *), void *); /* Module suffix.c */ -void set_comression_program_by_suffix (const char *name, const char *defprog); +void set_compression_program_by_suffix (const char *name, const char *defprog); /* Module checkpoint.c */ void checkpoint_compile_action (const char *str); @@ -843,4 +816,3 @@ void finish_deferred_unlinks (void); /* Module exit.c */ extern void (*fatal_exit_hook) (void); -