mirrors/tar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(to_chars_subst): Update comment regarding OLDGNU

Browse Source 
vs. GNU format differences.
(mode_to_chars): Treat OLDGNU_FORMAT same as GNU_FORMAT. Fixes bug
reported by TAMUKI Shoichi <tamuki@linet.gr.jp>, which caused
equivalent `tar cf ...' and `tar rf ...' commands to produce
different archives.
This commit is contained in:
Sergey Poznyakoff
2006-07-24 09:13:21 +00:00
parent 7110641821
commit f4e4adea80
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/create.c
View File

@@ -152,8 +152,13 @@ to_chars_subst (int negative, int gnu_format, uintmax_t value, size_t valsize,
{ {
int negsub; int negsub;
uintmax_t sub = substitute (&negsub) & maxval; uintmax_t sub = substitute (&negsub) & maxval;
/* FIXME: This is the only place where GNU_FORMAT differs from /* NOTE: This is one of the few places where GNU_FORMAT differs from
OLDGNU_FORMAT. Apart from this they are completely identical. */ OLDGNU_FORMAT. The actual differences are:
1. In OLDGNU_FORMAT all strings in a tar header end in \0
2. Incremental archives use oldgnu_header.
Apart from this they are completely identical. */
uintmax_t s = (negsub &= archive_format == GNU_FORMAT) ? - sub : sub; uintmax_t s = (negsub &= archive_format == GNU_FORMAT) ? - sub : sub;
char subbuf[UINTMAX_STRSIZE_BOUND + 1]; char subbuf[UINTMAX_STRSIZE_BOUND + 1];
char *sub_string = STRINGIFY_BIGINT (s, subbuf + 1); char *sub_string = STRINGIFY_BIGINT (s, subbuf + 1);
@@ -291,7 +296,8 @@ mode_to_chars (mode_t v, char *p, size_t s)
&& S_IROTH == TOREAD && S_IWOTH == TOWRITE && S_IXOTH == TOEXEC && S_IROTH == TOREAD && S_IWOTH == TOWRITE && S_IXOTH == TOEXEC
&& archive_format != POSIX_FORMAT && archive_format != POSIX_FORMAT
&& archive_format != USTAR_FORMAT && archive_format != USTAR_FORMAT
&& archive_format != GNU_FORMAT) && archive_format != GNU_FORMAT
&& archive_format != OLDGNU_FORMAT)
{ {
negative = v < 0; negative = v < 0;
u = v; u = v;