Skip to content

Commit

Permalink
xsm: Drop trailing whitespace from build scripts
Browse files Browse the repository at this point in the history 
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
Release-acked-by: Paul Durrant <paul@xen.org>
  • Loading branch information
@andyhhp
andyhhp committed Jun 29, 2020
1 parent d476440 commit da53345
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 29 deletions.
26 changes: 13 additions & 13 deletions xen/xsm/flask/policy/mkaccess_vector.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ BEGIN {
printf("/* This file is automatically generated. Do not edit. */\n") > avpermfile;
;
}
/^[ \t]*#/ {
/^[ \t]*#/ {
next;
}
$1 == "class" {
if (nextstate != "COMMON_OR_AV" &&
nextstate != "CLASS_OR_CLASS-OPENBRACKET")
{
printf("Parse error: Unexpected class definition on line %d\n", NR);
next;
next;
}
tclass = $2;
Expand All @@ -39,15 +39,15 @@ $1 == "class" {
{
printf("Duplicate access vector definition for %s on line %d\n", tclass, NR);
next;
}
}
av_defined[tclass] = 1;
permission = 0;
nextstate = "INHERITS_OR_CLASS-OPENBRACKET";
next;
}
$1 == "{" {
$1 == "{" {
if (nextstate != "INHERITS_OR_CLASS-OPENBRACKET" &&
nextstate != "CLASS_OR_CLASS-OPENBRACKET" &&
nextstate != "COMMON-OPENBRACKET")
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -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);
Expand All @@ -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;
Expand Down
32 changes: 16 additions & 16 deletions xen/xsm/flask/policy/mkflask.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,61 +37,61 @@ 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 {
if (nextstate != "SID")
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;
Expand Down

0 comments on commit da53345

Please sign in to comment.