X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fcommon.h;h=9e1ec68fb00e0b76699fc6d0d22aa62c7663f051;hb=07286647fb7446a62e8690675797ba7426b0758b;hp=7bdd84fc8d075a7351ada116d9b3cead783f58ce;hpb=6f12dbc264bf88ad3ceb1930b046eba9ba35d74b;p=chaz%2Ftar

diff --git a/src/common.h b/src/common.h
index 7bdd84f..9e1ec68 100644
--- a/src/common.h
+++ b/src/common.h
@@ -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.  */
 
@@ -224,6 +230,10 @@ GLOBAL int same_owner_option;
 /* If positive, preserve permissions when extracting.  */
 GLOBAL int same_permissions_option;
 
+/* When set, strip the given number of path elements from the file name
+   before extracting */
+GLOBAL size_t strip_path_elements;
+
 GLOBAL bool show_omitted_dirs_option;
 
 GLOBAL bool sparse_option;
@@ -358,6 +368,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);
@@ -368,6 +380,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.  */
 
@@ -411,8 +424,9 @@ enum read_header
 
 struct xheader
 {
-  int nblocks;
-  union block *blocks;
+  struct obstack *stk;
+  size_t size;
+  char *buffer;
 };
 
 GLOBAL struct xheader extended_header;
@@ -532,10 +546,10 @@ 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 *gname, gid_t *);
+void uid_to_uname (uid_t, char **uname);
+int uname_to_uid (char *uname, uid_t *);
 
 void init_names (void);
 void name_add (const char *);
@@ -553,6 +567,7 @@ 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_path_len (char const *file_name, size_t num);
 
 bool excluded_name (char const *);
 
@@ -565,9 +580,18 @@ bool contains_dot_dot (char const *);
 
 int confirm (const char *, const char *);
 void request_stdin (const char *);
+void destroy_stat (struct tar_stat_info *);
 
 /* Module update.c.  */
 
 extern char *output_start;
 
 void update_archive (void);
+
+/* Module xheader.c.  */
+
+void xheader_decode (struct tar_stat_info *);
+void xheader_store (char const *, struct tar_stat_info const *);
+void xheader_read (union block *, size_t);
+void xheader_finish (struct xheader *);
+void xheader_destroy (struct xheader *);