From 3f77b9a76b3f6abd0c0fd48040a8b821e22bc530 Mon Sep 17 00:00:00 2001 From: radare Date: Thu, 2 Apr 2020 14:30:27 +0200 Subject: [PATCH] Avoid duplicated module filenames to fix static.sh ##build (#16403) --- libr/asm/Makefile | 2 +- libr/asm/{code.c => acode.c} | 0 libr/asm/{op.c => aop.c} | 0 libr/asm/meson.build | 4 +-- libr/cons/Makefile | 2 +- libr/cons/{utf8.c => cutf8.c} | 0 libr/cons/meson.build | 2 +- libr/core/Makefile | 2 +- libr/core/{plugin.c => cplugin.c} | 0 libr/core/meson.build | 2 +- libr/debug/Makefile | 4 +-- libr/debug/{esil.c => desil.c} | 0 libr/debug/{map.c => dmap.c} | 0 libr/debug/{session.c => dsession.c} | 0 libr/debug/{signal.c => dsignal.c} | 0 libr/debug/meson.build | 8 +++--- libr/fs/Makefile | 2 +- libr/fs/{file.c => fs_file.c} | 0 libr/fs/meson.build | 2 +- libr/hash/Makefile | 2 +- libr/hash/{calc.c => hcalc.c} | 0 libr/hash/meson.build | 2 +- libr/io/Makefile | 2 +- libr/io/{cache.c => io_cache.c} | 0 libr/io/{plugin.c => io_plugin.c} | 0 libr/io/meson.build | 4 +-- libr/magic/apprentice.c | 2 +- libr/magic/{print.c => mdump.c} | 0 libr/reg/Makefile | 2 +- libr/reg/meson.build | 4 +-- libr/reg/{cond.c => rcond.c} | 0 libr/reg/{value.c => rvalue.c} | 0 libr/search/Makefile | 2 +- libr/search/meson.build | 4 +-- libr/search/search.c | 1 - libr/search/xrefs.c | 42 ---------------------------- libr/util/Makefile | 2 +- libr/util/meson.build | 2 +- libr/util/{ctype.c => utype.c} | 0 39 files changed, 28 insertions(+), 73 deletions(-) rename libr/asm/{code.c => acode.c} (100%) rename libr/asm/{op.c => aop.c} (100%) rename libr/cons/{utf8.c => cutf8.c} (100%) rename libr/core/{plugin.c => cplugin.c} (100%) rename libr/debug/{esil.c => desil.c} (100%) rename libr/debug/{map.c => dmap.c} (100%) rename libr/debug/{session.c => dsession.c} (100%) rename libr/debug/{signal.c => dsignal.c} (100%) rename libr/fs/{file.c => fs_file.c} (100%) rename libr/hash/{calc.c => hcalc.c} (100%) rename libr/io/{cache.c => io_cache.c} (100%) rename libr/io/{plugin.c => io_plugin.c} (100%) rename libr/magic/{print.c => mdump.c} (100%) rename libr/reg/{cond.c => rcond.c} (100%) rename libr/reg/{value.c => rvalue.c} (100%) delete mode 100644 libr/search/xrefs.c rename libr/util/{ctype.c => utype.c} (100%) diff --git a/libr/asm/Makefile b/libr/asm/Makefile index d9e96a7376..03f45d7bdc 100644 --- a/libr/asm/Makefile +++ b/libr/asm/Makefile @@ -30,7 +30,7 @@ plugins: ${LIBSO} ${LIBAR} include ${STATIC_ASM_PLUGINS} STATIC_OBJS=$(subst ..,p/..,$(subst asm_,p/asm_,$(STATIC_OBJ))) -OBJS=${STATIC_OBJS} asm.o code.o op.o +OBJS=${STATIC_OBJS} asm.o acode.o aop.o # hack to b OBJS+=${SHARED2_OBJ} diff --git a/libr/asm/code.c b/libr/asm/acode.c similarity index 100% rename from libr/asm/code.c rename to libr/asm/acode.c diff --git a/libr/asm/op.c b/libr/asm/aop.c similarity index 100% rename from libr/asm/op.c rename to libr/asm/aop.c diff --git a/libr/asm/meson.build b/libr/asm/meson.build index f5caa3d7fe..a96b6dabf2 100644 --- a/libr/asm/meson.build +++ b/libr/asm/meson.build @@ -1,7 +1,7 @@ r_asm_sources = [ 'asm.c', - 'op.c', - 'code.c', + 'aop.c', + 'acode.c', 'p/asm_6502.c', 'p/asm_6502_cs.c', 'p/asm_8051.c', diff --git a/libr/cons/Makefile b/libr/cons/Makefile index 8660b88fdc..a922e1278c 100644 --- a/libr/cons/Makefile +++ b/libr/cons/Makefile @@ -1,7 +1,7 @@ include ../config.mk NAME=r_cons -OBJS=cons.o pipe.o output.o grep.o less.o more.o pager.o utf8.o +OBJS=cons.o pipe.o output.o grep.o less.o more.o pager.o cutf8.o OBJS+=line.o hud.o rgb.o input.o pal.o editor.o 2048.o html.o OBJS+=canvas.o canvas_line.o stiv.o DEPS=r_util diff --git a/libr/cons/utf8.c b/libr/cons/cutf8.c similarity index 100% rename from libr/cons/utf8.c rename to libr/cons/cutf8.c diff --git a/libr/cons/meson.build b/libr/cons/meson.build index 12e294526a..de46939c15 100644 --- a/libr/cons/meson.build +++ b/libr/cons/meson.build @@ -18,7 +18,7 @@ r_cons_sources = [ 'pal.c', 'pipe.c', 'rgb.c', - 'utf8.c' + 'cutf8.c' ] r_cons = library('r_cons', r_cons_sources, diff --git a/libr/core/Makefile b/libr/core/Makefile index 31cf23c1d0..919c7a0721 100644 --- a/libr/core/Makefile +++ b/libr/core/Makefile @@ -8,7 +8,7 @@ DEPS+=r_reg r_search r_syscall r_socket r_fs r_magic r_crypto OBJS=core.o cmd.o cfile.o cconfig.o visual.o cio.o yank.o libs.o agraph.o OBJS+=fortune.o hack.o vasm.o patch.o cbin.o corelog.o rtr.o cmd_api.o -OBJS+=carg.o canal.o project.o gdiff.o casm.o disasm.o plugin.o +OBJS+=carg.o canal.o project.o gdiff.o casm.o disasm.o cplugin.o OBJS+=vmenus.o vmenus_graph.o vmenus_zigns.o zdiff.o citem.o OBJS+=task.o panels.o pseudo.o vmarks.o anal_tp.o anal_objc.o blaze.o cundo.o diff --git a/libr/core/plugin.c b/libr/core/cplugin.c similarity index 100% rename from libr/core/plugin.c rename to libr/core/cplugin.c diff --git a/libr/core/meson.build b/libr/core/meson.build index 1dbaad94ef..3c422e3747 100644 --- a/libr/core/meson.build +++ b/libr/core/meson.build @@ -49,7 +49,7 @@ r_core_sources = [ 'corelog.c', 'panels.c', 'patch.c', - 'plugin.c', + 'cplugin.c', 'project.c', 'pseudo.c', 'rtr.c', diff --git a/libr/debug/Makefile b/libr/debug/Makefile index 49342ec24c..1315d3d92f 100644 --- a/libr/debug/Makefile +++ b/libr/debug/Makefile @@ -23,8 +23,8 @@ CFLAGS+=-DXNU_USE_PTRACE=$(XNU_USE_PTRACE) STATIC_OBJS=$(subst ..,p/..,$(subst debug_,p/debug_,$(STATIC_OBJ))) -OBJS=signal.o map.o trace.o arg.o debug.o plugin.o snap.o session.o -OBJS+=pid.o dreg.o ddesc.o esil.o ${STATIC_OBJS} +OBJS=dsignal.o dmap.o trace.o arg.o debug.o plugin.o snap.o dsession.o +OBJS+=pid.o dreg.o ddesc.o desil.o ${STATIC_OBJS} ifeq (${OSTYPE},darwin) ifneq (${NATIVE_OBJS},) diff --git a/libr/debug/esil.c b/libr/debug/desil.c similarity index 100% rename from libr/debug/esil.c rename to libr/debug/desil.c diff --git a/libr/debug/map.c b/libr/debug/dmap.c similarity index 100% rename from libr/debug/map.c rename to libr/debug/dmap.c diff --git a/libr/debug/session.c b/libr/debug/dsession.c similarity index 100% rename from libr/debug/session.c rename to libr/debug/dsession.c diff --git a/libr/debug/signal.c b/libr/debug/dsignal.c similarity index 100% rename from libr/debug/signal.c rename to libr/debug/dsignal.c diff --git a/libr/debug/meson.build b/libr/debug/meson.build index 1c2cad75d3..13784cfc19 100644 --- a/libr/debug/meson.build +++ b/libr/debug/meson.build @@ -3,12 +3,12 @@ r_debug_sources = [ 'ddesc.c', 'debug.c', 'dreg.c', - 'esil.c', - 'map.c', + 'desil.c', + 'dmap.c', 'pid.c', 'plugin.c', - 'session.c', - 'signal.c', + 'dsession.c', + 'dsignal.c', 'snap.c', 'trace.c', 'p/bfvm.c', diff --git a/libr/fs/Makefile b/libr/fs/Makefile index 0f1ae7d9f2..aa80f372bf 100644 --- a/libr/fs/Makefile +++ b/libr/fs/Makefile @@ -16,7 +16,7 @@ foo: include ${STATIC_FS_PLUGINS} STATIC_OBJS=$(subst ..,p/..,$(subst fs_,p/fs_,$(STATIC_OBJ))) -OBJS=${STATIC_OBJS} fs.o file.o shell.o +OBJS=${STATIC_OBJS} fs.o fs_file.o shell.o #p/grub/main.o #p/grub/libgrubfs.a: diff --git a/libr/fs/file.c b/libr/fs/fs_file.c similarity index 100% rename from libr/fs/file.c rename to libr/fs/fs_file.c diff --git a/libr/fs/meson.build b/libr/fs/meson.build index 91e117e316..e4514208a6 100644 --- a/libr/fs/meson.build +++ b/libr/fs/meson.build @@ -1,5 +1,5 @@ r_fs_sources = [ - 'file.c', + 'fs_file.c', 'fs.c', 'shell.c', 'p/fs_cpio.c', diff --git a/libr/hash/Makefile b/libr/hash/Makefile index 2f60dea303..d4848cb355 100644 --- a/libr/hash/Makefile +++ b/libr/hash/Makefile @@ -12,7 +12,7 @@ endif DEPS=r_util OBJS=state.o hash.o hamdist.o crca.o fletcher.o -OBJS+=entropy.o calc.o adler32.o luhn.o +OBJS+=entropy.o hcalc.o adler32.o luhn.o ifeq ($(HAVE_LIB_SSL),1) CFLAGS+=${SSL_CFLAGS} diff --git a/libr/hash/calc.c b/libr/hash/hcalc.c similarity index 100% rename from libr/hash/calc.c rename to libr/hash/hcalc.c diff --git a/libr/hash/meson.build b/libr/hash/meson.build index 55e08e41f3..e8dd39cc61 100644 --- a/libr/hash/meson.build +++ b/libr/hash/meson.build @@ -1,6 +1,6 @@ r_hash_sources = [ 'adler32.c', - 'calc.c', + 'hcalc.c', 'crca.c', 'entropy.c', 'fletcher.c', diff --git a/libr/io/Makefile b/libr/io/Makefile index 58c79c1e81..98c83afb7a 100644 --- a/libr/io/Makefile +++ b/libr/io/Makefile @@ -6,7 +6,7 @@ DEPS+=r_socket DEPS+=r_cons STATIC_OBJS=$(subst ..,p/..,$(subst io_,p/io_,$(STATIC_OBJ))) OBJS=${STATIC_OBJS} -OBJS+=io.o plugin.o map.o desc.o cache.o p_cache.o undo.o ioutils.o fd.o +OBJS+=io.o io_plugin.o map.o desc.o io_cache.o p_cache.o undo.o ioutils.o fd.o CFLAGS+=-Wall -DR2_PLUGIN_INCORE diff --git a/libr/io/cache.c b/libr/io/io_cache.c similarity index 100% rename from libr/io/cache.c rename to libr/io/io_cache.c diff --git a/libr/io/plugin.c b/libr/io/io_plugin.c similarity index 100% rename from libr/io/plugin.c rename to libr/io/io_plugin.c diff --git a/libr/io/meson.build b/libr/io/meson.build index 8bcb595c7f..a54d62efba 100644 --- a/libr/io/meson.build +++ b/libr/io/meson.build @@ -1,11 +1,11 @@ r_io_sources = [ - 'cache.c', + 'io_cache.c', 'desc.c', 'fd.c', 'io.c', 'ioutils.c', 'map.c', - 'plugin.c', + 'io_plugin.c', 'undo.c', 'p_cache.c', 'p/io_ar.c', diff --git a/libr/magic/apprentice.c b/libr/magic/apprentice.c index 3d056472ba..5b3dd8cf6d 100644 --- a/libr/magic/apprentice.c +++ b/libr/magic/apprentice.c @@ -2080,4 +2080,4 @@ static void bs1(struct r_magic *m) { } #endif -#include "print.c" +#include "mdump.c" diff --git a/libr/magic/print.c b/libr/magic/mdump.c similarity index 100% rename from libr/magic/print.c rename to libr/magic/mdump.c diff --git a/libr/reg/Makefile b/libr/reg/Makefile index 00c96ce161..e64592aa77 100644 --- a/libr/reg/Makefile +++ b/libr/reg/Makefile @@ -2,6 +2,6 @@ include ../config.mk NAME=r_reg DEPS=r_util -OBJS=reg.o arena.o value.o cond.o double.o profile.o +OBJS=reg.o arena.o rvalue.o rcond.o double.o profile.o include ../rules.mk diff --git a/libr/reg/meson.build b/libr/reg/meson.build index 2c8fd97349..726c166d0a 100644 --- a/libr/reg/meson.build +++ b/libr/reg/meson.build @@ -1,10 +1,10 @@ r_reg_sources = [ 'arena.c', - 'cond.c', + 'rcond.c', 'double.c', 'profile.c', 'reg.c', - 'value.c', + 'rvalue.c', ] r_reg = library('r_reg', r_reg_sources, diff --git a/libr/reg/cond.c b/libr/reg/rcond.c similarity index 100% rename from libr/reg/cond.c rename to libr/reg/rcond.c diff --git a/libr/reg/value.c b/libr/reg/rvalue.c similarity index 100% rename from libr/reg/value.c rename to libr/reg/rvalue.c diff --git a/libr/search/Makefile b/libr/search/Makefile index efe5dc6ec9..f958bb2df0 100644 --- a/libr/search/Makefile +++ b/libr/search/Makefile @@ -2,7 +2,7 @@ include ../config.mk NAME=r_search OBJS=search.o bytepat.o strings.o aes-find.o privkey-find.o -OBJS+=regexp.o xrefs.o keyword.o +OBJS+=regexp.o keyword.o # OBJ+=rsakey.o DEPS=r_util CFLAGS+=-g diff --git a/libr/search/meson.build b/libr/search/meson.build index 4bc576b5fe..88a9007ef1 100644 --- a/libr/search/meson.build +++ b/libr/search/meson.build @@ -2,12 +2,10 @@ r_search_sources = [ 'aes-find.c', 'bytepat.c', 'keyword.c', - # 'old_xrefs.c', 'regexp.c', 'privkey-find.c', 'search.c', - 'strings.c', - 'xrefs.c', + 'strings.c' ] r_search = library('r_search', r_search_sources, diff --git a/libr/search/search.c b/libr/search/search.c index 14e134d039..539ebc3ec7 100644 --- a/libr/search/search.c +++ b/libr/search/search.c @@ -78,7 +78,6 @@ R_API int r_search_set_mode(RSearch *s, int mode) { s->update = NULL; switch (mode) { case R_SEARCH_KEYWORD: s->update = r_search_mybinparse_update; break; - case R_SEARCH_XREFS: s->update = r_search_xrefs_update; break; case R_SEARCH_REGEXP: s->update = r_search_regexp_update; break; case R_SEARCH_AES: s->update = r_search_aes_update; break; case R_SEARCH_STRING: s->update = r_search_strings_update; break; diff --git a/libr/search/xrefs.c b/libr/search/xrefs.c deleted file mode 100644 index 6f24a8f616..0000000000 --- a/libr/search/xrefs.c +++ /dev/null @@ -1,42 +0,0 @@ -/* radare - LGPL - Copyright 2007-2009 pancake */ - -#include "r_search.h" -//#include - -R_API int r_search_xrefs_update(RSearch *s, ut64 from, const ut8 *buf, int len) { -// ut8 code[1024]; -// ut8 mask[1024]; - int count = 0; - //get_delta_for( - //if (r_mem_cmp_mask(buf, code, mask, 4)) { - //} - return count; -} - -#if 0 - -struct r_xrefs_arch_t { - int align; // if arch requires align we can skip invalid addresses - int bigendian; - ut64 baseaddr; - ut64 targetaddr; // the addr we are looking for -}; - -the xrefs plugin will have a callback: - - - size of opcode to skip in bytes (mips/arm=4 f.ex) - int r_xrefs_x86(ut64 addr, int bigendian, ut64 baseaddr) - { - // check for calls, branches..and calculate target address - } - -Options we need to configure xrefs search plugin: - - endian - - base address - - target address - - from/to (defined as max for the maximum branch distance) - - architecture profile () - - TODO: ensure we are pointing to a function if following a 'call' - - we need per-arch plugins - -#endif diff --git a/libr/util/Makefile b/libr/util/Makefile index 5da3988aa3..701b0b489f 100644 --- a/libr/util/Makefile +++ b/libr/util/Makefile @@ -16,7 +16,7 @@ OBJS+=prof.o cache.o sys.o buf.o w32-sys.o ubase64.o base85.o base91.o OBJS+=list.o flist.o chmod.o graph.o event.o alloc.o donut.o OBJS+=regex/regcomp.o regex/regerror.o regex/regexec.o uleb128.o OBJS+=sandbox.o calc.o thread.o thread_sem.o thread_lock.o thread_cond.o -OBJS+=strpool.o bitmap.o date.o format.o pie.o print.o ctype.o +OBJS+=strpool.o bitmap.o date.o format.o pie.o print.o utype.o OBJS+=seven.o randomart.o zip.o debruijn.o log.o getopt.o table.o OBJS+=utf8.o utf16.o utf32.o strbuf.o lib.o name.o spaces.o signal.o syscmd.o OBJS+=udiff.o bdiff.o stack.o queue.o tree.o idpool.o assert.o diff --git a/libr/util/meson.build b/libr/util/meson.build index 9556dca4ca..4c043113c0 100644 --- a/libr/util/meson.build +++ b/libr/util/meson.build @@ -44,7 +44,7 @@ r_util_sources = [ 'astr.c', 'pkcs7.c', 'x509.c', - 'ctype.c', + 'utype.c', 'randomart.c', 'range.c', 'rbtree.c', diff --git a/libr/util/ctype.c b/libr/util/utype.c similarity index 100% rename from libr/util/ctype.c rename to libr/util/utype.c