X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fcommon.h;h=d1815ed41f619f5cef87220e69973353312f882e;hb=ed08ef04580c897112c79932a98ac5ccda40425b;hp=7ccd3406e5f66bd5fd7498d0e9831f5a96e7df98;hpb=2bda83b48d8a6807632312403561b11b79048443;p=chaz%2Ftar diff --git a/src/common.h b/src/common.h index 7ccd340..d1815ed 100644 --- a/src/common.h +++ b/src/common.h @@ -23,6 +23,9 @@ /* The checksum field is filled with this while the checksum is computed. */ #define CHKBLANKS " " /* 8 blanks, no null */ +/* Old GNU stores zero-terminated file name */ +#define OLDGNU_NAME_FIELD_SIZE 99 + /* Some constants from POSIX are given names. */ #define NAME_FIELD_SIZE 100 #define PREFIX_FIELD_SIZE 155 @@ -38,11 +41,6 @@ /* Some various global definitions. */ /* Name of file to use for interacting with user. */ -#if MSDOS -# define TTY_NAME "con" -#else -# define TTY_NAME "/dev/tty" -#endif /* GLOBAL is defined to empty in tar.c only, and left alone in other *.c modules. Here, we merely set it to "extern" if it is not already set. @@ -86,6 +84,9 @@ GLOBAL int exit_status; #include #include #include +#define obstack_chunk_alloc xmalloc +#define obstack_chunk_free free +#include /* Log base 2 of common values. */ #define LG_8 3 @@ -160,10 +161,8 @@ GLOBAL int check_links_option; /* Patterns that match file names to be excluded. */ GLOBAL struct exclude *excluded; -/* Specified file containing names to work on. */ -GLOBAL const char *files_from_option; - -GLOBAL bool force_local_option; +/* Exclude directories containing a cache directory tag. */ +GLOBAL bool exclude_caches_option; /* Specified value to be put into tar file in place of stat () results, or just -1 if such an override should not take place. */ @@ -237,6 +236,9 @@ GLOBAL bool read_full_records_option; GLOBAL bool remove_files_option; +/* Specified rmt command. */ +GLOBAL const char *rmt_command_option; + /* Specified remote shell command. */ GLOBAL const char *rsh_command_option; @@ -248,9 +250,9 @@ GLOBAL int same_owner_option; /* If positive, preserve permissions when extracting. */ GLOBAL int same_permissions_option; -/* When set, strip the given number of path elements from the file name +/* When set, strip the given number of file name components from the file name before extracting */ -GLOBAL size_t strip_path_elements; +GLOBAL size_t strip_name_components; GLOBAL bool show_omitted_dirs_option; @@ -267,6 +269,12 @@ GLOBAL bool totals_option; GLOBAL bool touch_option; +GLOBAL char *to_command_option; +GLOBAL bool ignore_command_error_option; + +/* Return true if the extracted files are not being written to disk */ +#define EXTRACT_OVER_PIPE (to_stdout_option || to_command_option) + /* Count how many times the option has been set, multiple setting yields more verbose behavior. Value 0 means no verbosity, 1 means file name only, 2 means file name and all attributes. More than 2 is just like 2. */ @@ -328,6 +336,12 @@ struct name GLOBAL dev_t ar_dev; GLOBAL ino_t ar_ino; +GLOBAL bool seekable_archive; + +GLOBAL dev_t root_device; + +/* Unquote filenames */ +GLOBAL bool unquote_option; /* Declarations for each module. */ @@ -367,6 +381,8 @@ void clear_read_error_count (void); void xclose (int fd); void archive_write_error (ssize_t) __attribute__ ((noreturn)); void archive_read_error (void); +off_t seek_archive (off_t size); +void set_start_time (void); /* Module create.c. */ @@ -437,7 +453,7 @@ void delete_archive_members (void); char *get_directory_contents (char *, dev_t); void read_directory_file (void); void write_directory_file (void); -void gnu_restore (char const *); +void purge_directory (char const *); /* Module list.c. */ @@ -496,6 +512,7 @@ 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 (bool); +enum read_header tar_checksum (union block *header, bool silent); void skip_file (off_t); void skip_member (void); @@ -515,7 +532,15 @@ enum remove_option { ORDINARY_REMOVE_OPTION, RECURSIVE_REMOVE_OPTION, - WANT_DIRECTORY_REMOVE_OPTION + + /* FIXME: The following value is never used. It seems to be intended + as a placeholder for a hypothetical option that should instruct tar + to recursively remove subdirectories in purge_directory(), + as opposed to the functionality of --recursive-unlink + (RECURSIVE_REMOVE_OPTION value), which removes them in + prepare_to_extract() phase. However, with the addition of more + meta-info to the incremental dumps, this should become unnecessary */ + WANT_DIRECTORY_REMOVE_OPTION }; int remove_any_file (const char *, enum remove_option); bool maybe_backup_file (const char *, int); @@ -560,6 +585,7 @@ void seek_error_details (char const *, off_t); void seek_warn (char const *); void seek_warn_details (char const *, off_t); void seek_diag_details (char const *, off_t); +void stat_fatal (char const *); void stat_error (char const *); void stat_warn (char const *); void stat_diag (char const *name); @@ -578,6 +604,8 @@ void write_fatal_details (char const *, ssize_t, size_t) pid_t xfork (void); void xpipe (int[2]); +void *page_aligned_alloc (void **, size_t); + /* Module names.c. */ extern struct name *gnu_list_name; @@ -592,7 +620,6 @@ void name_add (const char *); void name_init (void); void name_term (void); char *name_next (int); -void name_close (void); void name_gather (void); struct name *addname (char const *, int); int name_match (const char *); @@ -610,9 +637,12 @@ bool excluded_name (char const *); void add_avoided_name (char const *); bool is_avoided_name (char const *); +bool is_individual_file (char const *); bool contains_dot_dot (char const *); +bool removed_prefixes_p (void); + #define ISFOUND(c) ((occurrence_option == 0) ? (c)->found_count : \ (c)->found_count == occurrence_option) #define WASFOUND(c) ((occurrence_option == 0) ? (c)->found_count : \ @@ -664,13 +694,12 @@ bool sys_compare_gid (struct stat *a, struct stat *b); bool sys_file_is_archive (struct tar_stat_info *p); bool sys_compare_links (struct stat *link_data, struct stat *stat_data); int sys_truncate (int fd); -void sys_reset_uid_gid (void); pid_t sys_child_open_for_compress (void); pid_t sys_child_open_for_uncompress (void); -void sys_reset_uid_gid (void); size_t sys_write_archive_buffer (void); bool sys_get_archive_stat (void); -void sys_reset_uid_gid (void); +int sys_exec_command (char *file_name, int typechar, struct tar_stat_info *st); +void sys_wait_command (void); /* Module compare.c */ void report_difference (struct tar_stat_info *st, const char *message, ...);