Reverted changes

[chaz/tar] / src / common.h

diff --git a/src/common.h b/src/common.h
index bdeaa0d4a9bbe425450c9632e6b75980d435f43b..d1815ed41f619f5cef87220e69973353312f882e 100644 (file)
--- 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
@@ -81,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
@@ -158,9 +164,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;
@@ -266,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.  */
@@ -331,6 +340,8 @@ GLOBAL bool seekable_archive;
 
 GLOBAL dev_t root_device;
 
+/* Unquote filenames */
+GLOBAL bool unquote_option;
 \f
 /* Declarations for each module.  */
 
@@ -574,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);
@@ -608,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 *);
@@ -687,6 +698,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, ...);