Replace RZ_ASM_NOPLUGINS and RZ_BIN_NOPLUGINS with more general RZ_NO…

…PLUGINS. (#3919)
rizinorg · Oct 16, 2023 · 58ee80d · 58ee80d
1 parent bfef566
commit 58ee80d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/librz/main/rz-asm.c b/librz/main/rz-asm.c
@@ -203,7 +203,7 @@ static int rasm_show_help(int v) {
 		       " If '-l' value is greater than output length, output is padded with nops\n"
 		       " If the last argument is '-' reads from stdin\n");
 		printf("Environment:\n"
-		       " RZ_ASM_NOPLUGINS  do not load shared plugins (speedup loading)\n"
+		       " RZ_NOPLUGINS      do not load shared plugins (speedup loading)\n"
 		       " RZ_ASM_ARCH       same as rz-asm -a\n"
 		       " RZ_ASM_BITS       same as rz-asm -b\n"
 		       " RZ_DEBUG          if defined, show error messages and crash signal\n"
@@ -477,7 +477,7 @@ static int print_assembly_output(RzAsmState *as, const char *buf, ut64 offset, u
 }
 
 static void __load_plugins(RzAsmState *as) {
-	char *tmp = rz_sys_getenv("RZ_ASM_NOPLUGINS");
+	char *tmp = rz_sys_getenv("RZ_NOPLUGINS");
 	if (tmp) {
 		free(tmp);
 		return;

diff --git a/librz/main/rz-bin.c b/librz/main/rz-bin.c
@@ -216,8 +216,8 @@ static int rabin_show_help(int v) {
 	}
 	if (v) {
 		printf("Environment:\n"
+		       " RZ_NOPLUGINS:                        # do not load shared plugins (speedup loading)\n"
 		       " RZ_BIN_LANG:      e bin.lang         # assume lang for demangling\n"
-		       " RZ_BIN_NOPLUGINS: # do not load shared plugins (speedup loading)\n"
 		       " RZ_BIN_DEMANGLE=0:e bin.demangle     # do not demangle symbols\n"
 		       " RZ_BIN_MAXSTRBUF: e bin.maxstrbuf    # specify maximum buffer size\n"
 		       " RZ_BIN_STRFILTER: e bin.str.filter   # rizin -qc 'e bin.str.filter=?"
@@ -699,7 +699,7 @@ RZ_API int rz_main_rz_bin(int argc, const char **argv) {
 
 	rz_core_init(&core);
 	bin = core.bin;
-	if (!(tmp = rz_sys_getenv("RZ_BIN_NOPLUGINS"))) {
+	if (!(tmp = rz_sys_getenv("RZ_NOPLUGINS"))) {
 		char *homeplugindir = rz_path_home_prefix(RZ_PLUGINS);
 		char *plugindir = rz_path_system(RZ_PLUGINS);
 		char *extraplugindir = rz_path_extra(RZ_PLUGINS);

diff --git a/librz/main/rz-hash.c b/librz/main/rz-hash.c
@@ -1170,7 +1170,7 @@ static bool lib_crypto_cb(RzLibPlugin *pl, void *user, void *data) {
 }
 
 static void hash_load_plugins(RzHashContext *ctx) {
-	char *tmp = rz_sys_getenv("RZ_ASM_NOPLUGINS");
+	char *tmp = rz_sys_getenv("RZ_NOPLUGINS");
 	if (tmp) {
 		free(tmp);
 		return;