From 3b490556f52695e5529f30f8c99fff1dc90a229a Mon Sep 17 00:00:00 2001 From: pancake Date: Mon, 4 Apr 2011 14:39:42 +0200 Subject: [PATCH] * Do not export drx_get and drg_set * Do not build/use r_th --- binr/radare2/radare2.c | 9 ++++++--- configure | 2 +- libr/Makefile | 2 +- libr/debug/p/debug_native.c | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/binr/radare2/radare2.c b/binr/radare2/radare2.c index e9ea2d9a01..330f32cbe3 100644 --- a/binr/radare2/radare2.c +++ b/binr/radare2/radare2.c @@ -1,7 +1,7 @@ /* radare - LGPL - Copyright 2009-2011 pancake */ #include -#include +//#include #include #include #include @@ -70,8 +70,10 @@ static int rabin_delegate(RThread *th) { #endif int main(int argc, char **argv) { +/* RThreadLock *lock = NULL; RThread *rabin_th = NULL; +*/ RCoreFile *fh = NULL; //int threaded = R_FALSE; int has_project = R_FALSE; @@ -278,10 +280,10 @@ int main(int argc, char **argv) { do { if (r_core_prompt (&r, R_FALSE)<1) break; - if (lock) r_th_lock_enter (lock); +// if (lock) r_th_lock_enter (lock); if ((ret = r_core_prompt_exec (&r))==-1) eprintf ("Invalid command\n"); - if (lock) r_th_lock_leave (lock); +/* if (lock) r_th_lock_leave (lock); if (rabin_th && !r_th_wait_async (rabin_th)) { eprintf ("rabin thread end \n"); r_th_free (rabin_th); @@ -289,6 +291,7 @@ int main(int argc, char **argv) { lock = NULL; rabin_th = NULL; } +*/ } while (ret != R_CORE_CMD_EXIT); if (debug) { diff --git a/configure b/configure index 2bd2cbf983..c6cfc1e1f5 100755 --- a/configure +++ b/configure @@ -393,7 +393,7 @@ for A in ${ENVWORDS} ; do SEDFLAGS="${SEDFLAGS}s,@${A}@,${VAR},g;" done SEDFLAGS="${SEDFLAGS}'" -for A in ./config-user.mk libr/include/r_userconf.h pkgcfg/r_io.pc pkgcfg/r_asm.pc pkgcfg/r_bin.pc pkgcfg/r_anal.pc pkgcfg/r_hash.pc pkgcfg/r_cons.pc pkgcfg/r_diff.pc pkgcfg/r_core.pc pkgcfg/r_lang.pc pkgcfg/r_socket.pc pkgcfg/r_debug.pc pkgcfg/r_reg.pc pkgcfg/r_cmd.pc pkgcfg/r_config.pc pkgcfg/r_flags.pc pkgcfg/r_line.pc pkgcfg/r_syscall.pc pkgcfg/r_sign.pc pkgcfg/r_util.pc pkgcfg/r_search.pc pkgcfg/r_th.pc pkgcfg/r_bp.pc pkgcfg/r_db.pc pkgcfg/r_lib.pc pkgcfg/r_parse.pc pkgcfg/r_print.pc pkgcfg/r_fs.pc ; do # SUBDIRS +for A in ./config-user.mk libr/include/r_userconf.h pkgcfg/r_io.pc pkgcfg/r_asm.pc pkgcfg/r_bin.pc pkgcfg/r_anal.pc pkgcfg/r_hash.pc pkgcfg/r_cons.pc pkgcfg/r_diff.pc pkgcfg/r_core.pc pkgcfg/r_lang.pc pkgcfg/r_socket.pc pkgcfg/r_debug.pc pkgcfg/r_reg.pc pkgcfg/r_cmd.pc pkgcfg/r_config.pc pkgcfg/r_flags.pc pkgcfg/r_line.pc pkgcfg/r_syscall.pc pkgcfg/r_sign.pc pkgcfg/r_util.pc pkgcfg/r_search.pc pkgcfg/r_bp.pc pkgcfg/r_db.pc pkgcfg/r_lib.pc pkgcfg/r_parse.pc pkgcfg/r_print.pc pkgcfg/r_fs.pc ; do # SUBDIRS if [ -f "${VPATH}/${A}.acr" ]; then SD_TARGET=${A} else diff --git a/libr/Makefile b/libr/Makefile index 3d18de0f95..a74cc4ef07 100644 --- a/libr/Makefile +++ b/libr/Makefile @@ -8,7 +8,7 @@ PWD=`pwd` # Libraries LIBLIST=util socket cons line lib io lang flags bin hash config syscall cmd -LIBLIST+=reg asm diff anal print parse search bp sign th db crypto debug fs core +LIBLIST+=reg asm diff anal print parse search bp sign db crypto debug fs core # sysproxy ... common wat du? all: libs diff --git a/libr/debug/p/debug_native.c b/libr/debug/p/debug_native.c index d8441fd65d..0fb22d406b 100644 --- a/libr/debug/p/debug_native.c +++ b/libr/debug/p/debug_native.c @@ -1481,12 +1481,12 @@ static int r_debug_native_init(RDebug *dbg) { } #if __i386__ || __x86_64__ -int drx_add(RDebug *dbg, ut64 addr, int rwx) { +static int drx_add(RDebug *dbg, ut64 addr, int rwx) { // TODO return R_FALSE; } -int drx_del(RDebug *dbg, ut64 addr, int rwx) { +static int drx_del(RDebug *dbg, ut64 addr, int rwx) { // TODO return R_FALSE; }