RepoMirrors/selinux
1
0
Fork 0
mirror of https://github.com/SELinuxProject/selinux synced 2025-02-04 11:51:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

checkpolicy: remove extraneous policy build noise

Browse Source 
Reduce noise when calling the checkpolicy command line. In Android, this
creates unnecessary build noise which we'd like to avoid.

https://en.wikipedia.org/wiki/Unix_philosophy

  Rule of Silence
  Developers should design programs so that they do not print
  unnecessary output. This rule aims to allow other programs
  and developers to pick out the information they need from a
  program's output without having to parse verbosity.

An alternative approach would be to add a -s (silent) option to these
tools, or to have the Android build system redirect stdout to /dev/null.

Signed-off-by: Nick Kralevich <nnk@google.com>
This commit is contained in:
Nick Kralevich via Selinux 2018-09-19 12:08:56 -07:00 committed by William Roberts
parent 98a951fa76
commit 854fdc1ac4
2 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
checkpolicy/checkmodule.c
View File

@ -228,7 +228,6 @@ int main(int argc, char **argv)
if (optind != argc)
usage(argv[0]);
}
printf("%s: loading policy configuration from %s\n", argv[0], file);
/* Set policydb and sidtab used by libsepol service functions
to my structures, so that I can directly populate and
@ -302,8 +301,6 @@ int main(int argc, char **argv)
sepol_sidtab_destroy(&sidtab);
printf("%s: policy configuration loaded\n", argv[0]);
if (outfile) {
FILE *outfp = fopen(outfile, "w");
@ -313,16 +310,11 @@ int main(int argc, char **argv)
}
if (!cil) {
printf("%s: writing binary representation (version %d) to %s\n",
argv[0], policyvers, outfile);
if (write_binary_policy(&modpolicydb, outfp) != 0) {
fprintf(stderr, "%s: error writing %s\n", argv[0], outfile);
exit(1);
}
} else {
printf("%s: writing CIL to %s\n",argv[0], outfile);
if (sepol_module_policydb_to_cil(outfp, &modpolicydb, 0) != 0) {
fprintf(stderr, "%s: error writing %s\n", argv[0], outfile);
exit(1);

11
checkpolicy/checkpolicy.c
View File

@ -512,8 +512,6 @@ int main(int argc, char **argv)
if (optind != argc)
usage(argv[0]);
}
printf("%s: loading policy configuration from %s\n", argv[0], file);
/* Set policydb and sidtab used by libsepol service functions
to my structures, so that I can directly populate and
manipulate them. */
@ -623,8 +621,6 @@ int main(int argc, char **argv)
if (policydb_load_isids(&policydb, &sidtab))
exit(1);
printf("%s: policy configuration loaded\n", argv[0]);
if (outfile) {
outfp = fopen(outfile, "w");
if (!outfp) {
@ -636,8 +632,6 @@ int main(int argc, char **argv)
if (!cil) {
if (!conf) {
printf("%s: writing binary representation (version %d) to %s\n", argv[0], policyvers, outfile);
policydb.policy_type = POLICY_KERN;
policy_file_init(&pf);
@ -645,8 +639,6 @@ int main(int argc, char **argv)
pf.fp = outfp;
ret = policydb_write(&policydb, &pf);
} else {
printf("%s: writing policy.conf to %s\n",
argv[0], outfile);
ret = sepol_kernel_policydb_to_conf(outfp, policydbp);
}
if (ret) {
@ -655,7 +647,6 @@ int main(int argc, char **argv)
exit(1);
}
} else {
printf("%s: writing CIL to %s\n",argv[0], outfile);
if (binary) {
ret = sepol_kernel_policydb_to_cil(outfp, policydbp);
} else {
@ -894,8 +885,6 @@ int main(int argc, char **argv)
FGETS(ans, sizeof(ans), stdin);
pathlen = strlen(ans);
ans[pathlen - 1] = 0;
printf("%s: loading policy configuration from %s\n",
argv[0], ans);
fd = open(ans, O_RDONLY);
if (fd < 0) {
fprintf(stderr, "Can't open '%s': %s\n",