Avoid duplicated module filenames to fix static.sh ##build (#16403)

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}
 

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',

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

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,

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
 

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',

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},)

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',

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:

libr/fs/meson.build

@@ -1,5 +1,5 @@
 r_fs_sources = [
-  'file.c',
+  'fs_file.c',
   'fs.c',
   'shell.c',
   'p/fs_cpio.c',

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}

libr/hash/meson.build

@@ -1,6 +1,6 @@
 r_hash_sources = [
   'adler32.c',
-  'calc.c',
+  'hcalc.c',
   'crca.c',
   'entropy.c',
   'fletcher.c',

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
 

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',

libr/magic/apprentice.c

@@ -2080,4 +2080,4 @@ static void bs1(struct r_magic *m) {
 }
 #endif
 
-#include "print.c"
+#include "mdump.c"

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

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,

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

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,

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;

libr/search/xrefs.c

@@ -1,42 +0,0 @@
-/* radare - LGPL - Copyright 2007-2009 pancake<nopcode.org> */
-
-#include "r_search.h"
-//#include <regex.h>
-
-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

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

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',