From owner-svn-soc-all@FreeBSD.ORG Sun Jul 14 10:29:56 2013 Return-Path: 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 0D6976AB for ; Sun, 14 Jul 2013 10:29:56 +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 DA1F4C54 for ; Sun, 14 Jul 2013 10:29:55 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6EATtHY003479 for ; Sun, 14 Jul 2013 10:29:55 GMT (envelope-from dpl@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r6EATtqh003477 for svn-soc-all@FreeBSD.org; Sun, 14 Jul 2013 10:29:55 GMT (envelope-from dpl@FreeBSD.org) Date: Sun, 14 Jul 2013 10:29:55 GMT Message-Id: <201307141029.r6EATtqh003477@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: r254778 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Jul 2013 10:29:56 -0000 Author: dpl Date: Sun Jul 14 10:29:55 2013 New Revision: 254778 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=254778 Log: Changed to work on all the files, that are opened before. Modified: soc2013/dpl/head/contrib/xz/src/xz/list.c Modified: soc2013/dpl/head/contrib/xz/src/xz/list.c ============================================================================== --- soc2013/dpl/head/contrib/xz/src/xz/list.c Sun Jul 14 10:28:36 2013 (r254777) +++ soc2013/dpl/head/contrib/xz/src/xz/list.c Sun Jul 14 10:29:55 2013 (r254778) @@ -1057,57 +1057,45 @@ extern void -list_file(const char *filename) +list_file(file_pair pairs[], int files) { int i; - - if (opt_format != FORMAT_XZ && opt_format != FORMAT_AUTO) - message_fatal(_("--list works only on .xz files " - "(--format=xz or --format=auto)")); - - for ( i = 0; i < files; i++) { - - message_filename(filename); - - if (filename == stdin_filename) { - message_error(_("--list does not support reading from " - "standard input")); - continue; - } + xz_file_info xfi = XZ_FILE_INFO_INIT; // Unset opt_stdout so that io_open_src() won't accept special files. // Set opt_force so that io_open_src() will follow symlinks. opt_stdout = false; opt_force = true; - file_pair *pair = io_open_src(filename); - if (pair == NULL) - continue; - xz_file_info xfi = XZ_FILE_INFO_INIT; - if (!parse_indexes(&xfi, pair)) { - bool fail; - - // We have three main modes: - // - --robot, which has submodes if --verbose is specified - // once or twice - // - Normal --list without --verbose - // - --list with one or two --verbose - if (opt_robot) - fail = print_info_robot(&xfi, pair); - else if (message_verbosity_get() <= V_WARNING) - fail = print_info_basic(&xfi, pair); - else - fail = print_info_adv(&xfi, pair); - - // Update the totals that are displayed after all - // the individual files have been listed. Don't count - // broken files. - if (!fail) - update_totals(&xfi); - - lzma_index_end(xfi.idx, NULL); + for (i = 0; i < files; i++) { + if (pairs[i] == NULL) + continue; + + if (!parse_indexes(&xfi, pairs[i])) { + bool fail; + + // We have three main modes: + // - --robot, which has submodes if --verbose is specified + // once or twice + // - Normal --list without --verbose + // - --list with one or two --verbose + if (opt_robot) + fail = print_info_robot(&xfi, pairs[i]); + else if (message_verbosity_get() <= V_WARNING) + fail = print_info_basic(&xfi, pairs[i]); + else + fail = print_info_adv(&xfi, pairs[i]); + + // Update the totals that are displayed after all + // the individual files have been listed. Don't count + // broken files. + if (!fail) + update_totals(&xfi); + + lzma_index_end(xfi.idx, NULL); + } + + io_close(pairs[i], false); } - - io_close(pair, false); return; }