Rebase libarchive to 2.8.0

1 files changed, 0 insertions, 112 deletions

diff --git a/libarchive/libarchive-2.7.1/cpio/test/test_owner_parse.c b/libarchive/libarchive-2.7.1/cpio/test/test_owner_parse.c
deleted file mode 100644
index 1e9434f..0000000
--- a/libarchive/libarchive-2.7.1/cpio/test/test_owner_parse.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*-
- * Copyright (c) 2003-2007 Tim Kientzle
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include "test.h"
-__FBSDID("$FreeBSD$");
-
-#include "../cpio.h"
-
-#if defined(__CYGWIN__)
-/* On cygwin, the Administrator user most likely exists (unless
- * it has been renamed or is in a non-English localization), but
- * its primary group membership depends on how the user set up
- * their /etc/passwd. Likely values are 513 (None), 545 (Users),
- * or 544 (Administrators). Just check for one of those...
- * TODO: Handle non-English localizations...e.g. French 'Administrateur'
- *       Use CreateWellKnownSID() and LookupAccountName()?
- */
-#define ROOT "Administrator"
-#define ROOT_UID 500
-#define ROOT_GID1 513
-#define ROOT_GID2 545
-#define ROOT_GID3 544
-#else
-#define ROOT "root"
-#define ROOT_UID 0
-#define ROOT_GID 0
-#endif
-
-
-DEFINE_TEST(test_owner_parse)
-{
-#if defined(_WIN32) && !defined(__CYGWIN__)
-	/* TODO: Does this need cygwin style handling of uid/gid ? */
-	skipping("Windows cannot handle uid/gid as UNIX like system");
-#else
-	int uid, gid;
-
-	cpio_progname = "Ignore this message";
-
-	assertEqualInt(0, owner_parse(ROOT, &uid, &gid));
-	assertEqualInt(ROOT_UID, uid);
-	assertEqualInt(-1, gid);
-
-
-	assertEqualInt(0, owner_parse(ROOT ":", &uid, &gid));
-	assertEqualInt(ROOT_UID, uid);
-#if defined(__CYGWIN__)
-	{
-		int gidIsOneOf = (ROOT_GID1 == gid)
-			|| (ROOT_GID2 == gid)
-			|| (ROOT_GID3 == gid);
-		assertEqualInt(1, gidIsOneOf);
-	}
-#else
-	assertEqualInt(ROOT_GID, gid);
-#endif
-
-	assertEqualInt(0, owner_parse(ROOT ".", &uid, &gid));
-	assertEqualInt(ROOT_UID, uid);
-#if defined(__CYGWIN__)
-	{
-		int gidIsOneOf = (ROOT_GID1 == gid)
-			|| (ROOT_GID2 == gid)
-			|| (ROOT_GID3 == gid);
-		assertEqualInt(1, gidIsOneOf);
-	}
-#else
-	assertEqualInt(ROOT_GID, gid);
-#endif
-
-	/*
-	 * TODO: Lookup current user/group name, build strings and
-	 * use those to verify username/groupname lookups for ordinary
-	 * users.
-	 */
-
-	/*
-	 * TODO: Rework owner_parse to either return a char * pointing
-	 * to an error message or accept a function pointer to an
-	 * error-reporting routine so that the following tests don't
-	 * generate any output.
-	 *
-	 * Alternatively, redirect stderr temporarily to suppress the output.
-	 */
-
-	assertEqualInt(1, owner_parse(":nonexistentgroup", &uid, &gid));
-	assertEqualInt(1, owner_parse(ROOT ":nonexistentgroup", &uid, &gid));
-	assertEqualInt(1,
-	    owner_parse("nonexistentuser:nonexistentgroup", &uid, &gid));
-#endif
-}