| Message ID | 1475058512-76102-3-git-send-email-jdanis@android.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On 09/28/2016 06:28 AM, Janis Danisevskis wrote: > The "-r" flag of sefcontext_compile now causes it to omit the > precompiled regular expressions from the output. > > Signed-off-by: Janis Danisevskis <jdanis@android.com> Thanks, all 3 applied. > --- > libselinux/utils/sefcontext_compile.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/libselinux/utils/sefcontext_compile.c b/libselinux/utils/sefcontext_compile.c > index 8c48d32..b2746c7 100644 > --- a/libselinux/utils/sefcontext_compile.c > +++ b/libselinux/utils/sefcontext_compile.c > @@ -276,10 +276,12 @@ static void usage(const char *progname) > " will be fc_file with the .bin suffix appended.\n\t" > "-p Optional binary policy file that will be used to\n\t" > " validate contexts defined in the fc_file.\n\t" > - "-r Include precompiled regular expressions in the output.\n\t" > + "-r Omit precompiled regular expressions from the output.\n\t" > " (PCRE2 only. Compiled PCRE2 regular expressions are\n\t" > - " not portable across architectures. When linked against\n\t" > - " PCRE this flag is ignored)\n\t" > + " not portable across architectures. Use this flag\n\t" > + " if you know that you build for an incompatible\n\t" > + " architecture to save space. When linked against\n\t" > + " PCRE1 this flag is ignored.)\n\t" > "-i Print regular expression info end exit. That is, back\n\t" > " end version and architecture identifier.\n\t" > " Arch identifier format (PCRE2):\n\t" > @@ -294,7 +296,7 @@ int main(int argc, char *argv[]) > { > const char *path = NULL; > const char *out_file = NULL; > - int do_write_precompregex = 0; > + int do_write_precompregex = 1; > char stack_path[PATH_MAX + 1]; > char *tmp = NULL; > int fd, rc, opt; > @@ -315,7 +317,7 @@ int main(int argc, char *argv[]) > policy_file = optarg; > break; > case 'r': > - do_write_precompregex = 1; > + do_write_precompregex = 0; > break; > case 'i': > printf("%s (%s)\n", regex_version(), >
diff --git a/libselinux/utils/sefcontext_compile.c b/libselinux/utils/sefcontext_compile.c index 8c48d32..b2746c7 100644 --- a/libselinux/utils/sefcontext_compile.c +++ b/libselinux/utils/sefcontext_compile.c @@ -276,10 +276,12 @@ static void usage(const char *progname) " will be fc_file with the .bin suffix appended.\n\t" "-p Optional binary policy file that will be used to\n\t" " validate contexts defined in the fc_file.\n\t" - "-r Include precompiled regular expressions in the output.\n\t" + "-r Omit precompiled regular expressions from the output.\n\t" " (PCRE2 only. Compiled PCRE2 regular expressions are\n\t" - " not portable across architectures. When linked against\n\t" - " PCRE this flag is ignored)\n\t" + " not portable across architectures. Use this flag\n\t" + " if you know that you build for an incompatible\n\t" + " architecture to save space. When linked against\n\t" + " PCRE1 this flag is ignored.)\n\t" "-i Print regular expression info end exit. That is, back\n\t" " end version and architecture identifier.\n\t" " Arch identifier format (PCRE2):\n\t" @@ -294,7 +296,7 @@ int main(int argc, char *argv[]) { const char *path = NULL; const char *out_file = NULL; - int do_write_precompregex = 0; + int do_write_precompregex = 1; char stack_path[PATH_MAX + 1]; char *tmp = NULL; int fd, rc, opt; @@ -315,7 +317,7 @@ int main(int argc, char *argv[]) policy_file = optarg; break; case 'r': - do_write_precompregex = 1; + do_write_precompregex = 0; break; case 'i': printf("%s (%s)\n", regex_version(),
The "-r" flag of sefcontext_compile now causes it to omit the precompiled regular expressions from the output. Signed-off-by: Janis Danisevskis <jdanis@android.com> --- libselinux/utils/sefcontext_compile.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)