cmd: filtering La commands output (#4786)

rizinorg · Dec 26, 2024 · d771043 · d771043
1 parent f517248
commit d771043
Show file tree

Hide file tree

Showing 9 changed files with 174 additions and 18 deletions.
diff --git a/librz/core/casm.c b/librz/core/casm.c
@@ -94,8 +94,9 @@ static const char *has_esil(RzCore *core, const char *name) {
 	return "___";
 }
 
-RZ_API RzCmdStatus rz_core_asm_plugin_print(RzCore *core, RzAsmPlugin *ap, const char *arch, RzCmdStateOutput *state, const char *license) {
-	const char *feat2, *feat;
+RZ_API RzCmdStatus rz_core_asm_plugin_print(RzCore *core, RzAsmPlugin *ap, RzCmdStateOutput *state, const char *license, const char *flags) {
+	const char *feat2;
+	char feat[6] = "__";
 	char bits[32];
 	PJ *pj = state->d.pj;
 	bits[0] = 0;
@@ -120,17 +121,24 @@ RZ_API RzCmdStatus rz_core_asm_plugin_print(RzCore *core, RzAsmPlugin *ap, const
 			strcat(bits, "64");
 		}
 	}
-	feat = "__";
+
 	if (ap->assemble && ap->disassemble) {
-		feat = "ad";
+		strcpy(feat, "ad");
 	}
 	if (ap->assemble && !ap->disassemble) {
-		feat = "a_";
+		strcpy(feat, "a_");
 	}
 	if (!ap->assemble && ap->disassemble) {
-		feat = "_d";
+		strcpy(feat, "_d");
 	}
 	feat2 = has_esil(core, ap->name);
+	strcat(feat, feat2);
+
+	for (int i = 0; flags && flags[i] != '\0'; i++) {
+		if (strchr(feat, flags[i]) == NULL) {
+			return RZ_CMD_STATUS_OK;
+		}
+	}
 	switch (state->mode) {
 	case RZ_OUTPUT_MODE_QUIET: {
 		rz_cons_println(ap->name);
@@ -146,8 +154,8 @@ RZ_API RzCmdStatus rz_core_asm_plugin_print(RzCore *core, RzAsmPlugin *ap, const
 		break;
 	}
 	case RZ_OUTPUT_MODE_STANDARD: {
-		rz_cons_printf("%s%s %-10s %-11s %-7s %s",
-			feat, feat2, bits, ap->name, license, ap->desc);
+		rz_cons_printf("%s %-10s %-11s %-7s %s",
+			feat, bits, ap->name, license, ap->desc);
 		if (ap->author) {
 			rz_cons_printf(" (by %s)", ap->author);
 		}
@@ -165,7 +173,7 @@ RZ_API RzCmdStatus rz_core_asm_plugin_print(RzCore *core, RzAsmPlugin *ap, const
 	return RZ_CMD_STATUS_OK;
 }
 
-RZ_API RzCmdStatus rz_core_asm_plugins_print(RZ_NONNULL RZ_BORROW RzCore *core, RZ_NULLABLE const char *arch, RZ_OUT RzCmdStateOutput *state) {
+RZ_API RzCmdStatus rz_core_asm_plugins_print(RZ_NONNULL RZ_BORROW RzCore *core, RZ_NULLABLE const char *arch, RZ_OUT RzCmdStateOutput *state, RZ_NULLABLE const char *flags) {
 	rz_return_val_if_fail(core && state, RZ_CMD_STATUS_ERROR);
 	int i;
 	RzAsm *a = core->rasm;
@@ -197,7 +205,7 @@ RZ_API RzCmdStatus rz_core_asm_plugins_print(RZ_NONNULL RZ_BORROW RzCore *core,
 			const char *license = ap->license
 				? ap->license
 				: "unknown";
-			status = rz_core_asm_plugin_print(core, ap, arch, state, license);
+			status = rz_core_asm_plugin_print(core, ap, state, license, flags);
 			if (status != RZ_CMD_STATUS_OK) {
 				rz_iterator_free(iter);
 				rz_list_free(plugin_list);

diff --git a/librz/core/cconfig.c b/librz/core/cconfig.c
@@ -414,7 +414,7 @@ static bool cb_asmcpu(void *user, void *data) {
 		/* print verbose help instead of plain option listing */
 		RzCmdStateOutput state = { 0 };
 		rz_cmd_state_output_init(&state, RZ_OUTPUT_MODE_STANDARD);
-		rz_core_asm_plugins_print(core, rz_config_get(core->config, "asm.arch"), &state);
+		rz_core_asm_plugins_print(core, rz_config_get(core->config, "asm.arch"), &state, NULL);
 		rz_cmd_state_output_print(&state);
 		rz_cmd_state_output_fini(&state);
 		return 0;
@@ -500,7 +500,7 @@ static bool cb_asmarch(void *user, void *data) {
 			/* print more verbose help instead of plain option values */
 			RzCmdStateOutput state = { 0 };
 			rz_cmd_state_output_init(&state, RZ_OUTPUT_MODE_STANDARD);
-			rz_core_asm_plugins_print(core, NULL, &state);
+			rz_core_asm_plugins_print(core, NULL, &state, NULL);
 			rz_cmd_state_output_print(&state);
 			rz_cmd_state_output_fini(&state);
 			return false;

diff --git a/librz/core/cmd/cmd_analysis.c b/librz/core/cmd/cmd_analysis.c
@@ -5497,7 +5497,7 @@ RZ_IPI RzCmdStatus rz_list_mne_handler(RzCore *core, int argc, const char **argv
 }
 
 RZ_IPI RzCmdStatus rz_list_plugins_handler(RzCore *core, int argc, const char **argv, RzCmdStateOutput *state) {
-	return rz_core_asm_plugins_print(core, NULL, state);
+	return rz_core_asm_plugins_print(core, NULL, state, NULL);
 }
 
 RZ_IPI RzCmdStatus rz_analyse_name_handler(RzCore *core, int argc, const char **argv, RzCmdStateOutput *state) {

diff --git a/librz/core/cmd/cmd_plugins.c b/librz/core/cmd/cmd_plugins.c
@@ -18,7 +18,10 @@ RZ_IPI RzCmdStatus rz_plugins_lang_print_handler(RzCore *core, int argc, const c
 }
 
 RZ_IPI RzCmdStatus rz_plugins_asm_print_handler(RzCore *core, int argc, const char **argv, RzCmdStateOutput *state) {
-	return rz_core_asm_plugins_print(core, NULL, state);
+	if (argc > 1) {
+		return rz_core_asm_plugins_print(core, NULL, state, argv[1]);
+	}
+	return rz_core_asm_plugins_print(core, NULL, state, NULL);
 }
 
 RZ_IPI RzCmdStatus rz_plugins_core_print_handler(RzCore *core, int argc, const char **argv, RzCmdStateOutput *state) {

diff --git a/librz/core/cmd_descs/cmd_descs.c b/librz/core/cmd_descs/cmd_descs.c
@@ -550,6 +550,7 @@ static const RzCmdDescArg sdb_namespace_dump_args[3];
 static const RzCmdDescArg sdb_namespace_load_args[3];
 static const RzCmdDescArg plugins_load_args[2];
 static const RzCmdDescArg plugins_unload_args[2];
+static const RzCmdDescArg plugins_asm_print_args[2];
 static const RzCmdDescArg plugins_debug_print_args[2];
 static const RzCmdDescArg plugins_io_print_args[2];
 static const RzCmdDescArg open_args[4];
@@ -12160,6 +12161,13 @@ static const RzCmdDescHelp plugins_lang_print_help = {
 };
 
 static const RzCmdDescArg plugins_asm_print_args[] = {
+	{
+		.name = "features",
+		.type = RZ_CMD_ARG_TYPE_STRING,
+		.flags = RZ_CMD_ARG_FLAG_LAST,
+		.optional = true,
+
+	},
 	{ 0 },
 };
 static const RzCmdDescHelp plugins_asm_print_help = {

diff --git a/librz/core/cmd_descs/cmd_plugins.yaml b/librz/core/cmd_descs/cmd_plugins.yaml
@@ -27,7 +27,10 @@ commands:
     cname: plugins_asm_print
     summary: List the asm/analysis plugins
     type: RZ_CMD_DESC_TYPE_ARGV_STATE
-    args: []
+    args:
+      - name: features
+        type: RZ_CMD_ARG_TYPE_STRING
+        optional: true
     modes:
       - RZ_OUTPUT_MODE_QUIET
       - RZ_OUTPUT_MODE_STANDARD

diff --git a/librz/include/rz_core.h b/librz/include/rz_core.h
@@ -850,7 +850,7 @@ RZ_API RzList /*<RzCoreAsmHit *>*/ *rz_core_asm_hit_list_new(void);
 RZ_API void rz_core_asm_hit_free(void *_hit);
 RZ_API void rz_core_set_asm_configs(RzCore *core, char *arch, ut32 bits, int segoff);
 RZ_API char *rz_core_asm_search(RzCore *core, const char *input);
-RZ_API RzCmdStatus rz_core_asm_plugins_print(RZ_NONNULL RZ_BORROW RzCore *core, RZ_NULLABLE const char *arch, RZ_OUT RzCmdStateOutput *state);
+RZ_API RzCmdStatus rz_core_asm_plugins_print(RZ_NONNULL RZ_BORROW RzCore *core, RZ_NULLABLE const char *arch, RZ_OUT RzCmdStateOutput *state, RZ_NULLABLE const char *flags);
 RZ_API RzList /*<RzCoreAsmHit *>*/ *rz_core_asm_strsearch(RzCore *core, const char *input, ut64 from, ut64 to, int maxhits, int regexp, int everyByte, int mode);
 RZ_API RzList /*<RzCoreAsmHit *>*/ *rz_core_asm_bwdisassemble(RzCore *core, ut64 addr, int n, int len);
 RZ_API RzList /*<RzCoreAsmHit *>*/ *rz_core_asm_back_disassemble_instr(RzCore *core, ut64 addr, int len, ut32 hit_count, ut32 extra_padding);

diff --git a/librz/main/rz-asm.c b/librz/main/rz-asm.c
@@ -655,7 +655,7 @@ RZ_API int rz_main_rz_asm(int argc, const char *argv[]) {
 			core->analysis = as->analysis;
 			RzCmdStateOutput state = { 0 };
 			rz_cmd_state_output_init(&state, as->json ? RZ_OUTPUT_MODE_JSON : RZ_OUTPUT_MODE_STANDARD);
-			rz_core_asm_plugins_print(core, opt.argv[opt.ind], &state);
+			rz_core_asm_plugins_print(core, opt.argv[opt.ind], &state, NULL);
 			rz_cmd_state_output_print(&state);
 			rz_cmd_state_output_fini(&state);
 			rz_cons_flush();

diff --git a/test/db/cmd/cmd_list b/test/db/cmd/cmd_list