Move bin.pdb into bin.formats.pdb

libr/anal/type_pdb.c

@@ -1,7 +1,9 @@
+/* radare - LGPL - Copyright 2020-2022 - HoundThe, Florian Markl */
+
 #include <r_bin.h>
 #include <r_core.h>
 #include <r_anal.h>
-#include "../bin/pdb/types.h"
+#include "../bin/format/pdb/types.h"
 #include "base_types.h"
 
 static bool is_parsable_type(const ELeafType type) {

libr/bin/Makefile

@@ -29,7 +29,6 @@ OBJS+=mangling/objc.o mangling/cxx.o mangling/msvc.o
 OBJS+=mangling/swift.o mangling/swift-sd.o
 OBJS+=mangling/java.o
 OBJS+=mangling/rust.o
-OBJS+=pdb/pdb_downloader.o pdb/omap.o pdb/stream_pe.o pdb/gdata.o
-OBJS+=pdb/fpo.o pdb/dbi.o pdb/tpi.o pdb/stream_file.o pdb/pdb.o
 
+include $(TOP)/libr/bin/format/pdb/deps.mk
 include $(TOP)/libr/rules.mk

libr/bin/format/pdb/deps.mk

@@ -0,0 +1,3 @@
+
+OBJS+=format/pdb/pdb_downloader.o format/pdb/omap.o format/pdb/stream_pe.o format/pdb/gdata.o
+OBJS+=format/pdb/fpo.o format/pdb/dbi.o format/pdb/tpi.o format/pdb/stream_file.o format/pdb/pdb.o

libr/bin/meson.build

@@ -121,6 +121,16 @@ r_bin_sources = [
   join_paths('format','wasm','wasm.c'),
   join_paths('format','zimg','zimg.c'),
 
+  join_paths('format/pdb','dbi.c'),
+  join_paths('format/pdb','fpo.c'),
+  join_paths('format/pdb','gdata.c'),
+  join_paths('format/pdb','omap.c'),
+  join_paths('format/pdb','pdb.c'),
+  join_paths('format/pdb','pdb_downloader.c'),
+  join_paths('format/pdb','stream_file.c'),
+  join_paths('format/pdb','stream_pe.c'),
+  join_paths('format/pdb','tpi.c'),
+
   join_paths('mangling','cxx.c'),
   join_paths('mangling','cxx','cp-demangle.c'),
   join_paths('mangling','demangler.c'),
@@ -130,17 +140,7 @@ r_bin_sources = [
   join_paths('mangling','msvc.c'),
   join_paths('mangling','objc.c'),
   join_paths('mangling','swift-sd.c'),
-  join_paths('mangling','swift.c'),
-
-  join_paths('pdb','dbi.c'),
-  join_paths('pdb','fpo.c'),
-  join_paths('pdb','gdata.c'),
-  join_paths('pdb','omap.c'),
-  join_paths('pdb','pdb.c'),
-  join_paths('pdb','pdb_downloader.c'),
-  join_paths('pdb','stream_file.c'),
-  join_paths('pdb','stream_pe.c'),
-  join_paths('pdb','tpi.c')
+  join_paths('mangling','swift.c')
 ]
 
 r_bin_sources += r_bin_d_sources

libr/core/cmd_info.c

@@ -1,7 +1,7 @@
 /* radare - LGPL - Copyright 2009-2022 - pancake */
 
 #include <r_core.h>
-#include "../bin/pdb/pdb_downloader.h"
+#include "../bin/format/pdb/pdb_downloader.h"
 
 static const char *help_msg_i[] = {
 	"Usage: i", "", "Get info from opened file (see rabin2's manpage)",

libr/main/rabin2.c

@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <r_main.h>
-#include "../../libr/bin/pdb/pdb_downloader.h"
+#include "../../libr/bin/format/pdb/pdb_downloader.h"
 
 static int rabin_show_help(int v) {
 	printf ("Usage: rabin2 [-AcdeEghHiIjlLMqrRsSUvVxzZ] [-@ at] [-a arch] [-b bits] [-B addr]\n"

test/unit/test_pdb.c

@@ -3,7 +3,7 @@
 #include <r_bin.h>
 #include <r_core.h>
 #include <r_bin_dwarf.h>
-#include "../../libr/bin/pdb/types.h"
+#include "../../libr/bin/format/pdb/types.h"
 
 #define MODE 2