From owner-svn-soc-all@FreeBSD.ORG  Wed Jul 10 15:23:54 2013
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id A8ECBE5
 for <svn-soc-all@FreeBSD.org>; Wed, 10 Jul 2013 15:23:54 +0000 (UTC)
 (envelope-from dpl@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 by mx1.freebsd.org (Postfix) with ESMTP id 9B1B016D9
 for <svn-soc-all@FreeBSD.org>; Wed, 10 Jul 2013 15:23:54 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6AFNsLI004168
 for <svn-soc-all@FreeBSD.org>; Wed, 10 Jul 2013 15:23:54 GMT
 (envelope-from dpl@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r6AFNscj004163
 for svn-soc-all@FreeBSD.org; Wed, 10 Jul 2013 15:23:54 GMT
 (envelope-from dpl@FreeBSD.org)
Date: Wed, 10 Jul 2013 15:23:54 GMT
Message-Id: <201307101523.r6AFNscj004163@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 dpl@FreeBSD.org using -f
From: dpl@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r254568 - soc2013/dpl/head/contrib/xz/src/xz
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jul 2013 15:23:54 -0000

Author: dpl
Date: Wed Jul 10 15:23:54 2013
New Revision: 254568
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=254568

Log:
  A silly error got corrected.
  

Modified:
  soc2013/dpl/head/contrib/xz/src/xz/main.c

Modified: soc2013/dpl/head/contrib/xz/src/xz/main.c
==============================================================================
--- soc2013/dpl/head/contrib/xz/src/xz/main.c	Wed Jul 10 15:22:43 2013	(r254567)
+++ soc2013/dpl/head/contrib/xz/src/xz/main.c	Wed Jul 10 15:23:54 2013	(r254568)
@@ -210,10 +210,6 @@
 	void (*run)(const char *filename) = opt_mode == MODE_LIST
 			 ? &list_file : &coder_run;
 
-#if defined(CAPSICUM) //
-	cap_init();
-#endif
-
 	// Process the files given on the command line. Note that if no names
 	// were given, args_parse() gave us a fake "-" filename.
 	for (size_t i = 0; i < args.arg_count && !user_abort; ++i) {
@@ -246,11 +242,11 @@
 			// handling the special case of stdin.
 			args.arg_names[i] = (char *)stdin_filename;
 		}
-
-		// Do the actual compression or decompression.
-		(args.arg_names[i]);
 	}
 
+	// Do the actual compression or decompression.
+	run(args.arg_names);
+
 	// If --files or --files0 was used, process the filenames from the
 	// given file or stdin. Note that here we don't consider "-" to
 	// indicate stdin like we do with the command line arguments.