mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-03 07:45:50 +00:00
Code Issues Releases Wiki Activity

parser: unify flagtable printing for warn, dump and optimize

Browse Source 
warn, dump, and optize share common printing of their option flag
tables, refactor and unify.

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 00:52:57 -07:00
parent 3d54324db0
commit db07b131b5
3 changed files with 15 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
parser/common_optarg.c
View File

@@ -147,24 +147,14 @@ int handle_flag_table(optflag_table_t *table, const char *optarg,
return 0;
}
void display_dump(const char *command)
void flagtable_help(const char *name, const char *header, const char *command,
optflag_table_t *table)
{
display_version();
printf("\n%s: --dump [Option]\n\n"
printf("\n%s: --%s [Option]\n\n"
"%s"
"Options:\n"
"--------\n"
" variables \tDump variables\n"
" expanded-variables\t Dump variables after expansion\n"
,command);
print_flag_table(dumpflag_table);
}
void display_optimize(const char *command)
{
display_version();
printf("\n%s: -O [Option]\n\n"
"Options:\n"
"--------\n"
,command);
print_flag_table(optflag_table);
,name, command, header);
print_flag_table(table);
}

5
parser/common_optarg.h
View File

@@ -37,11 +37,10 @@ typedef struct {
extern optflag_table_t dumpflag_table[];
extern optflag_table_t optflag_table[];
void print_flag_table(optflag_table_t *table);
int handle_flag_table(optflag_table_t *table, const char *optarg,
dfaflags_t *flags);
void display_dump(const char *command);
void display_optimize(const char *command);
void flagtable_help(const char *name, const char *header, const char *command,
optflag_table_t *table);
#endif /* __AA_COMMON_OPTARG_H */

20
parser/parser_main.c
View File

@@ -267,16 +267,6 @@ optflag_table_t warnflag_table[] = {
{ 0, NULL, NULL, 0 },
};
void display_warn(const char *command)
{
display_version();
printf("\n%s: --warn [Option]\n\n"
"Options:\n"
"--------\n"
,command);
print_flag_table(warnflag_table);
}
/* Parse comma separated cachelocations. Commas can be escaped by \, */
static int parse_cacheloc(const char *arg, const char **cacheloc, int max_size)
{
@@ -436,6 +426,9 @@ bool early_arg(int c) {
/* process a single argment from getopt_long
* Returns: 1 if an action arg, else 0
*/
#define DUMP_HEADER " variables \tDump variables\n" \
" expanded-variables\t Dump variables after expansion\n"
static int process_arg(int c, char *optarg)
{
struct aa_features *tmp_features = NULL;
@@ -469,14 +462,15 @@ static int process_arg(int c, char *optarg)
} else if (strcmp(optarg, "Dump") == 0 ||
strcmp(optarg, "dump") == 0 ||
strcmp(optarg, "D") == 0) {
display_dump(progname);
flagtable_help("dump", DUMP_HEADER, progname,
dumpflag_table);
} else if (strcmp(optarg, "Optimize") == 0 ||
strcmp(optarg, "optimize") == 0 ||
strcmp(optarg, "O") == 0) {
display_optimize(progname);
flagtable_help("-O", "", progname, optflag_table);
} else if (strcmp(optarg, "warn") == 0 ||
strcmp(optarg, "Werror") == 0) {
display_warn(progname);
flagtable_help("warn", "", progname, warnflag_table);
} else {
PERROR("%s: Invalid --help option %s\n",
progname, optarg);