Revert "Use cil_write_build_ast"
Revert submission 1827311-update_libselinux
Reason for revert: b/200771997
Reverted Changes:
I088d1e94c:Fix build and use new cil_write_build_ast
I14dc4dc58:Merge remote-tracking branch 'aosp/upstream-master...
I7b77f4469:Use cil_write_build_ast
Change-Id: Ib4983288feb0139ed12cb3a07edd60d2d457022f
diff --git a/tools/version_policy.c b/tools/version_policy.c
index 3f97268..8bb422a 100644
--- a/tools/version_policy.c
+++ b/tools/version_policy.c
@@ -9,6 +9,7 @@
#include <sys/stat.h>
#include <cil/android.h>
#include <cil/cil.h>
+#include <cil/cil_write_ast.h>
void __attribute__ ((noreturn)) static usage(char *prog) {
printf("Usage: %s [OPTION]...\n", prog);
@@ -89,7 +90,6 @@
char *num = NULL;
char *dot;
char *output = NULL;
- FILE *output_file = NULL;
struct cil_db *base_db = NULL;
struct cil_db *out_db = NULL;
@@ -177,21 +177,11 @@
goto exit;
}
}
-
- output_file = fopen(output, "we");
- if (!output_file) {
- fprintf(stderr, "Could not open file: %s\n", output);
+ rc = cil_write_ast(out_db, output);
+ if (rc != SEPOL_OK) {
goto exit;
}
- rc = cil_write_build_ast(output_file, out_db);
- if (rc != SEPOL_OK) {
- fprintf(stderr, "Failed to write AST\n");
- goto build_err;
- }
-
-build_err:
- fclose(output_file);
exit:
free(base);
free(tgt_policy);