From 78e519f5108d327afb3341439fee9a49491534fe Mon Sep 17 00:00:00 2001 From: netblue30 Date: Thu, 1 Oct 2020 08:55:41 -0400 Subject: replaced --nowrap with --wrap in firemon (#2992) --- src/firemon/apparmor.c | 2 +- src/firemon/arp.c | 2 +- src/firemon/caps.c | 2 +- src/firemon/cgroup.c | 2 +- src/firemon/cpu.c | 2 +- src/firemon/firemon.c | 6 +++--- src/firemon/firemon.h | 2 +- src/firemon/interface.c | 2 +- src/firemon/list.c | 2 +- src/firemon/route.c | 2 +- src/firemon/seccomp.c | 2 +- src/firemon/tree.c | 2 +- src/firemon/x11.c | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src/firemon') diff --git a/src/firemon/apparmor.c b/src/firemon/apparmor.c index 028dbc212..c34a44165 100644 --- a/src/firemon/apparmor.c +++ b/src/firemon/apparmor.c @@ -44,7 +44,7 @@ void apparmor(pid_t pid, int print_procs) { for (i = 0; i < max_pids; i++) { if (pids[i].level == 1) { if (print_procs || pid == 0) - pid_print_list(i, arg_nowrap); + pid_print_list(i, arg_wrap); int child = find_child(i); if (child != -1) print_apparmor(child); diff --git a/src/firemon/arp.c b/src/firemon/arp.c index a43593ced..3bd59e65e 100644 --- a/src/firemon/arp.c +++ b/src/firemon/arp.c @@ -80,7 +80,7 @@ void arp(pid_t pid, int print_procs) { for (i = 0; i < max_pids; i++) { if (pids[i].level == 1) { if (print_procs || pid == 0) - pid_print_list(i, arg_nowrap); + pid_print_list(i, arg_wrap); int child = find_child(i); if (child != -1) { char *fname; diff --git a/src/firemon/caps.c b/src/firemon/caps.c index 951bd21a5..0e720706d 100644 --- a/src/firemon/caps.c +++ b/src/firemon/caps.c @@ -53,7 +53,7 @@ void caps(pid_t pid, int print_procs) { for (i = 0; i < max_pids; i++) { if (pids[i].level == 1) { if (print_procs || pid == 0) - pid_print_list(i, arg_nowrap); + pid_print_list(i, arg_wrap); int child = find_child(i); if (child != -1) print_caps(child); diff --git a/src/firemon/cgroup.c b/src/firemon/cgroup.c index 251db0077..e0d605d10 100644 --- a/src/firemon/cgroup.c +++ b/src/firemon/cgroup.c @@ -53,7 +53,7 @@ void cgroup(pid_t pid, int print_procs) { for (i = 0; i < max_pids; i++) { if (pids[i].level == 1) { if (print_procs || pid == 0) - pid_print_list(i, arg_nowrap); + pid_print_list(i, arg_wrap); int child = find_child(i); if (child != -1) print_cgroup(child); diff --git a/src/firemon/cpu.c b/src/firemon/cpu.c index 6170ef8c1..e97068851 100644 --- a/src/firemon/cpu.c +++ b/src/firemon/cpu.c @@ -54,7 +54,7 @@ void cpu(pid_t pid, int print_procs) { for (i = 0; i < max_pids; i++) { if (pids[i].level == 1) { if (print_procs || pid == 0) - pid_print_list(i, arg_nowrap); + pid_print_list(i, arg_wrap); int child = find_child(i); if (child != -1) print_cpu(child); diff --git a/src/firemon/firemon.c b/src/firemon/firemon.c index 238fbcdfe..5ae0ed013 100644 --- a/src/firemon/firemon.c +++ b/src/firemon/firemon.c @@ -40,7 +40,7 @@ static int arg_top = 0; static int arg_list = 0; static int arg_netstats = 0; static int arg_apparmor = 0; -int arg_nowrap = 0; +int arg_wrap = 0; static struct termios tlocal; // startup terminal setting static struct termios twait; // no wait on key press @@ -206,8 +206,8 @@ int main(int argc, char **argv) { } // etc - else if (strcmp(argv[i], "--nowrap") == 0) - arg_nowrap = 1; + else if (strcmp(argv[i], "--wrap") == 0) + arg_wrap = 1; // invalid option else if (*argv[i] == '-') { diff --git a/src/firemon/firemon.h b/src/firemon/firemon.h index 3fba486eb..948214d4d 100644 --- a/src/firemon/firemon.h +++ b/src/firemon/firemon.h @@ -40,7 +40,7 @@ static inline void firemon_clrscr(void) { // firemon.c extern pid_t skip_process; -extern int arg_nowrap; +extern int arg_wrap; int find_child(int id); void firemon_sleep(int st); diff --git a/src/firemon/interface.c b/src/firemon/interface.c index 325ffd80e..34d616647 100644 --- a/src/firemon/interface.c +++ b/src/firemon/interface.c @@ -163,7 +163,7 @@ void interface(pid_t pid, int print_procs) { for (i = 0; i < max_pids; i++) { if (pids[i].level == 1) { if (print_procs || pid == 0) - pid_print_list(i, arg_nowrap); + pid_print_list(i, arg_wrap); int child = find_child(i); if (child != -1) { print_sandbox(child); diff --git a/src/firemon/list.c b/src/firemon/list.c index 8a07f9eb2..22a08272d 100644 --- a/src/firemon/list.c +++ b/src/firemon/list.c @@ -28,6 +28,6 @@ void list(void) { if (i == skip_process) continue; if (pids[i].level == 1) - pid_print_list(i, arg_nowrap); + pid_print_list(i, arg_wrap); } } diff --git a/src/firemon/route.c b/src/firemon/route.c index 9fd46505f..19c823a87 100644 --- a/src/firemon/route.c +++ b/src/firemon/route.c @@ -189,7 +189,7 @@ void route(pid_t pid, int print_procs) { for (i = 0; i < max_pids; i++) { if (pids[i].level == 1) { if (print_procs || pid == 0) - pid_print_list(i, arg_nowrap); + pid_print_list(i, arg_wrap); int child = find_child(i); if (child != -1) { char *fname; diff --git a/src/firemon/seccomp.c b/src/firemon/seccomp.c index 7bc700ee6..7867fbad3 100644 --- a/src/firemon/seccomp.c +++ b/src/firemon/seccomp.c @@ -52,7 +52,7 @@ void seccomp(pid_t pid, int print_procs) { for (i = 0; i < max_pids; i++) { if (pids[i].level == 1) { if (print_procs || pid == 0) - pid_print_list(i, arg_nowrap); + pid_print_list(i, arg_wrap); int child = find_child(i); if (child != -1) print_seccomp(child); diff --git a/src/firemon/tree.c b/src/firemon/tree.c index f3610eaec..711066c19 100644 --- a/src/firemon/tree.c +++ b/src/firemon/tree.c @@ -28,7 +28,7 @@ void tree(pid_t pid) { if (i == skip_process) continue; if (pids[i].level == 1) - pid_print_tree(i, 0, arg_nowrap); + pid_print_tree(i, 0, arg_wrap); } printf("\n"); } diff --git a/src/firemon/x11.c b/src/firemon/x11.c index a41f4825f..19b54429c 100644 --- a/src/firemon/x11.c +++ b/src/firemon/x11.c @@ -30,7 +30,7 @@ void x11(pid_t pid, int print_procs) { for (i = 0; i < max_pids; i++) { if (pids[i].level == 1) { if (print_procs || pid == 0) - pid_print_list(i, arg_nowrap); + pid_print_list(i, arg_wrap); char *x11file; // todo: use macro from src/firejail/firejail.h for /run/firejail/x11 directory -- cgit v1.2.3-54-g00ecf