Re: [PATCH] checkpolicy/test: Show all options for dispol and dismod in -h

[Petr Lautrbach <lautrbach@redhat.com>]

James Carter <jwcart2@gmail.com> writes:

> On Mon, Apr 20, 2026 at 8:41 AM Vit Mojzis <vmojzis@redhat.com> wrote:
>>
>> Show the following options, which were hidden in the usage message,
>> because they require additional input:
>>
>> dispol:
>>   7    change a boolean value
>>   f    set output file
>>   m    display menu
>>   q    quit
>>
>> dismod:
>>   l    Link in a module
>>   f    set output file
>>   m    display menu
>>   q    quit
>>
>> Fixes:
>>   $dispol -h
>>   Usage:
>>    sedispol [OPTIONS] binary_pol_file
>>
>>   Options:
>>    -h, --help   print this help message
>>    -a, --actions ACTIONS   run non-interactively
>>
>>   Actions:
>>     1    display unconditional AVTAB
>>     2    display conditional AVTAB (entirely)
>>     3    display conditional AVTAB (only ENABLED rules)
>>     4    display conditional AVTAB (only DISABLED rules)
>>     5    display booleans
>>     6    display conditional expressions
>>     8    display role transitions
>>     c    display policy capabilities
>>     C    display classes
>>     u    display users
>>     r    display roles
>>     t    display types
>>     a    display type attributes
>>     p    display the list of permissive types
>>     U    display unknown handling setting
>>     F    display filename_trans rules
>>
>>   With the patch:
>>
>>   Actions:
>>     1    display unconditional AVTAB
>>     2    display conditional AVTAB (entirely)
>>     3    display conditional AVTAB (only ENABLED rules)
>>     4    display conditional AVTAB (only DISABLED rules)
>>     5    display booleans
>>     6    display conditional expressions
>>     7    change a boolean value
>>     8    display role transitions
>>     c    display policy capabilities
>>     C    display classes
>>     u    display users
>>     r    display roles
>>     t    display types
>>     a    display type attributes
>>     p    display the list of permissive types
>>     U    display unknown handling setting
>>     F    display filename_trans rules
>>     f    set output file
>>     m    display menu
>>     q    quit
>>
>> Signed-off-by: Vit Mojzis <vmojzis@redhat.com>
>
> Acked-by: James Carter <jwcart2@gmail.com>

Merged, thanks!

>> ---
>>  checkpolicy/test/dismod.c | 3 +--
>>  checkpolicy/test/dispol.c | 3 +--
>>  2 files changed, 2 insertions(+), 4 deletions(-)
>>
>> diff --git a/checkpolicy/test/dismod.c b/checkpolicy/test/dismod.c
>> index 4868190f..ed5aaa45 100644
>> --- a/checkpolicy/test/dismod.c
>> +++ b/checkpolicy/test/dismod.c
>> @@ -106,8 +106,7 @@ static __attribute__((__noreturn__)) void usage(const char *progname)
>>         puts("");
>>         puts("Actions:");
>>         for (unsigned int i = 0; commands[i].meta != EOL; i++) {
>> -               if (commands[i].meta == HEADER
>> -                   || commands[i].meta & NOOPT)
>> +               if (!(commands[i].meta & CMD))
>>                         continue;
>>                 printf("  %c    %s\n", commands[i].cmd, commands[i].desc);
>>         }
>> diff --git a/checkpolicy/test/dispol.c b/checkpolicy/test/dispol.c
>> index 3f80c1a2..c3339b88 100644
>> --- a/checkpolicy/test/dispol.c
>> +++ b/checkpolicy/test/dispol.c
>> @@ -79,8 +79,7 @@ static __attribute__((__noreturn__)) void usage(const char *progname)
>>         puts("");
>>         puts("Actions:");
>>         for (unsigned int i = 0; commands[i].meta != EOL; i++) {
>> -               if (commands[i].meta == HEADER
>> -                   || commands[i].meta & NOOPT)
>> +               if (!(commands[i].meta & CMD))
>>                         continue;
>>                 printf("  %c    %s\n", commands[i].cmd, commands[i].desc);
>>         }
>> --
>> 2.53.0
>>
>>