X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fcommon.h;h=abcdbbca94541f3eeef89a56a129c0e164108b29;hb=488430f739e8230e852f88bdd5086f0a47b8eba0;hp=c8625cc9b0a1af0c1c84589281ad2fd7e65e1ba6;hpb=1fef6258aa492f84ea63c1eea3e1e0e9c40c81bb;p=chaz%2Ftar diff --git a/src/common.h b/src/common.h index c8625cc..abcdbbc 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 Free Software Foundation, Inc. + 2003, 2004 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 @@ -28,6 +28,12 @@ #define PREFIX_FIELD_SIZE 155 #define UNAME_FIELD_SIZE 32 #define GNAME_FIELD_SIZE 32 + +/* FIXME */ +#define MAXOCTAL11 017777777777L +#define MAXOCTAL7 07777777 + + /* Some various global definitions. */ @@ -79,6 +85,7 @@ GLOBAL int exit_status; #include #include #include +#include /* Log base 2 of common values. */ #define LG_8 3 @@ -122,6 +129,9 @@ GLOBAL size_t record_size; GLOBAL bool absolute_names_option; +/* Display file times in UTC */ +GLOBAL bool utc_option; + /* This variable tells how to interpret newer_mtime_option, below. If zero, files get archived if their mtime is not less than newer_mtime_option. If nonzero, files get archived if *either* their ctime or mtime is not less @@ -170,13 +180,17 @@ GLOBAL const char *info_script_option; GLOBAL bool interactive_option; +/* If nonzero, extract only Nth occurrence of each named file */ +GLOBAL uintmax_t occurrence_option; + enum old_files { - DEFAULT_OLD_FILES, /* default */ + DEFAULT_OLD_FILES, /* default */ NO_OVERWRITE_DIR_OLD_FILES, /* --no-overwrite-dir */ - OVERWRITE_OLD_FILES, /* --overwrite */ - UNLINK_FIRST_OLD_FILES, /* --unlink-first */ - KEEP_OLD_FILES /* --keep-old-files */ + OVERWRITE_OLD_FILES, /* --overwrite */ + UNLINK_FIRST_OLD_FILES, /* --unlink-first */ + KEEP_OLD_FILES, /* --keep-old-files */ + KEEP_NEWER_FILES /* --keep-newer-files */ }; GLOBAL enum old_files old_files_option; @@ -188,13 +202,23 @@ GLOBAL struct mode_change *mode_option; GLOBAL bool multi_volume_option; -/* The same variable hold the time, whether mtime or ctime. Just fake a +/* The same variable holds the time, whether mtime or ctime. Just fake a non-existing option, for making the code clearer, elsewhere. */ #define newer_ctime_option newer_mtime_option /* Specified threshold date and time. Files having an older time stamp do not get archived (also see after_date_option above). */ -GLOBAL time_t newer_mtime_option; +GLOBAL struct timespec newer_mtime_option; + +/* Return true if newer_mtime_option is initialized. */ +#define NEWER_OPTION_INITIALIZED(opt) (0 <= (opt).tv_nsec) + +/* Return true if the struct stat ST's M time is less than + newer_mtime_option. */ +#define OLDER_STAT_TIME(st, m) \ + ((st).st_##m##time < newer_mtime_option.tv_sec \ + || ((st).st_##m##time == newer_mtime_option.tv_sec \ + && TIMESPEC_NS ((st).st_##m##tim) < newer_mtime_option.tv_nsec)) /* Zero if there is no recursion, otherwise FNM_LEADING_DIR. */ GLOBAL int recursion_option; @@ -213,6 +237,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; @@ -224,6 +251,10 @@ GLOBAL int same_owner_option; /* If positive, preserve permissions when extracting. */ GLOBAL int same_permissions_option; +/* When set, strip the given number of file name components from the file name + before extracting */ +GLOBAL size_t strip_name_components; + GLOBAL bool show_omitted_dirs_option; GLOBAL bool sparse_option; @@ -268,18 +299,7 @@ GLOBAL bool dev_null_output; GLOBAL time_t start_time; #endif -/* Name of file read from the archive header */ -GLOBAL char *orig_file_name; - -/* Name of file for the current archive entry after being normalized. */ -GLOBAL char *current_file_name; - -/* Nonzero if the current archive entry had a trailing slash before it - was normalized. */ -GLOBAL int current_trailing_slash; - -/* Name of link for the current archive entry. */ -GLOBAL char *current_link_name; +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. */ @@ -296,7 +316,9 @@ struct name { struct name *next; size_t length; /* cached strlen(name) */ - char found; /* a matching file has been found */ + 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 */ @@ -305,16 +327,10 @@ struct name char name[1]; }; -/* Information about a sparse file. */ -struct sp_array - { - off_t offset; - size_t numbytes; - }; -GLOBAL struct sp_array *sparsearray; +/* Obnoxious test to see if dimwit is trying to dump the archive. */ +GLOBAL dev_t ar_dev; +GLOBAL ino_t ar_ino; -/* Number of elements in sparsearray. */ -GLOBAL int sp_array_size; /* Declarations for each module. */ @@ -350,13 +366,29 @@ void open_archive (enum access_mode); void print_total_written (void); void reset_eof (void); void set_next_block_after (union block *); +void clear_read_error_count (void); +void xclose (int fd); +void archive_write_error (ssize_t) __attribute__ ((noreturn)); +void archive_read_error (void); /* Module create.c. */ +enum dump_status + { + dump_status_ok, + dump_status_short, + dump_status_fail, + dump_status_not_implemented + }; + +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 finish_header (union block *, off_t); -void init_sparsearray (void); +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 *start_private_header (const char *name, size_t size); void write_eot (void); void check_links (void); @@ -369,6 +401,8 @@ void check_links (void); #define TIME_TO_CHARS(val, where) time_to_chars (val, where, sizeof (where)) #define UID_TO_CHARS(val, where) uid_to_chars (val, where, sizeof (where)) #define UINTMAX_TO_CHARS(val, where) uintmax_to_chars (val, where, sizeof (where)) +#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); @@ -379,6 +413,7 @@ 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); +void string_to_chars (char *, char *, size_t); /* Module diffarch.c. */ @@ -392,7 +427,6 @@ void verify_volume (void); extern bool we_are_root; void extr_init (void); -bool fill_in_sparse_array (void); void extract_archive (void); void extract_finish (void); void fatal_exit (void) __attribute__ ((noreturn)); @@ -420,14 +454,21 @@ 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 struct stat current_stat; extern enum archive_format current_format; extern size_t recent_long_name_blocks; extern size_t recent_long_link_blocks; -void decode_header (union block *, struct stat *, - enum archive_format *, int); +void decode_header (union block *, struct tar_stat_info *, + enum archive_format *, int); #define STRINGIFY_BIGINT(i, b) \ stringify_uintmax_t_backwards ((uintmax_t) (i), (b) + UINTMAX_STRSIZE_BOUND) char *stringify_uintmax_t_backwards (uintmax_t, char *); @@ -455,7 +496,7 @@ uintmax_t uintmax_from_header (const char *, size_t); void list_archive (void); void print_for_mkdir (char *, int, mode_t); -void print_header (off_t); +void print_header (struct tar_stat_info *, off_t); void read_and (void (*) (void)); enum read_header read_header (bool); void skip_file (off_t); @@ -480,7 +521,7 @@ enum remove_option WANT_DIRECTORY_REMOVE_OPTION }; int remove_any_file (const char *, enum remove_option); -int maybe_backup_file (const char *, int); +bool maybe_backup_file (const char *, int); void undo_last_backup (void); int deref_stat (bool, char const *, struct stat *); @@ -495,6 +536,7 @@ void chmod_error_details (char const *, mode_t); void chown_error_details (char const *, uid_t, gid_t); void close_error (char const *); void close_warn (char const *); +void close_diag (char const *name); void exec_fatal (char const *) __attribute__ ((noreturn)); void link_error (char const *, char const *); void mkdir_error (char const *); @@ -503,21 +545,27 @@ void mknod_error (char const *); void open_error (char const *); void open_fatal (char const *) __attribute__ ((noreturn)); void open_warn (char const *); +void open_diag (char const *name); void read_error (char const *); void read_error_details (char const *, off_t, size_t); void read_fatal (char const *) __attribute__ ((noreturn)); -void read_fatal_details (char const *, off_t, size_t); +void read_fatal_details (char const *, off_t, size_t) __attribute__ ((noreturn)); void read_warn_details (char const *, off_t, size_t); +void read_diag_details (char const *name, off_t offset, size_t size); void readlink_error (char const *); void readlink_warn (char const *); +void readlink_diag (char const *name); void savedir_error (char const *); void savedir_warn (char const *); +void savedir_diag (char const *name); void seek_error (char const *); 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_error (char const *); void stat_warn (char const *); +void stat_diag (char const *name); void symlink_error (char const *, char const *); void truncate_error (char const *); void truncate_warn (char const *); @@ -525,7 +573,7 @@ void unlink_error (char const *); void utime_error (char const *); void waitpid_error (char const *); void write_error (char const *); -void write_error_details (char const *, ssize_t, size_t); +void write_error_details (char const *, size_t, size_t); void write_fatal (char const *) __attribute__ ((noreturn)); void write_fatal_details (char const *, ssize_t, size_t) __attribute__ ((noreturn)); @@ -537,14 +585,14 @@ void xpipe (int[2]); extern struct name *gnu_list_name; -void gid_to_gname (gid_t, char gname[GNAME_FIELD_SIZE]); -int gname_to_gid (char gname[GNAME_FIELD_SIZE], gid_t *); -void uid_to_uname (uid_t, char uname[UNAME_FIELD_SIZE]); -int uname_to_uid (char uname[UNAME_FIELD_SIZE], uid_t *); +void gid_to_gname (gid_t, char **gname); +int gname_to_gid (char const *, gid_t *); +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 (int, char *const *); +void name_init (void); void name_term (void); char *name_next (int); void name_close (void); @@ -558,6 +606,8 @@ char *name_from_list (void); void blank_name_list (void); char *new_name (const char *, const char *); char *safer_name_suffix (char const *, bool); +size_t stripped_prefix_len (char const *file_name, size_t num); +bool all_names_found (struct tar_stat_info *); bool excluded_name (char const *); @@ -566,13 +616,77 @@ bool is_avoided_name (char const *); bool contains_dot_dot (char const *); +#define ISFOUND(c) ((occurrence_option == 0) ? (c)->found_count : \ + (c)->found_count == occurrence_option) +#define WASFOUND(c) ((occurrence_option == 0) ? (c)->found_count : \ + (c)->found_count >= occurrence_option) + /* Module tar.c. */ +void usage (int); + int confirm (const char *, const char *); void request_stdin (const char *); +void tar_stat_init (struct tar_stat_info *st); +void tar_stat_destroy (struct tar_stat_info *st); +void usage (int) __attribute__ ((noreturn)); + /* Module update.c. */ extern char *output_start; void update_archive (void); + +/* Module xheader.c. */ + +void xheader_decode (struct tar_stat_info *); +void xheader_decode_global (void); +void xheader_store (char const *, struct tar_stat_info const *, void *); +void xheader_read (union block *, size_t); +void xheader_write (char type, char *name, struct xheader *xhdr); +void xheader_write_global (void); +void xheader_finish (struct xheader *); +void xheader_destroy (struct xheader *); +char *xheader_xhdr_name (struct tar_stat_info *st); +char *xheader_ghdr_name (void); +void xheader_write (char, char *, struct xheader *); +void xheader_write_global (void); +void xheader_set_option (char *string); + +/* Module system.c */ + +void sys_stat_nanoseconds (struct tar_stat_info *); +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_spawn_shell (void); +bool sys_compare_uid (struct stat *a, struct stat *b); +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); + +/* 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 *); +bool sparse_member_p (struct tar_stat_info *); +bool sparse_fixup_header (struct tar_stat_info *); +enum dump_status sparse_dump_file (int, struct tar_stat_info *); +enum dump_status sparse_extract_file (int, struct tar_stat_info *, off_t *); +enum dump_status sparse_skip_file (struct tar_stat_info *); +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);