X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fcommon.h;h=70a925c912d7a8f073c4f7bc6d630d181cbed263;hb=d659cbaccdc1f3279c49107cf15f15a639738529;hp=152ff180ed0e2e7aa5cb44d10ac865ede664243a;hpb=4e4e8c57fd19b70aed0b38aa59cb97f566887123;p=chaz%2Ftar diff --git a/src/common.h b/src/common.h index 152ff18..70a925c 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 Free Software Foundation, Inc. + 2003, 2004, 2005 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 @@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., - 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* Declare the GNU tar archive format. */ #include "tar.h" @@ -29,20 +29,11 @@ #define UNAME_FIELD_SIZE 32 #define GNAME_FIELD_SIZE 32 -/* FIXME */ -#define MAXOCTAL11 017777777777L -#define MAXOCTAL7 07777777 - /* 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. @@ -52,31 +43,10 @@ # define GLOBAL extern #endif -/* Exit status for GNU tar. Let's try to keep this list as simple as - possible. -d option strongly invites a status different for unequal - comparison and other errors. */ -GLOBAL int exit_status; - -#define TAREXIT_SUCCESS 0 -#define TAREXIT_DIFFERS 1 -#define TAREXIT_FAILURE 2 - -/* Both WARN and ERROR write a message on stderr and continue processing, - however ERROR manages so tar will exit unsuccessfully. FATAL_ERROR - writes a message on stderr and aborts immediately, with another message - line telling so. USAGE_ERROR works like FATAL_ERROR except that the - other message line suggests trying --help. All four macros accept a - single argument of the form ((0, errno, _("FORMAT"), Args...)). errno - is zero when the error is not being detected by the system. */ - -#define WARN(Args) \ - error Args -#define ERROR(Args) \ - (error Args, exit_status = TAREXIT_FAILURE) -#define FATAL_ERROR(Args) \ - (error Args, fatal_exit ()) -#define USAGE_ERROR(Args) \ - (error Args, usage (TAREXIT_FAILURE)) +#define TAREXIT_SUCCESS PAXEXIT_SUCCESS +#define TAREXIT_DIFFERS PAXEXIT_DIFFERS +#define TAREXIT_FAILURE PAXEXIT_FAILURE + #include "arith.h" #include @@ -86,6 +56,11 @@ GLOBAL int exit_status; #include #include #include +#define obstack_chunk_alloc xmalloc +#define obstack_chunk_free free +#include + +#include /* Log base 2 of common values. */ #define LG_8 3 @@ -160,10 +135,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. */ @@ -200,11 +173,10 @@ GLOBAL const char *listed_incremental_option; /* Specified mode change string. */ GLOBAL struct mode_change *mode_option; -GLOBAL bool multi_volume_option; +/* Initial umask, if needed for mode change string. */ +GLOBAL mode_t initial_umask; -/* 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 +GLOBAL bool multi_volume_option; /* Specified threshold date and time. Files having an older time stamp do not get archived (also see after_date_option above). */ @@ -216,9 +188,14 @@ GLOBAL struct timespec newer_mtime_option; /* 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)) + timespec_lt (get_stat_##m##time (&st), newer_mtime_option) + +/* Return true if A < B. */ +static inline +timespec_lt (struct timespec a, struct timespec b) +{ + return a.tv_sec < b.tv_sec || (a.tv_sec == b.tv_sec && a.tv_nsec < b.tv_nsec); +} /* Zero if there is no recursion, otherwise FNM_LEADING_DIR. */ GLOBAL int recursion_option; @@ -270,6 +247,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. */ @@ -292,12 +275,7 @@ GLOBAL int archive; GLOBAL bool dev_null_output; /* Timestamp for when we started execution. */ -#if HAVE_CLOCK_GETTIME - GLOBAL struct timespec start_timespec; -# define start_time (start_timespec.tv_sec) -#else - GLOBAL time_t start_time; -#endif +GLOBAL struct timespec start_time; GLOBAL struct tar_stat_info current_stat_info; @@ -335,6 +313,8 @@ GLOBAL bool seekable_archive; GLOBAL dev_t root_device; +/* Unquote filenames */ +GLOBAL bool unquote_option; /* Declarations for each module. */ @@ -419,7 +399,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); +void string_to_chars (char const *, char *, size_t); /* Module diffarch.c. */ @@ -431,11 +411,9 @@ void verify_volume (void); /* Module extract.c. */ -extern bool we_are_root; void extr_init (void); void extract_archive (void); void extract_finish (void); -void fatal_exit (void) __attribute__ ((noreturn)); /* Module delete.c. */ @@ -475,10 +453,7 @@ extern size_t recent_long_link_blocks; 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 *); -char const *tartime (time_t); +char const *tartime (struct timespec, bool); #define GID_FROM_HEADER(where) gid_from_header (where, sizeof (where)) #define MAJOR_FROM_HEADER(where) major_from_header (where, sizeof (where)) @@ -505,6 +480,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); @@ -518,12 +494,22 @@ void assign_string (char **, const char *); char *quote_copy_string (const char *); int unquote_string (char *); +void code_ns_fraction (int, char *); + size_t dot_dot_prefix_len (char const *); enum remove_option { ORDINARY_REMOVE_OPTION, RECURSIVE_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); @@ -535,50 +521,13 @@ int deref_stat (bool, char const *, struct stat *); int chdir_arg (char const *); void chdir_do (int); -void decode_mode (mode_t, char *); - -void chdir_fatal (char const *) __attribute__ ((noreturn)); -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 *); -void mkfifo_error (char const *); -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) __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 *); -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 *, size_t, size_t); void write_fatal (char const *) __attribute__ ((noreturn)); void write_fatal_details (char const *, ssize_t, size_t) @@ -603,7 +552,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 *); @@ -613,7 +561,6 @@ struct name *name_scan (const char *); 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 *); @@ -625,8 +572,6 @@ 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 : \ @@ -667,7 +612,6 @@ 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); @@ -678,13 +622,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, ...); @@ -701,3 +644,120 @@ 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); + + +/* FIXME: The following should get moved into gnulib. */ + +static inline struct timespec +get_stat_atime (struct stat const *st) +{ +#if defined HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC + return st->st_atim; +#elif defined HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC + return st->st_atimespec; +#else + struct timespec t; + t.tv_sec = st->st_atime; +# if defined HAVE_STRUCT_STAT_ST_ATIMENSEC + t.tv_nsec = st->stat.st_atimensec; +# elif defined HAVE_STRUCT_STAT_ST_SPARE1 + t.tv_nsec = st->stat.st_spare1 * 1000; +# else + t.tv_nsec = 0; +# endif + return t; +#endif +} + +static inline struct timespec +get_stat_ctime (struct stat const *st) +{ +#if defined HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC + return st->st_ctim; +#elif defined HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC + return st->st_ctimespec; +#else + struct timespec t; + t.tv_sec = st->st_ctime; +# if defined HAVE_STRUCT_STAT_ST_ATIMENSEC + t.tv_nsec = st->stat.st_ctimensec; +# elif defined HAVE_STRUCT_STAT_ST_SPARE1 + t.tv_nsec = st->stat.st_spare1 * 1000; +# else + t.tv_nsec = 0; +# endif + return t; +#endif +} + +static inline struct timespec +get_stat_mtime (struct stat const *st) +{ +#if defined HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC + return st->st_mtim; +#elif defined HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC + return st->st_mtimespec; +#else + struct timespec t; + t.tv_sec = st->st_mtime; +# if defined HAVE_STRUCT_STAT_ST_ATIMENSEC + t.tv_nsec = st->stat.st_mtimensec; +# elif defined HAVE_STRUCT_STAT_ST_SPARE1 + t.tv_nsec = st->stat.st_spare1 * 1000; +# else + t.tv_nsec = 0; +# endif + return t; +#endif +} + +static inline void +set_stat_atime (struct stat *st, struct timespec t) +{ +#if defined HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC + st->st_atim = t; +#elif defined HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC + st->st_atimespec = t; +#else + st->st_atime = t.tv_sec; +# if defined HAVE_STRUCT_STAT_ST_ATIMENSEC + st->stat.st_atimensec = t.tv_nsec; +# elif defined HAVE_STRUCT_STAT_ST_SPARE1 + st->stat.st_spare1 = t.tv_nsec / 1000; +# endif +#endif +} + +static inline void +set_stat_ctime (struct stat *st, struct timespec t) +{ +#if defined HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC + st->st_ctim = t; +#elif defined HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC + st->st_ctimespec = t; +#else + st->st_ctime = t.tv_sec; +# if defined HAVE_STRUCT_STAT_ST_ATIMENSEC + st->stat.st_ctimensec = t.tv_nsec; +# elif defined HAVE_STRUCT_STAT_ST_SPARE1 + st->stat.st_spare1 = t.tv_nsec / 1000; +# endif +#endif +} + +static inline void +set_stat_mtime (struct stat *st, struct timespec t) +{ +#if defined HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC + st->st_mtim = t; +#elif defined HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC + st->st_mtimespec = t; +#else + st->st_mtime = t.tv_sec; +# if defined HAVE_STRUCT_STAT_ST_ATIMENSEC + st->stat.st_mtimensec = t.tv_nsec; +# elif defined HAVE_STRUCT_STAT_ST_SPARE1 + st->stat.st_spare1 = t.tv_nsec / 1000; +# endif +#endif +}