X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fcommon.h;h=196c1188c713100a0c4c6985e2e549e13e4c4c74;hb=cef4d5e83830763a1acd5d603fb62a356df27299;hp=6dd1abd3e2fc322e5be5ff2a0c17335a10cbc368;hpb=f236f3364325c0c78b2d6f00648bbe946baf5482;p=chaz%2Ftar diff --git a/src/common.h b/src/common.h index 6dd1abd..196c118 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, 2009 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,10 @@ GLOBAL enum old_files old_files_option; /* Specified file name for incremental list. */ GLOBAL const char *listed_incremental_option; +/* Incremental dump level */ +GLOBAL int incremental_level; +/* Check device numbers when doing incremental dumps. */ +GLOBAL bool check_device_option; /* Specified mode change string. */ GLOBAL struct mode_change *mode_option; @@ -325,25 +320,41 @@ GLOBAL const char **archive_name_cursor; /* Output index file name. */ GLOBAL char const *index_file_name; +/* Opaque structure for keeping directory meta-data */ +struct directory; + /* Structure for keeping track of filenames and lists thereof. */ struct name { struct name *next; /* Link to the next element */ + struct name *prev; /* Link to the previous element */ + + char *name; /* File name or globbing pattern */ + size_t length; /* cached strlen (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 */ - int matching_flags; /* this name is a regexp, not literal */ - char const *dir_contents; /* for incremental_option */ - - size_t length; /* cached strlen(name) */ - char name[1]; + + /* The following members are used for incremental dumps only, + if this struct name represents a directory; + see incremen.c */ + struct directory *directory;/* directory meta-data and contents */ + struct name *parent; /* pointer to the parent hierarchy */ + struct name *child; /* pointer to the first child */ + struct name *sibling; /* pointer to the next sibling */ + char *caname; /* canonical name */ }; /* Obnoxious test to see if dimwit is trying to dump the archive. */ GLOBAL dev_t ar_dev; GLOBAL ino_t ar_ino; +GLOBAL int seek_option; GLOBAL bool seekable_archive; GLOBAL dev_t root_device; @@ -435,7 +446,7 @@ 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, int top_level, dev_t parent_device); +void dump_file (const char *st, bool top_level, dev_t parent_device); union block *start_header (struct tar_stat_info *st); void finish_header (struct tar_stat_info *st, union block *header, off_t block_ordinal); @@ -445,7 +456,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 (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)) @@ -489,9 +504,26 @@ bool rename_directory (char *src, char *dst); void delete_archive_members (void); /* Module incremen.c. */ - -char *get_directory_contents (char *dir_name, dev_t device); -const char *append_incremental_renames (const char *dump); +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); +const char *directory_contents (struct directory *dir); +const char *safe_directory_contents (struct directory *dir); + +void rebase_directory (struct directory *dir, + const char *samp, size_t slen, + const char *repl, size_t rlen); + +void append_incremental_renames (struct directory *dir); void read_directory_file (void); void write_directory_file (void); void purge_directory (char const *directory_name); @@ -540,7 +572,7 @@ 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); +uintmax_t uintmax_from_header (const char *buf, size_t size); void list_archive (void); void print_for_mkdir (char *dirname, int length, mode_t mode); @@ -558,6 +590,10 @@ void skip_member (void); 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); +void replace_prefix (char **pname, const char *samp, size_t slen, + const char *repl, size_t rlen); void code_ns_fraction (int ns, char *p); char const *code_timespec (struct timespec ts, char *sbuf); @@ -587,6 +623,7 @@ int deref_stat (bool deref, char const *name, struct stat *buf); int chdir_arg (char const *dir); void chdir_do (int dir); +int chdir_count (void); void close_diag (char const *name); void open_diag (char const *name); @@ -595,6 +632,10 @@ void readlink_diag (char const *name); void savedir_diag (char const *name); void seek_diag_details (char const *name, off_t offset); void stat_diag (char const *name); +void file_removed_diag (const char *name, bool top_level, + void (*diagfn) (char const *name)); +void dir_removed_diag (char const *name, bool top_level, + void (*diagfn) (char const *name)); void write_error_details (char const *name, size_t status, size_t size); void write_fatal (char const *name) __attribute__ ((noreturn)); void write_fatal_details (char const *name, ssize_t status, size_t size) @@ -622,12 +663,13 @@ void name_add_dir (const char *name); void name_term (void); const char *name_next (int change_dirs); void name_gather (void); -struct name *addname (char const *string, int change_dir); +struct name *addname (char const *string, int change_dir, + bool cmdline, struct name *parent); bool name_match (const char *name); void names_notfound (void); void collect_and_sort_names (void); struct name *name_scan (const char *name); -char *name_from_list (void); +struct name const *name_from_list (void); void blank_name_list (void); char *new_name (const char *dir_name, const char *name); size_t stripped_prefix_len (char const *file_name, size_t num); @@ -692,8 +734,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); @@ -707,6 +748,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, ...); @@ -725,14 +769,59 @@ 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; +#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, xform_type type); -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); + +/* Module warning.c */ +#define WARN_ALONE_ZERO_BLOCK 0x00000001 +#define WARN_BAD_DUMPDIR 0x00000002 +#define WARN_CACHEDIR 0x00000004 +#define WARN_CONTIGUOUS_CAST 0x00000008 +#define WARN_FILE_CHANGED 0x00000010 +#define WARN_FILE_IGNORED 0x00000020 +#define WARN_FILE_REMOVED 0x00000040 +#define WARN_FILE_SHRANK 0x00000080 +#define WARN_FILE_UNCHANGED 0x00000100 +#define WARN_FILENAME_WITH_NULS 0x00000200 +#define WARN_IGNORE_ARCHIVE 0x00000400 +#define WARN_IGNORE_NEWER 0x00000800 +#define WARN_NEW_DIRECTORY 0x00001000 +#define WARN_RENAME_DIRECTORY 0x00002000 +#define WARN_SYMLINK_CAST 0x00004000 +#define WARN_TIMESTAMP 0x00008000 +#define WARN_UNKNOWN_CAST 0x00010000 +#define WARN_UNKNOWN_KEYWORD 0x00020000 +#define WARN_XDEV 0x00040000 + +/* 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) + +void set_warning_option (const char *arg); + +extern int warning_option; + +#define WARNOPT(opt,args) \ + do \ + { \ + if (warning_option & opt) WARN (args); \ + } \ + while (0) +