d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pfilctl: improve formatting of "hooks" and "heads" command output.

Browse Source 
In "heads" output just improve the header to describe all of the columns.
In "hooks" print filter name and hook name delimited with colon, so that
it matches "heads" output and also can be copy-and-pasted straight into
the command line for future "link" command.
This commit is contained in:
Gleb Smirnoff 2021-03-19 11:18:05 -07:00
parent 473f6163e3
commit d76f6b8e73
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sbin/pfilctl/pfilctl.c
View File

@ -132,8 +132,8 @@ listheads(int argc __unused, char *argv[] __unused)
}
#define FMTHD "%16s %8s\n"
#define FMTHK "%29s %16s %16s\n"
printf(FMTHD, "Intercept point", "Type");
#define FMTHK "%29s %16s:%s\n"
printf("%16s %8s %3s %16s\n", "Intercept point", "Type", "Dir", "Hook");
for (i = 0, h = 0; i < plh.pio_nheads; i++) {
printf(FMTHD, plh.pio_heads[i].pio_name,
typenames[plh.pio_heads[i].pio_type]);
@ -170,9 +170,9 @@ listhooks(int argc __unused, char *argv[] __unused)
goto retry;
}
printf("Available hooks:\n");
printf("%16s %16s %8s\n", "Hook", "", "Type");
for (i = 0; i < plh.pio_nhooks; i++) {
printf("\t%s:%s %s\n", plh.pio_hooks[i].pio_module,
printf("%16s:%-16s %8s\n", plh.pio_hooks[i].pio_module,
plh.pio_hooks[i].pio_ruleset,
typenames[plh.pio_hooks[i].pio_type]);
}