X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fcommon.h;h=f43673b328978f26bc8ea893ef7c4b94552f3fdc;hb=b94eed6d03bd9f34f1d6336af8ea682804eb15b4;hp=7ce33b0ac90161db1131aad00eaa0eb740220817;hpb=300210aa1576ce00b689430b361a70cbf79989d6;p=chaz%2Ftar diff --git a/src/common.h b/src/common.h index 7ce33b0..f43673b 100644 --- a/src/common.h +++ b/src/common.h @@ -1,11 +1,11 @@ /* Common declarations for the tar program. Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001, - 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any later + Free Software Foundation; either version 3, or (at your option) any later version. This program is distributed in the hope that it will be useful, but @@ -130,19 +130,13 @@ GLOBAL enum backup_type backup_type; GLOBAL bool block_number_option; GLOBAL unsigned checkpoint_option; - -enum checkpoint_style - { - checkpoint_text, - checkpoint_dot - }; - -GLOBAL enum checkpoint_style checkpoint_style; +#define DEFAULT_CHECKPOINT 10 /* Specified name of compression program, or "gzip" as implied by -z. */ GLOBAL const char *use_compress_program_option; GLOBAL bool dereference_option; +GLOBAL bool hard_dereference_option; /* Print a message if not all links are dumped */ GLOBAL int check_links_option; @@ -150,8 +144,18 @@ GLOBAL int check_links_option; /* Patterns that match file names to be excluded. */ GLOBAL struct exclude *excluded; -/* Exclude directories containing a cache directory tag. */ -GLOBAL bool exclude_caches_option; +enum exclusion_tag_type + { + exclusion_tag_none, + /* Exclude the directory contents, but preserve the directory + itself and the exclusion tag file */ + exclusion_tag_contents, + /* Exclude everything below the directory, preserving the directory + itself */ + exclusion_tag_under, + /* Exclude entire directory */ + exclusion_tag_all, + }; /* Specified value to be put into tar file in place of stat () results, or just -1 if such an override should not take place. */ @@ -184,6 +188,8 @@ GLOBAL enum old_files old_files_option; /* Specified file name for incremental list. */ GLOBAL const char *listed_incremental_option; +/* Check device numbers when doing incremental dumps. */ +GLOBAL bool check_device_option; /* Specified mode change string. */ GLOBAL struct mode_change *mode_option; @@ -197,6 +203,11 @@ GLOBAL bool multi_volume_option; do not get archived (also see after_date_option above). */ GLOBAL struct timespec newer_mtime_option; +/* If true, override actual mtime (see below) */ +GLOBAL bool set_mtime_option; +/* Value to be put in mtime header field instead of the actual mtime */ +GLOBAL struct timespec mtime_option; + /* Return true if newer_mtime_option is initialized. */ #define NEWER_OPTION_INITIALIZED(opt) (0 <= (opt).tv_nsec) @@ -247,6 +258,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; @@ -289,7 +302,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*/ @@ -377,6 +390,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); @@ -398,6 +412,7 @@ void mv_end (void); void mv_total_size (off_t size); void mv_size_left (off_t size); +void buffer_write_global_xheader (void); /* Module create.c. */ @@ -409,6 +424,10 @@ enum dump_status dump_status_not_implemented }; +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); @@ -422,7 +441,11 @@ union block * write_extended (bool global, struct tar_stat_info *st, union block *start_private_header (const char *name, size_t size); void write_eot (void); void check_links (void); - +void exclusion_tag_warning (const char *dirname, const char *tagname, + const char *message); +enum exclusion_tag_type check_exclusion_tags (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)) @@ -466,8 +489,18 @@ 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); + -char *get_directory_contents (char *dir_name, dev_t device); +const char *get_directory_contents (char *dir_name, dev_t device); const char *append_incremental_renames (const char *dump); void read_directory_file (void); void write_directory_file (void); @@ -490,14 +523,6 @@ enum read_header HEADER_FAILURE /* ill-formed header, or bad checksum */ }; -struct xheader -{ - struct obstack *stk; - size_t size; - char *buffer; -}; - -GLOBAL struct xheader extended_header; extern union block *current_header; extern enum archive_format current_format; extern size_t recent_long_name_blocks; @@ -538,10 +563,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); @@ -605,7 +626,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); @@ -657,23 +678,22 @@ 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 (void); -void xheader_store (char const *keyword, struct tar_stat_info const *st, +void xheader_decode_global (struct xheader *xhdr); +void xheader_store (char const *keyword, struct tar_stat_info *st, void const *data); -void xheader_read (union block *header, size_t size); +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_global (void); +void xheader_write_global (struct xheader *xhdr); void xheader_finish (struct xheader *hdr); void xheader_destroy (struct xheader *hdr); char *xheader_xhdr_name (struct tar_stat_info *st); char *xheader_ghdr_name (void); -void xheader_write (char type, char *name, struct xheader *xhdr); -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); +void xheader_string_begin (struct xheader *xhdr); +void xheader_string_add (struct xheader *xhdr, char const *s); +bool xheader_string_end (struct xheader *xhdr, 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); @@ -697,12 +717,14 @@ bool sys_get_archive_stat (void); int sys_exec_command (char *file_name, int typechar, struct tar_stat_info *st); void sys_wait_command (void); int sys_exec_info_script (const char **archive_name, int volume_number); +void sys_exec_checkpoint_script (const char *script_name, + const char *archive_name, + int checkpoint_number); /* Module compare.c */ 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); @@ -716,8 +738,22 @@ bool string_ascii_p (const char *str); bool utf8_convert (bool to_utf, char const *input, char **output); /* Module transform.c */ +typedef enum + { + xform_regfile, + xform_link, + xform_symlink + } xform_type; + void set_transform_expr (const char *expr); bool transform_name (char **pinput); -bool transform_name_fp (char **pinput, char *(*fun)(char *)); - - +bool transform_member_name (char **pinput, xform_type type); +bool transform_name_fp (char **pinput, char *(*fun)(char *, void *), void *); + +/* Module suffix.c */ +void set_comression_program_by_suffix (const char *name, const char *defprog); + +/* Module checkpoint.c */ +void checkpoint_compile_action (const char *str); +void checkpoint_finish_compile (void); +void checkpoint_run (bool do_write);