X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fcommon.h;h=28a222302e6a553348561d3f22c863bd07c02d7d;hb=b229a86dd734a408024357da0e7927aafba1696a;hp=c1effd4d69f04ee225d31c5cb6dc98d7b986f4c0;hpb=57c2124d68aa65843548feef9d226fb025503258;p=chaz%2Ftar diff --git a/src/common.h b/src/common.h index c1effd4..28a2223 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 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006 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 @@ -114,7 +114,13 @@ GLOBAL bool utc_option; than newer_mtime_option. */ GLOBAL int after_date_option; -GLOBAL bool atime_preserve_option; +enum atime_preserve +{ + no_atime_preserve, + replace_atime_preserve, + system_atime_preserve +}; +GLOBAL enum atime_preserve atime_preserve_option; GLOBAL bool backup_option; @@ -123,7 +129,15 @@ GLOBAL enum backup_type backup_type; GLOBAL bool block_number_option; -GLOBAL bool checkpoint_option; +GLOBAL unsigned checkpoint_option; + +enum checkpoint_style + { + checkpoint_text, + checkpoint_dot + }; + +GLOBAL enum checkpoint_style checkpoint_style; /* Specified name of compression program, or "gzip" as implied by -z. */ GLOBAL const char *use_compress_program_option; @@ -248,6 +262,9 @@ GLOBAL bool touch_option; GLOBAL char *to_command_option; GLOBAL bool ignore_command_error_option; +/* Restrict some potentially harmful tar options */ +GLOBAL bool restrict_option; + /* Return true if the extracted files are not being written to disk */ #define EXTRACT_OVER_PIPE (to_stdout_option || to_command_option) @@ -272,16 +289,20 @@ GLOBAL int archive; /* Nonzero when outputting to /dev/null. */ GLOBAL bool dev_null_output; -/* Timestamp for when we started execution. */ -GLOBAL struct timespec start_time; +/* Timestamps: */ +GLOBAL struct timespec start_time; /* when we started execution */ +GLOBAL struct timespec volume_start_time; /* when the current volume was + opened*/ +GLOBAL struct timespec last_stat_time; /* when the statistics was last + computed */ GLOBAL struct tar_stat_info current_stat_info; /* List of tape drive names, number of such tape drives, allocated number, and current cursor in list. */ GLOBAL const char **archive_name_array; -GLOBAL int archive_names; -GLOBAL int allocated_archive_names; +GLOBAL size_t archive_names; +GLOBAL size_t allocated_archive_names; GLOBAL const char **archive_name_cursor; /* Output index file name. */ @@ -290,16 +311,17 @@ GLOBAL char const *index_file_name; /* Structure for keeping track of filenames and lists thereof. */ struct name { - struct name *next; - size_t length; /* cached strlen(name) */ + struct name *next; /* Link to the next element */ + 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 isdir; - char firstch; /* first char is literally matched */ - char regexp; /* this name is a regexp, not literal */ - int change_dir; /* set with the -C option */ + int explicit; /* this name was explicitely given in the + command line */ + int matching_flags; /* this name is a regexp, not literal */ char const *dir_contents; /* for incremental_option */ - char fake; /* dummy entry */ + + size_t length; /* cached strlen(name) */ char name[1]; }; @@ -316,9 +338,20 @@ GLOBAL bool unquote_option; GLOBAL bool test_label_option; /* Test archive volume label and exit */ -GLOBAL bool show_stored_names_option; /* When creating archive in verbose mode, - list member names as stored in the archive */ +/* Show file or archive names after transformation. + In particular, when creating archive in verbose mode, list member names + as stored in the archive */ +GLOBAL bool show_transformed_names_option; + +/* Delay setting modification times and permissions of extracted directories + until the end of extraction. This variable helps correctly restore directory + timestamps from archives with an unusual member order. It is automatically + set for incremental archives. */ +GLOBAL bool delay_directory_restore_option; +/* Warn about implicit use of the wildcards in command line arguments. + (Default for tar prior to 1.15.91, but changed afterwards */ +GLOBAL bool warn_regex_usage; /* Declarations for each module. */ @@ -336,10 +369,11 @@ extern enum access_mode access_mode; /* Module buffer.c. */ extern FILE *stdlis; -extern char *save_name; -extern off_t save_sizeleft; -extern off_t save_totsize; extern bool write_archive_to_stdout; +extern char *volume_label; +extern char *continued_file_name; +extern uintmax_t continued_file_size; +extern uintmax_t continued_file_offset; size_t available_space_after (union block *); off_t current_block_ordinal (void); @@ -351,7 +385,7 @@ void flush_write (void); void flush_archive (void); void init_volume_number (void); void open_archive (enum access_mode); -void print_total_written (void); +void print_total_stats (void); void reset_eof (void); void set_next_block_after (union block *); void clear_read_error_count (void); @@ -361,6 +395,12 @@ 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_end (void); +void mv_total_size (off_t size); +void mv_size_left (off_t size); + + /* Module create.c. */ enum dump_status @@ -374,10 +414,12 @@ enum dump_status bool file_dumpable_p (struct tar_stat_info *); void create_archive (void); void pad_archive (off_t size_left); -void dump_file (char *, int, dev_t); +void dump_file (const char *, int, dev_t); union block *start_header (struct tar_stat_info *st); void finish_header (struct tar_stat_info *, union block *, off_t); void simple_finish_header (union block *header); +union block * write_extended (bool global, struct tar_stat_info *st, + union block *old_header); union block *start_private_header (const char *name, size_t size); void write_eot (void); void check_links (void); @@ -394,15 +436,15 @@ void check_links (void); #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)) -void gid_to_chars (gid_t, char *, size_t); -void major_to_chars (major_t, char *, size_t); -void minor_to_chars (minor_t, char *, size_t); -void mode_to_chars (mode_t, char *, size_t); -void off_to_chars (off_t, char *, size_t); -void size_to_chars (size_t, char *, size_t); -void time_to_chars (time_t, char *, size_t); -void uid_to_chars (uid_t, char *, size_t); -void uintmax_to_chars (uintmax_t, char *, size_t); +bool gid_to_chars (gid_t, char *, size_t); +bool major_to_chars (major_t, char *, size_t); +bool minor_to_chars (minor_t, char *, size_t); +bool mode_to_chars (mode_t, char *, size_t); +bool off_to_chars (off_t, char *, size_t); +bool size_to_chars (size_t, char *, size_t); +bool time_to_chars (time_t, char *, size_t); +bool uid_to_chars (uid_t, char *, size_t); +bool uintmax_to_chars (uintmax_t, char *, size_t); void string_to_chars (char const *, char *, size_t); /* Module diffarch.c. */ @@ -418,6 +460,7 @@ void verify_volume (void); void extr_init (void); void extract_archive (void); void extract_finish (void); +bool rename_directory (char *src, char *dst); /* Module delete.c. */ @@ -426,6 +469,7 @@ void delete_archive_members (void); /* Module incremen.c. */ char *get_directory_contents (char *, dev_t); +const char *append_incremental_renames (const char *dump); void read_directory_file (void); void write_directory_file (void); void purge_directory (char const *); @@ -433,7 +477,7 @@ void list_dumpdir (char *buffer, size_t size); void update_parent_directory (const char *name); size_t dumpdir_size (const char *p); -void get_gnu_dumpdir (void); +bool is_dumpdir (struct tar_stat_info *stat_info); /* Module list.c. */ @@ -488,6 +532,8 @@ void list_archive (void); void print_for_mkdir (char *, int, mode_t); void print_header (struct tar_stat_info *, off_t); void read_and (void (*) (void)); +enum read_header read_header_primitive (bool raw_extended_headers, + struct tar_stat_info *info); enum read_header read_header (bool); enum read_header tar_checksum (union block *header, bool silent); void skip_file (off_t); @@ -550,6 +596,8 @@ pid_t xfork (void); void xpipe (int[2]); void *page_aligned_alloc (void **, size_t); +int set_file_atime (int fd, char const *file, + struct timespec const timespec[2]); /* Module names.c. */ @@ -561,16 +609,16 @@ void uid_to_uname (uid_t, char **uname); int uname_to_uid (char const *, uid_t *); void init_names (void); -void name_add (const char *); -void name_init (void); +void name_add_name (const char *, int); +void name_add_dir (const char *name); void name_term (void); -char *name_next (int); +const char *name_next (int); void name_gather (void); struct name *addname (char const *, int); int name_match (const char *); void names_notfound (void); void collect_and_sort_names (void); -struct name *name_scan (const char *); +struct name *name_scan (const char *, bool); char *name_from_list (void); void blank_name_list (void); char *new_name (const char *, const char *); @@ -601,6 +649,8 @@ void tar_stat_init (struct tar_stat_info *st); void tar_stat_destroy (struct tar_stat_info *st); void usage (int) __attribute__ ((noreturn)); int tar_timespec_cmp (struct timespec a, struct timespec b); +const char *archive_format_string (enum archive_format fmt); +const char *subcommand_string (enum subcommand c); /* Module update.c. */ @@ -627,6 +677,8 @@ void xheader_string_begin (void); void xheader_string_add (char const *s); void 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); /* Module system.c */ @@ -646,6 +698,7 @@ size_t sys_write_archive_buffer (void); 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); /* Module compare.c */ void report_difference (struct tar_stat_info *st, const char *message, ...); @@ -662,3 +715,10 @@ bool sparse_diff_file (int, struct tar_stat_info *); /* Module utf8.c */ bool string_ascii_p (const char *str); bool utf8_convert (bool to_utf, char const *input, char **output); + +/* Module transform.c */ +void set_transform_expr (const char *expr); +bool transform_name (char **pinput); +bool transform_name_fp (char **pinput, char *(*fun)(char *)); + +