[Cmake-commits] CMake branch, next, updated. v3.2.1-1641-g2174a35

[Nils Gladitz]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  2174a358603a43337be5e68408f19a2106555108 (commit)
       via  8f774e92446de9ff59935b391fcd0c1c0325be22 (commit)
      from  21453f911565fe00671107b49e0193c066d6ec49 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2174a358603a43337be5e68408f19a2106555108
commit 2174a358603a43337be5e68408f19a2106555108
Merge: 21453f9 8f774e9
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Wed Apr 8 13:59:02 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 8 13:59:02 2015 -0400

    Merge topic 'tar-write-format' into next
    
    8f774e92 libarchive: Use base-256 encoding for UID/GID like GNU tar does


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f774e92446de9ff59935b391fcd0c1c0325be22
commit 8f774e92446de9ff59935b391fcd0c1c0325be22
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Wed Apr 8 19:58:08 2015 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Wed Apr 8 19:58:08 2015 +0200

    libarchive: Use base-256 encoding for UID/GID like GNU tar does

diff --git a/Utilities/cmlibarchive/libarchive/archive_write_set_format_gnutar.c b/Utilities/cmlibarchive/libarchive/archive_write_set_format_gnutar.c
index 13942c1..8f5400c 100644
--- a/Utilities/cmlibarchive/libarchive/archive_write_set_format_gnutar.c
+++ b/Utilities/cmlibarchive/libarchive/archive_write_set_format_gnutar.c
@@ -644,18 +644,16 @@ archive_format_gnutar_header(struct archive_write *a, char h[512],
 	format_octal(archive_entry_mode(entry) & 07777,
 	    h + GNUTAR_mode_offset, GNUTAR_mode_size);
 
-	/* TODO: How does GNU tar handle large UIDs? */
-	if (format_octal(archive_entry_uid(entry),
-	    h + GNUTAR_uid_offset, GNUTAR_uid_size)) {
+	if (format_number(archive_entry_uid(entry), h + GNUTAR_uid_offset,
+		GNUTAR_uid_size, GNUTAR_uid_max_size)) {
 		archive_set_error(&a->archive, ERANGE,
 		    "Numeric user ID %jd too large",
 		    (intmax_t)archive_entry_uid(entry));
 		ret = ARCHIVE_FAILED;
 	}
 
-	/* TODO: How does GNU tar handle large GIDs? */
-	if (format_octal(archive_entry_gid(entry),
-	    h + GNUTAR_gid_offset, GNUTAR_gid_size)) {
+	if (format_number(archive_entry_gid(entry), h + GNUTAR_gid_offset, 
+		GNUTAR_gid_size, GNUTAR_gid_max_size)) {
 		archive_set_error(&a->archive, ERANGE,
 		    "Numeric group ID %jd too large",
 		    (intmax_t)archive_entry_gid(entry));

-----------------------------------------------------------------------

Summary of changes:
 .../libarchive/archive_write_set_format_gnutar.c             |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake