xsm: Drop trailing whitespace from build scripts
PATCH 1/1 xsm: Drop trailing whitespace from build scripts
---
CC: Daniel De Graaf <[email protected]>
--- xen/xsm/flask/policy/mkaccess_vector.sh | 26 +++++++++++++------------- xen/xsm/flask/policy/mkflask.sh | 32 ++++++++++++++++---------------- 2 files changed, 29 insertions(+), 29 deletions(-)
xen/xsm/flask/policy/mkaccess_vector.sh +13 -13
@@ -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;
xen/xsm/flask/policy/mkflask.sh +16 -16
@@ -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;
Signature · 1 line
2.11.0
Quoted 3 lines · Andrew Cooper
Signed-off-by Andrew Cooper <[email protected]>---
CC: Daniel De Graaf <[email protected]>
Since we've not heard anything from Daniel in quite a while, just in case:
Jan
Quoted 7 lines
-----Original Message-----
From: Xen-devel <[email protected]> On Behalf Of Jan Beulich
Sent: 29 June 2020 09:22
To: Andrew Cooper <[email protected]>
Cc: Xen-devel <[email protected]>; Daniel De Graaf <[email protected]>
Subject: Re: [PATCH] xsm: Drop trailing whitespace from build scripts
Quoted 9 lines
Quoted 3 lines · Andrew Cooper
Signed-off-by Andrew Cooper <[email protected]>---
CC: Daniel De Graaf <[email protected]>Since we've not heard anything from Daniel in quite a while, just in case:
Acked-by Jan Beulich <[email protected]>
This is pretty trivial cleanup so, if you want to put it in 4.14 consider it...
Quoted 2 lines
Jan
Quoted 11 lines · Paul Durrant
Quoted 11 lines
-----Original Message-----
From: Xen-devel <[email protected]> On Behalf Of Jan Beulich
Sent: 29 June 2020 09:22
To: Andrew Cooper <[email protected]>
Cc: Xen-devel <[email protected]>; Daniel De Graaf <[email protected]>
Subject: Re: [PATCH] xsm: Drop trailing whitespace from build scriptsQuoted 3 lines · Andrew Cooper
Signed-off-by Andrew Cooper <[email protected]>---
CC: Daniel De Graaf <[email protected]>
Quoted 7 lines
Quoted 4 lines
Since we've not heard anything from Daniel in quite a while, just in case:
Acked-by Jan Beulich <[email protected]>This is pretty trivial cleanup so, if you want to put it in 4.14 consider it...
Release-acked-by Paul Durrant <[email protected]>
Ok. In it goes.
~Andrew