mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 08:24:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

parser: cleanup/fix flagtable display for the warn, dump, and Optimize options

Browse source 
This changes the flagtable header from

     warn: --./apparmor_parser [Option]
     -O: --./apparmor_parser [Option]
     dump: --./apparmor_parser [Option]

  to
     ./apparmor_parser: --warn=[Option]
     ./apparmor_parser: -O [Option]
     ./apparmor_parser: --dump=[Option]

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/600
Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
John Johansen 2020-09-01 01:18:58 -07:00
parent 6e6f99e0b8
commit 9c1803d62a
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
parser/common_optarg.c
View file

@ -169,10 +169,10 @@ void flagtable_help(const char *name, const char *header, const char *command,
optflag_table_t *table)
{
display_version();
printf("\n%s: --%s [Option]\n\n"
printf("\n%s: %s[Option]\n\n"
"%s"
"Options:\n"
"--------\n"
,name, command, header);
,command, name, header);
print_flag_table(table);
}

6
parser/parser_main.c
View file

@ -462,15 +462,15 @@ static int process_arg(int c, char *optarg)
} else if (strcmp(optarg, "Dump") == 0 ||
strcmp(optarg, "dump") == 0 ||
strcmp(optarg, "D") == 0) {
flagtable_help("dump", DUMP_HEADER, progname,
flagtable_help("--dump=", DUMP_HEADER, progname,
dumpflag_table);
} else if (strcmp(optarg, "Optimize") == 0 ||
strcmp(optarg, "optimize") == 0 ||
strcmp(optarg, "O") == 0) {
flagtable_help("-O", "", progname, optflag_table);
flagtable_help("-O ", "", progname, optflag_table);
} else if (strcmp(optarg, "warn") == 0 ||
strcmp(optarg, "Werror") == 0) {
flagtable_help("warn", "", progname, warnflag_table);
flagtable_help("--warn=", "", progname, warnflag_table);
} else {
PERROR("%s: Invalid --help option %s\n",
progname, optarg);