X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fcommon.h;h=79da31dfb0c43ddc39f48670a417902d1ea1ee6c;hb=5c35fdb275b519373e6eb34621d956d09a52bf31;hp=bdeaa0d4a9bbe425450c9632e6b75980d435f43b;hpb=0f9b299745d3dcccb8948a54e5b89a44c5902ca7;p=chaz%2Ftar diff --git a/src/common.h b/src/common.h index bdeaa0d..79da31d 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" @@ -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 @@ -47,31 +50,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 @@ -81,6 +63,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 @@ -158,9 +145,6 @@ GLOBAL struct exclude *excluded; /* Exclude directories containing a cache directory tag. */ GLOBAL bool exclude_caches_option; -/* Specified file containing names to work on. */ -GLOBAL const char *files_from_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. */ GLOBAL gid_t group_option; @@ -196,6 +180,9 @@ GLOBAL const char *listed_incremental_option; /* Specified mode change string. */ GLOBAL struct mode_change *mode_option; +/* Initial umask, if needed for mode change string. */ +GLOBAL mode_t initial_umask; + GLOBAL bool multi_volume_option; /* The same variable holds the time, whether mtime or ctime. Just fake a @@ -266,6 +253,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. */ @@ -331,6 +324,8 @@ GLOBAL bool seekable_archive; GLOBAL dev_t root_device; +/* Unquote filenames */ +GLOBAL bool unquote_option; /* Declarations for each module. */ @@ -427,11 +422,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. */ @@ -471,9 +464,6 @@ 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); #define GID_FROM_HEADER(where) gid_from_header (where, sizeof (where)) @@ -529,7 +519,7 @@ enum remove_option (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 + WANT_DIRECTORY_REMOVE_OPTION }; int remove_any_file (const char *, enum remove_option); bool maybe_backup_file (const char *, int); @@ -540,50 +530,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) @@ -608,7 +561,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 *); @@ -687,6 +639,8 @@ pid_t sys_child_open_for_compress (void); pid_t sys_child_open_for_uncompress (void); 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); /* Module compare.c */ void report_difference (struct tar_stat_info *st, const char *message, ...);