capmon: move mode variable into capmon struct

Signed-off-by: Casper Andersson <[email protected]>
cappe987 · Aug 18, 2022 · f8c4ebb · f8c4ebb
1 parent a3717aa
commit f8c4ebb
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git a/include/libcapmon.h b/include/libcapmon.h
@@ -65,13 +65,21 @@ struct process_stats {
 	DECLARE_BITMAP(capabilities, CAP_LAST_CAP+1);
 };
 
+enum run_mode {
+	RUNMODE_NONE,
+	RUNMODE_MONITOR,
+	RUNMODE_ENA_BG,
+	RUNMODE_DIS_BG
+};
+
 struct capmon {
 	LIST_HEAD(available_probes, probe) available_probes;
 	LIST_HEAD(selected_probes, probe) selected_probes;
 	LIST_HEAD(filters, filter) filters;
 	LIST_HEAD(stats, process_stats) process_stats;
 	enum summary_mode summary;
 	bool in_background;
+	enum run_mode run_mode;
 	//struct available_probes *headp2;
 	//struct selected_probes *headp1;
 };

diff --git a/src/capmon.c b/src/capmon.c
@@ -50,14 +50,7 @@ void usage(void)
 	      stderr);
 }
 
-enum run_mode {
-	RUNMODE_NONE,
-	RUNMODE_MONITOR,
-	RUNMODE_ENA_BG,
-	RUNMODE_DIS_BG
-};
-
-int parse_args(struct capmon *cm, enum run_mode *mode, int argc, char **argv)
+int parse_args(struct capmon *cm, int argc, char **argv)
 {
 	int ena_bg = 0, dis_bg = 0, err = 0;
 	bool cap_all = false;
@@ -80,11 +73,11 @@ int parse_args(struct capmon *cm, enum run_mode *mode, int argc, char **argv)
 		switch (ch) {
 		case 'v':
 			VERSION();
-			*mode = RUNMODE_NONE;
+			cm->run_mode = RUNMODE_NONE;
 			goto out;
 		case 'h':
 			usage();
-			*mode = RUNMODE_NONE;
+			cm->run_mode = RUNMODE_NONE;
 			goto out;
 		case 'a':
 			cap_all = true;
@@ -131,11 +124,11 @@ int parse_args(struct capmon *cm, enum run_mode *mode, int argc, char **argv)
 		err = EINVAL;
 		goto out;
 	} else if (ena_bg) {
-		*mode = RUNMODE_ENA_BG;
+		cm->run_mode = RUNMODE_ENA_BG;
 	} else if (dis_bg) {
-		*mode = RUNMODE_DIS_BG;
+		cm->run_mode = RUNMODE_DIS_BG;
 	} else {
-		*mode = RUNMODE_MONITOR;
+		cm->run_mode = RUNMODE_MONITOR;
 	}
 
 	err = kprobes_can_read_write();
@@ -158,19 +151,18 @@ int parse_args(struct capmon *cm, enum run_mode *mode, int argc, char **argv)
 int main(int argc, char **argv)
 {
 	struct capmon capmon;
-	enum run_mode mode;
 	int err = 0;
 
 	capmon_init(&capmon);
 
-	err = parse_args(&capmon, &mode, argc, argv);
+	err = parse_args(&capmon, argc, argv);
 	if (err)
 		goto out;
 
-	/*capmon_print(&capmon);*/
+	capmon_print(&capmon);
 
 	/* TODO: proper error handling for background enable? */
-	switch (mode) {
+	switch (capmon.run_mode) {
 	case RUNMODE_NONE:
 		goto out;
 	case RUNMODE_MONITOR:

diff --git a/src/libcapmon.c b/src/libcapmon.c
@@ -178,6 +178,7 @@ void capmon_print(struct capmon *cm)
 {
 	printf("--- CAPMON ---\n");
 	printf("Summary mode: %d\n", cm->summary);
+	printf("Run mode: %d\n", cm->run_mode);
 	print_probes(cm);
 	print_filters(cm);