From: Tim Kientzle <kientzle@gmail.com>
Date: Sun, 6 Jul 2008 09:43:03 +0000 (-0400)
Subject: Minor code reorg.
X-Git-Tag: v2.6.0~141
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0778e9b70e93e6fed2d51b734b882964b3f8bdd;p=thirdparty%2Flibarchive.git

Minor code reorg.

SVN-Revision: 151
---

diff --git a/cpio/cpio.c b/cpio/cpio.c
index 2f02a68fc..e758dffe3 100644
--- a/cpio/cpio.c
+++ b/cpio/cpio.c
@@ -111,12 +111,10 @@ main(int argc, char *argv[])
 	cpio->extract_flags |= ARCHIVE_EXTRACT_NO_OVERWRITE_NEWER;
 	cpio->extract_flags |= ARCHIVE_EXTRACT_SECURE_SYMLINKS;
 	cpio->extract_flags |= ARCHIVE_EXTRACT_SECURE_NODOTDOT;
-	/* TODO: If run by root, set owner as well. */
-	cpio->bytes_per_block = 512;
-	cpio->filename = NULL;
-
 	if (geteuid() == 0)
 		cpio->extract_flags |= ARCHIVE_EXTRACT_OWNER;
+	cpio->bytes_per_block = 512;
+	cpio->filename = NULL;
 
 	while ((opt = cpio_getopt(cpio)) != -1) {
 		switch (opt) {