X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon.h;h=9897b46c4c104a79a978fc04361f848669680342;hb=f14558de94eb5486f88ac3719b5e34f9640cb1de;hp=2ee8c2b00343a2df0c42c29faa22fc8121c98083;hpb=8bdbc08a89519f1946aaf61f92e0f44c9f048645;p=chaz%2Ftar diff --git a/src/common.h b/src/common.h index 2ee8c2b..9897b46 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, 2007 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 @@ -93,9 +93,6 @@ GLOBAL enum subcommand subcommand_option; /* Selected format for output archive. */ GLOBAL enum archive_format archive_format; -/* Either NL or NUL, as decided by the --null option. */ -GLOBAL char filename_terminator; - /* Size of each record, once in blocks, once in bytes. Those two variables are always related, the second being BLOCKSIZE times the first. They do not have _option in their name, even if their values is derived from @@ -130,19 +127,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; @@ -194,6 +185,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; @@ -416,6 +409,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. */ @@ -444,7 +438,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)) @@ -488,8 +486,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); @@ -512,14 +520,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; @@ -675,23 +675,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); -bool 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); @@ -700,8 +699,7 @@ char *xheader_format_name (struct tar_stat_info *st, const char *fmt, void sys_detect_dev_null_output (void); void sys_save_archive_dev_ino (void); -void sys_drain_input_pipe (void); -void sys_wait_for_child (pid_t); +void sys_wait_for_child (pid_t, bool); void sys_spawn_shell (void); bool sys_compare_uid (struct stat *a, struct stat *b); bool sys_compare_gid (struct stat *a, struct stat *b); @@ -715,6 +713,9 @@ 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, ...); @@ -733,7 +734,21 @@ bool string_ascii_p (const char *str); bool utf8_convert (bool to_utf, char const *input, char **output); /* Module transform.c */ +#define XFORM_REGFILE 0x01 +#define XFORM_LINK 0x02 +#define XFORM_SYMLINK 0x04 +#define XFORM_ALL (XFORM_REGFILE|XFORM_LINK|XFORM_SYMLINK) + void set_transform_expr (const char *expr); -bool transform_name (char **pinput); -bool transform_member_name (char **pinput, bool lnk); -bool transform_name_fp (char **pinput, char *(*fun)(char *, void *), void *); +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); + +/* Module checkpoint.c */ +void checkpoint_compile_action (const char *str); +void checkpoint_finish_compile (void); +void checkpoint_run (bool do_write);