From patchwork Fri Jun 26 17:02:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 11628089 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 219E013B4 for ; Fri, 26 Jun 2020 17:03:47 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 07724206BE for ; Fri, 26 Jun 2020 17:03:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 07724206BE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jorkb-0006ep-9s; Fri, 26 Jun 2020 17:02:53 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jorka-0006ei-Bn for xen-devel@lists.xenproject.org; Fri, 26 Jun 2020 17:02:52 +0000 X-Inumbo-ID: de75f3a4-b7ce-11ea-82ea-12813bfff9fa Received: from esa3.hc3370-68.iphmx.com (unknown [216.71.145.155]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id de75f3a4-b7ce-11ea-82ea-12813bfff9fa; Fri, 26 Jun 2020 17:02:51 +0000 (UTC) Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: xvmKTUa21lqY9QLcL0hMCRDF2atr988/LpDLTxyQP2S0KJBFFFSQHLGCCcCWwoQUdlUXWEaEdW MveqOi/X307eP8TbVINFEE8SnYySjvUokFoxmeo5OpQ/v1jj3xllYDlYvCXzcK7rx5Viq6JRQR ce8BZcedU6p+6E0kLA10/bDCb2Jb5ah9tfGu0iDDp1Saljt4CYGzYOWvBICQcP91z85/85Lchz dNdyroIO27YHygVNf+/JmBcW7vOwUK949Y/zyp3KZ92B8RfyOQcjEJI+GMyetE2afSz8SPjgCL i84= X-SBRS: 2.7 X-MesageID: 21041803 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.75,284,1589256000"; d="scan'208";a="21041803" From: Andrew Cooper To: Xen-devel Subject: [PATCH] xsm: Drop trailing whitespace from build scripts Date: Fri, 26 Jun 2020 18:02:21 +0100 Message-ID: <20200626170221.28534-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Andrew Cooper , Daniel De Graaf Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- CC: Daniel De Graaf --- xen/xsm/flask/policy/mkaccess_vector.sh | 26 +++++++++++++------------- xen/xsm/flask/policy/mkflask.sh | 32 ++++++++++++++++---------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/xen/xsm/flask/policy/mkaccess_vector.sh b/xen/xsm/flask/policy/mkaccess_vector.sh index 7fa4aaf638..942ede4713 100755 --- a/xen/xsm/flask/policy/mkaccess_vector.sh +++ b/xen/xsm/flask/policy/mkaccess_vector.sh @@ -22,7 +22,7 @@ BEGIN { printf("/* This file is automatically generated. Do not edit. */\n") > avpermfile; ; } -/^[ \t]*#/ { +/^[ \t]*#/ { next; } $1 == "class" { @@ -30,7 +30,7 @@ $1 == "class" { nextstate != "CLASS_OR_CLASS-OPENBRACKET") { printf("Parse error: Unexpected class definition on line %d\n", NR); - next; + next; } tclass = $2; @@ -39,7 +39,7 @@ $1 == "class" { { printf("Duplicate access vector definition for %s on line %d\n", tclass, NR); next; - } + } av_defined[tclass] = 1; permission = 0; @@ -47,7 +47,7 @@ $1 == "class" { nextstate = "INHERITS_OR_CLASS-OPENBRACKET"; next; } -$1 == "{" { +$1 == "{" { if (nextstate != "INHERITS_OR_CLASS-OPENBRACKET" && nextstate != "CLASS_OR_CLASS-OPENBRACKET" && nextstate != "COMMON-OPENBRACKET") @@ -69,7 +69,7 @@ $1 == "{" { if (nextstate != "COMMON-CLOSEBRACKET" && nextstate != "CLASS-CLOSEBRACKET") { - printf("Parse error: Unexpected symbol %s on line %d\n", $1, NR); + printf("Parse error: Unexpected symbol %s on line %d\n", $1, NR); next; } @@ -83,7 +83,7 @@ $1 == "{" { common_perms[common_name,$1] = permission; - printf("#define COMMON_%s__%s", toupper(common_name), toupper($1)) > outfile; + printf("#define COMMON_%s__%s", toupper(common_name), toupper($1)) > outfile; printf(" S_(\"%s\")\n", $1) > cpermfile; } @@ -96,23 +96,23 @@ $1 == "{" { } av_perms[tclass,$1] = permission; - - printf("#define %s__%s", toupper(tclass), toupper($1)) > outfile; - printf(" S_(SECCLASS_%s, %s__%s, \"%s\")\n", toupper(tclass), toupper(tclass), toupper($1), $1) > avpermfile; + printf("#define %s__%s", toupper(tclass), toupper($1)) > outfile; + + printf(" S_(SECCLASS_%s, %s__%s, \"%s\")\n", toupper(tclass), toupper(tclass), toupper($1), $1) > avpermfile; } spaces = 40 - (length($1) + length(tclass)); if (spaces < 1) spaces = 1; - for (i = 0; i < spaces; i++) - printf(" ") > outfile; + for (i = 0; i < spaces; i++) + printf(" ") > outfile; printf("(1UL << %u)\n", permission) > outfile; permission = permission + 1; } $1 == "}" { - if (nextstate != "CLASS-CLOSEBRACKET" && + if (nextstate != "CLASS-CLOSEBRACKET" && nextstate != "COMMON-CLOSEBRACKET") { printf("Parse error: Unexpected } on line %d\n", NR); @@ -122,7 +122,7 @@ $1 == "}" { if (nextstate == "COMMON-CLOSEBRACKET") { common_base[common_name] = permission; - printf("TE_(common_%s_perm_to_string)\n\n", common_name) > cpermfile; + printf("TE_(common_%s_perm_to_string)\n\n", common_name) > cpermfile; } printf("\n") > outfile; diff --git a/xen/xsm/flask/policy/mkflask.sh b/xen/xsm/flask/policy/mkflask.sh index 989a323b80..591ce832a1 100755 --- a/xen/xsm/flask/policy/mkflask.sh +++ b/xen/xsm/flask/policy/mkflask.sh @@ -37,51 +37,51 @@ BEGIN { printf("static char *initial_sid_to_string[] =\n{\n") > debugfile2; printf(" \"null\",\n") > debugfile2; } -/^[ \t]*#/ { +/^[ \t]*#/ { next; } -$1 == "class" { +$1 == "class" { if (nextstate != "CLASS") { printf("Parse error: Unexpected class definition on line %d\n", NR); - next; + next; } if ($2 in class_found) { printf("Duplicate class definition for %s on line %d.\n", $2, NR); next; - } + } class_found[$2] = 1; class_value++; printf("#define SECCLASS_%s", toupper($2)) > outfile; - for (i = 0; i < 40 - length($2); i++) - printf(" ") > outfile; - printf("%d\n", class_value) > outfile; + for (i = 0; i < 40 - length($2); i++) + printf(" ") > outfile; + printf("%d\n", class_value) > outfile; printf(" S_(\"%s\")\n", $2) > debugfile; } -$1 == "sid" { +$1 == "sid" { if (nextstate == "CLASS") { nextstate = "SID"; - printf("\n/*\n * Security identifier indices for initial entities\n */\n") > outfile; + printf("\n/*\n * Security identifier indices for initial entities\n */\n") > outfile; } if ($2 in sid_found) { printf("Duplicate SID definition for %s on line %d.\n", $2, NR); next; - } + } sid_found[$2] = 1; sid_value++; printf("#define SECINITSID_%s", toupper($2)) > outfile; - for (i = 0; i < 37 - length($2); i++) - printf(" ") > outfile; - printf("%d\n", sid_value) > outfile; + for (i = 0; i < 37 - length($2); i++) + printf(" ") > outfile; + printf("%d\n", sid_value) > outfile; printf(" \"%s\",\n", $2) > debugfile2; } END { @@ -89,9 +89,9 @@ END { printf("Parse error: Unexpected end of file\n"); printf("\n#define SECINITSID_NUM") > outfile; - for (i = 0; i < 34; i++) - printf(" ") > outfile; - printf("%d\n", sid_value) > outfile; + for (i = 0; i < 34; i++) + printf(" ") > outfile; + printf("%d\n", sid_value) > outfile; printf("\n#endif /* __XEN__ || __XEN_TOOLS__ */\n") > outfile; printf("\n#endif\n") > outfile; printf("};\n\n") > debugfile2;