Port to Solaris 10's treatment of unlinking directories.

[chaz/tar] / src / common.h

diff --git a/src/common.h b/src/common.h
index 21e4c557f2476c2a749c66c7b155c3f7d68eb048..ce11d659b1d5248e7d6ff3453af6c9c1b7e7d7e9 100644 (file)
--- 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
@@ -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 <quote.h>
 #include <safe-read.h>
 #include <timespec.h>
+#define obstack_chunk_alloc xmalloc
+#define obstack_chunk_free free
+#include <obstack.h>
 
 /* 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.  */
@@ -200,6 +199,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
@@ -270,6 +272,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.  */
@@ -335,6 +343,8 @@ GLOBAL bool seekable_archive;
 
 GLOBAL dev_t root_device;
 
+/* Unquote filenames */
+GLOBAL bool unquote_option;
 \f
 /* Declarations for each module.  */
 
@@ -431,7 +441,6 @@ void verify_volume (void);
 
 /* Module extract.c.  */
 
-extern bool we_are_root;
 void extr_init (void);
 void extract_archive (void);
 void extract_finish (void);
@@ -505,6 +514,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);
 
@@ -524,6 +534,14 @@ 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);
@@ -569,6 +587,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);
@@ -603,7 +622,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 *);
@@ -621,6 +639,7 @@ 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 *);
 
@@ -677,13 +696,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, ...);