From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 945E01393EA for ; Tue, 8 Apr 2014 16:02:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 23250E0BFB; Tue, 8 Apr 2014 16:02:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1D87CE0B73 for ; Tue, 8 Apr 2014 16:02:02 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 45C2C33FFCA for ; Tue, 8 Apr 2014 16:02:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 12CD6188C9 for ; Tue, 8 Apr 2014 16:02:00 +0000 (UTC) From: "Sven Vermeulen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Vermeulen" Message-ID: <1396970450.304ec5224b39f6d7ac2c731bd9b4c0fd4f5c0af8.swift@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: support/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: support/fc_sort.c X-VCS-Directories: support/ X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: 304ec5224b39f6d7ac2c731bd9b4c0fd4f5c0af8 X-VCS-Branch: master Date: Tue, 8 Apr 2014 16:02:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0ac1355b-999b-465e-804b-d46c016b8337 X-Archives-Hash: cc74bf4bec9d0181fd3e4b14d4467e68 commit: 304ec5224b39f6d7ac2c731bd9b4c0fd4f5c0af8 Author: Nicolas Iooss m4x org> AuthorDate: Sun Mar 23 21:01:39 2014 +0000 Commit: Sven Vermeulen gentoo org> CommitDate: Tue Apr 8 15:20:50 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=304ec522 fc_sort: make outfile argument optional When working on fc_sort to try to understand why using /usr/s?bin/... file contexts has been reported not to work properly [1], I found it frustrating not to be able to do "tmp/fc_sort my_filecontexts.fc" and see the result printed on the screen. This patch implements this behavior by making optional the second argument of fc_sort. [1] commit 36e2216f8 of contrib repository, http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=36e2216f82192660d063012e69281f27ba20864b --- support/fc_sort.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/support/fc_sort.c b/support/fc_sort.c index 5aed783..6dc59af 100644 --- a/support/fc_sort.c +++ b/support/fc_sort.c @@ -328,13 +328,13 @@ int main(int argc, char *argv[]) /* Check for the correct number of command line arguments. */ - if (argc != 3) { - fprintf(stderr, "Usage: %s \n",argv[0]); + if (argc < 2 || argc > 3) { + fprintf(stderr, "Usage: %s []\n",argv[0]); return 1; } input_name = argv[1]; - output_name = argv[2]; + output_name = (argc >= 3) ? argv[2] : NULL; i = j = lines = 0; @@ -526,9 +526,13 @@ int main(int argc, char *argv[]) fc_merge_sort(master); /* Open the output file. */ - if (!(out_file = fopen(output_name, "w"))) { - printf("Error: failure opening output file for write.\n"); - return -1; + if (output_name) { + if (!(out_file = fopen(output_name, "w"))) { + printf("Error: failure opening output file for write.\n"); + return -1; + } + } else { + out_file = stdout; } /* Output the sorted file_context linked list to the output file. */ @@ -555,7 +559,9 @@ int main(int argc, char *argv[]) } free(master); - fclose(out_file); + if (output_name) { + fclose(out_file); + } return 0; }