pfo files must be .h or .r2 ##print

radareorg · Dec 21, 2024 · 2841f3d · 2841f3d
1 parent 790eed9
commit 2841f3d
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 9 deletions.
diff --git a/libr/bin/d/Makefile b/libr/bin/d/Makefile
@@ -37,13 +37,12 @@ clean:
 
 .PHONY: all clean install install-symlink symstall uninstall
 
-FORMATS=dex macho elf32 elf64 elf_enums pe32 trx mz zip symclass.sdb
-
 install: $(F_SDB)
 	@echo "[i] Installing bin format files"
 	rm -rf "$P"
 	mkdir -p "$P"
-	-cp -f $(FORMATS) "$P" || true
+	-cp -f *.r2 *.h "$P" || true
+	-cp -f symclass.sdb "$P" || true
 	mkdir -p "$P/dll"
 	cp -f dll/*.sdb "$P/dll"
 
@@ -53,10 +52,9 @@ symclass.sdb:
 CWD=$(shell pwd)
 symstall install-symlink: symclass.sdb
 	mkdir -p "$P"
-	for FILE in * ; do \
-		if [ "$$FILE" != Makefile ]; then \
-			[ ! -d "$P/$$FILE" ] && ln -fs "${CWD}/$$FILE" "$P/$$FILE" ; \
-		fi ; \
+	rm -rf "$P/dll"
+	for FILE in *.r2 *.h dll symclass.sdb ; do \
+		[ ! -d "$P/$$FILE" ] && ln -fs "${CWD}/$$FILE" "$P/$$FILE" ; \
 	done
 
 $(DLL_SDB):

diff --git a/libr/bin/d/bios → libr/bin/d/bios.r2 b/libr/bin/d/bios → libr/bin/d/bios.r2
diff --git a/libr/bin/d/dex → libr/bin/d/dex.r2 b/libr/bin/d/dex → libr/bin/d/dex.r2
diff --git a/libr/bin/d/elf32 → libr/bin/d/elf32.r2 b/libr/bin/d/elf32 → libr/bin/d/elf32.r2
diff --git a/libr/bin/d/elf64 → libr/bin/d/elf64.r2 b/libr/bin/d/elf64 → libr/bin/d/elf64.r2
diff --git a/libr/bin/d/elf_enums → libr/bin/d/elf_enums.r2 b/libr/bin/d/elf_enums → libr/bin/d/elf_enums.r2
diff --git a/libr/bin/d/fat → libr/bin/d/fatmacho.r2 b/libr/bin/d/fat → libr/bin/d/fatmacho.r2
diff --git a/libr/bin/d/macho → libr/bin/d/macho.r2 b/libr/bin/d/macho → libr/bin/d/macho.r2
diff --git a/libr/bin/d/mz → libr/bin/d/mz.r2 b/libr/bin/d/mz → libr/bin/d/mz.r2
diff --git a/libr/bin/d/ntfs → libr/bin/d/ntfs.r2 b/libr/bin/d/ntfs → libr/bin/d/ntfs.r2
diff --git a/libr/bin/d/pe32 → libr/bin/d/pe32.r2 b/libr/bin/d/pe32 → libr/bin/d/pe32.r2
diff --git a/libr/bin/d/trx → libr/bin/d/trx.r2 b/libr/bin/d/trx → libr/bin/d/trx.r2
diff --git a/libr/bin/d/zip → libr/bin/d/zip.r2 b/libr/bin/d/zip → libr/bin/d/zip.r2
diff --git a/libr/core/cmd_print.inc.c b/libr/core/cmd_print.inc.c
@@ -2105,6 +2105,17 @@ static void cmd_pfb(RCore *core, const char *_input) {
 	}
 }
 
+static bool is_pfo_file(const char *fn) {
+	if (*fn != '.') {
+		if (r_str_endswith (fn, ".r2")) {
+			return true;
+		}
+		if (r_str_endswith (fn, ".h")) {
+			return true;
+		}
+	}
+	return false;
+}
 static void cmd_print_format(RCore *core, const char *_input, const ut8* block, int len) {
 	char *input = NULL;
 	bool v2 = false;
@@ -2235,7 +2246,7 @@ static void cmd_print_format(RCore *core, const char *_input, const ut8* block,
 			if (home) {
 				files = r_sys_dir (home);
 				r_list_foreach (files, iter, fn) {
-					if (*fn != '.') {
+					if (is_pfo_file (fn)) {
 						r_cons_println (fn);
 					}
 				}
@@ -2246,7 +2257,7 @@ static void cmd_print_format(RCore *core, const char *_input, const ut8* block,
 			if (path) {
 				files = r_sys_dir (path);
 				r_list_foreach (files, iter, fn) {
-					if (*fn != '.') {
+					if (is_pfo_file (fn)) {
 						r_cons_println (fn);
 					}
 				}