rizinorg/rizin
1
0
Fork 0
mirror of https://github.com/rizinorg/rizin.git synced 2026-10-12 02:21:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

More Rizin renames

Browse Source
This commit is contained in:
Anton Kochkov
2021-01-05 05:21:41 -06:00
committed by Anton Kochkov
parent 58c21272ad
commit e9d91af698
47 changed files with 109 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binrz/Makefile
+5 -5
View File
@@ -12,7 +12,7 @@ ifeq ($(WANT_RZ_TEST),1)
BINS+=rz-test
endif
LIBR2=$(call libname-version,librz.$(EXT_SO),${LIBVERSION})
LIBRZ=$(call libname-version,librz.$(EXT_SO),${LIBVERSION})
all: preload
@for BINARY in $(BINS) ; do $(MAKE) -C $${BINARY} all || exit 1; done
@@ -36,8 +36,8 @@ install:
ifeq ($(WITHPIC),1)
${INSTALL_LIB} "preload/librz.$(EXT_SO)" "${DESTDIR}${LIBDIR}"
-cd "${DESTDIR}${LIBDIR}" && \
mv librz.$(EXT_SO) $(LIBR2) && \
ln -fs $(LIBR2) librz.$(EXT_SO)
mv librz.$(EXT_SO) $(LIBRZ) && \
ln -fs $(LIBRZ) librz.$(EXT_SO)
endif
ios_sign ios-sign ios-sdk-sign:
@@ -54,8 +54,8 @@ symstall install-symlink:
cd .. && mkdir -p "${DESTDIR}${DATADIR}/rizin/${VERSION}/"
-cd .. && ln -fs "${BTOP}/preload/librz.$(EXT_SO)" "${DESTDIR}${LIBDIR}/librz.$(EXT_SO)"
-cd .. && cd "${DESTDIR}${LIBDIR}" && \
mv librz.$(EXT_SO) $(LIBR2) && \
ln -fs $(LIBR2) librz.$(EXT_SO)
mv librz.$(EXT_SO) $(LIBRZ) && \
ln -fs $(LIBRZ) librz.$(EXT_SO)
deinstall uninstall:
-cd .. ; \
binrz/rizin/Makefile
+1 -1
View File
@@ -16,7 +16,7 @@ ENTITL=rizin.xcent
#LDFLAGS+=-flto
CFLAGS_INCLUDES+=-I$(SHLR)/sdb/src
CFLAGS_INCLUDES+=-I$(LIBR)/include
CFLAGS_INCLUDES+=-I$(LIBRZ)/include
ifeq (${COMPILER},emscripten)
# https://kripken.github.io/emscripten-site/docs/optimizing/Optimizing-Code.html
binrz/rules.mk
+1 -1
View File
@@ -59,7 +59,7 @@ endif
all: ${BEXE} ${BINS}
ifeq ($(WITH_LIBR),1)
ifeq ($(WITH_LIBRZ),1)
${BINS}: ${OBJS}
${CC} ${CFLAGS} $@.c ${OBJS} ../../librz/librz.a -o $@ $(LDFLAGS)
config-user.mk.acr
+1 -1
View File
@@ -18,7 +18,7 @@ USE_RPATH=@USE_RPATH@
HAVE_JEMALLOC=@HAVE_JEMALLOC@
HAVE_FORK=@HAVE_FORK@
WANT_DYLINK=@WANT_DYLINK@
WITH_LIBR=@WITH_LIBR@
WITH_LIBRZ=@WITH_LIBRZ@
WANT_RZ_TEST=@WANT_RZ_TEST@
MKPLUGINS=
configure
Vendored
+3 -3
View File
@@ -25,7 +25,7 @@ LOADLIBS=1
WANT_DYLINK=1
HAVE_FORK=1
WANT_PTRACE_WRAP=1
WITH_LIBR=0
WITH_LIBRZ=0
WITH_CAPSTONE=0
USE_ZIP=0
USE_XXHASH=0
@@ -319,7 +319,7 @@ echo "FLAGS: --disable-debugger --with-sysmagic --with-capstone5 --disable-l
"--without-dylink") WANT_DYLINK="0"; ;;
"--without-fork") HAVE_FORK="0"; ;;
"--without-ptrace-wrap") WANT_PTRACE_WRAP="0"; ;;
"--with-librz") WITH_LIBR="1"; ;;
"--with-librz") WITH_LIBRZ="1"; ;;
"--with-syscapstone") WITH_CAPSTONE="1"; ;;
"--with-syszip") USE_ZIP="1"; ;;
"--with-sysxxhash") USE_XXHASH="1"; ;;
@@ -350,7 +350,7 @@ parse_options "$1"
shift
done
ENVWORDS="MANDIR INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR SYSCONFDIR DATADIR DOCDIR LIBEXECDIR SBINDIR BINDIR EPREFIX PREFIX SPREFIX TARGET HOST BUILD INSTALL INSTALL_LIB INSTALL_MAN INSTALL_PROGRAM INSTALL_PROGRAM_STRIP INSTALL_DIR INSTALL_SCRIPT INSTALL_DATA HOST_OS HOST_CPU BUILD_OS BUILD_CPU TARGET_OS TARGET_CPU VERSION VERSION_MAJOR VERSION_MINOR VERSION_PATCH VERSION_NUMBER PKGNAME VPATH CONTACT CONTACT_NAME CONTACT_MAIL CC CFLAGS CPPFLAGS LDFLAGS HAVE_LANG_C DEBUGGER HAVE_LIB_DL DL_LIBS HAVE_PATCH PATCH HAVE_GIT GIT HAVE_LIB_MAGIC USE_MAGIC USE_LIB_MAGIC LIBMAGIC CSNEXT LOADLIBS WANT_DYLINK HAVE_FORK WANT_PTRACE_WRAP WITH_LIBR WITH_CAPSTONE CAPSTONE_CFLAGS CAPSTONE_LDFLAGS HAVE_PKGCFG_CAPSTONE USE_CAPSTONE HAVE_LIB_Z HAVE_LIB_ZIP USE_ZIP USE_LIB_ZIP LIBZIP HAVE_LIB_XXHASH USE_XXHASH USE_LIB_XXHASH LIBXXHASH WITH_GPL HAVE_DECL_ADDR_NO_RANDOMIZE HAVE_DECL___GLIBC__ HAVE_ARC4RANDOM_UNIFORM HAVE_EXPLICIT_BZERO HAVE_EXPLICIT_MEMSET HAVE_CLOCK_NANOSLEEP HAVE_SIGACTION HAVE_CLOCK_GETTIME HAVE_PIPE HAVE_EXECV HAVE_EXECVE HAVE_EXECVP HAVE_EXECL HAVE_SYSTEM HAVE_PIPE2 CLOCK_LDFLAGS SUPPORT_GNU99 NEWSHELL_CFLAGS SUPPORT_C99 HAVE_LIB_GMP HAVE_LIB_SSL SSL_CFLAGS SSL_LDFLAGS HAVE_PKGCFG_OPENSSL HAVE_OPENSSL WANT_OPENSSL HAVE_LIBUV_VERSION_1_0_0 LIBUV_CFLAGS LIBUV_LDFLAGS HAVE_PKGCFG_LIBUV HAVE_LIBUV WANT_LIBUV USE_RPATH USERCC USEROSTYPE LIBVERSION HAVE_JEMALLOC HAVE_PTRACE USE_PTRACE_WRAP WANT_RZ_TEST RZ_CHECKS_LEVEL"
ENVWORDS="MANDIR INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR SYSCONFDIR DATADIR DOCDIR LIBEXECDIR SBINDIR BINDIR EPREFIX PREFIX SPREFIX TARGET HOST BUILD INSTALL INSTALL_LIB INSTALL_MAN INSTALL_PROGRAM INSTALL_PROGRAM_STRIP INSTALL_DIR INSTALL_SCRIPT INSTALL_DATA HOST_OS HOST_CPU BUILD_OS BUILD_CPU TARGET_OS TARGET_CPU VERSION VERSION_MAJOR VERSION_MINOR VERSION_PATCH VERSION_NUMBER PKGNAME VPATH CONTACT CONTACT_NAME CONTACT_MAIL CC CFLAGS CPPFLAGS LDFLAGS HAVE_LANG_C DEBUGGER HAVE_LIB_DL DL_LIBS HAVE_PATCH PATCH HAVE_GIT GIT HAVE_LIB_MAGIC USE_MAGIC USE_LIB_MAGIC LIBMAGIC CSNEXT LOADLIBS WANT_DYLINK HAVE_FORK WANT_PTRACE_WRAP WITH_LIBRZ WITH_CAPSTONE CAPSTONE_CFLAGS CAPSTONE_LDFLAGS HAVE_PKGCFG_CAPSTONE USE_CAPSTONE HAVE_LIB_Z HAVE_LIB_ZIP USE_ZIP USE_LIB_ZIP LIBZIP HAVE_LIB_XXHASH USE_XXHASH USE_LIB_XXHASH LIBXXHASH WITH_GPL HAVE_DECL_ADDR_NO_RANDOMIZE HAVE_DECL___GLIBC__ HAVE_ARC4RANDOM_UNIFORM HAVE_EXPLICIT_BZERO HAVE_EXPLICIT_MEMSET HAVE_CLOCK_NANOSLEEP HAVE_SIGACTION HAVE_CLOCK_GETTIME HAVE_PIPE HAVE_EXECV HAVE_EXECVE HAVE_EXECVP HAVE_EXECL HAVE_SYSTEM HAVE_PIPE2 CLOCK_LDFLAGS SUPPORT_GNU99 NEWSHELL_CFLAGS SUPPORT_C99 HAVE_LIB_GMP HAVE_LIB_SSL SSL_CFLAGS SSL_LDFLAGS HAVE_PKGCFG_OPENSSL HAVE_OPENSSL WANT_OPENSSL HAVE_LIBUV_VERSION_1_0_0 LIBUV_CFLAGS LIBUV_LDFLAGS HAVE_PKGCFG_LIBUV HAVE_LIBUV WANT_LIBUV USE_RPATH USERCC USEROSTYPE LIBVERSION HAVE_JEMALLOC HAVE_PTRACE USE_PTRACE_WRAP WANT_RZ_TEST RZ_CHECKS_LEVEL"
create_environ
configure.acr
+1 -1
View File
@@ -30,7 +30,7 @@ ARG_WITHOUT WANT_DYLINK dylink disable support for dynamic loading of plugins ;
ARG_WITHOUT HAVE_FORK fork disable fork ;
ARG_WITHOUT WANT_PTRACE_WRAP ptrace-wrap disable ptrace-wrap build ;
ARG_WITH WITH_LIBR librz build librz.a and librz.dylib ;
ARG_WITH WITH_LIBRZ librz build librz.a and librz.dylib ;
ARG_WITH WITH_CAPSTONE syscapstone force to use system-wide capstone ;
IF WITH_CAPSTONE {
librz/Makefile
+5 -5
View File
@@ -45,12 +45,12 @@ endif
ifneq ($(LIBS8),)
$(MAKE) $(LIBS8)
endif
ifeq ($(WITH_LIBR),1)
ifeq ($(WITH_LIBRZ),1)
$(MAKE) librz.${EXT_AR}
$(MAKE) librz.${EXT_SO}
endif
ifeq ($(WITH_LIBR),1)
ifeq ($(WITH_LIBRZ),1)
ifeq ($(CC),emcc)
MLFLAGS=
@@ -147,13 +147,13 @@ endif
else
# WITH_LIBR=0
# WITH_LIBRZ=0
librz.${EXT_SO}:
$(MAKE) librz.${EXT_SO} WITH_LIBR=1
$(MAKE) librz.${EXT_SO} WITH_LIBRZ=1
librz.${EXT_AR}:
$(MAKE) librz.${EXT_AR} WITH_LIBR=1
$(MAKE) librz.${EXT_AR} WITH_LIBRZ=1
endif
../shlr/librz_shlr.${EXT_AR}:
librz/analysis/p/rsp.mk
+1 -1
View File
@@ -1,5 +1,5 @@
OBJ_RSP=analysis_rsp.o
#RSP_ROOT=$(LIBR)/asm/arch/rsp
#RSP_ROOT=$(LIBRZ)/asm/arch/rsp
CFLAGS+=-I../asm/arch/rsp
STATIC_OBJ+=${OBJ_RSP}
librz/asm/p/cr16.mk
+1 -1
View File
@@ -1,5 +1,5 @@
OBJ_CR16=asm_cr16.o
CR16_ROOT=$(LIBR)/asm/arch/cr16
CR16_ROOT=$(LIBRZ)/asm/arch/cr16
OBJ_CR16+=$(CR16_ROOT)/cr16_disas.o
CFLAGS+=-I$(CR16_ROOT)
librz/asm/p/ebc.mk
+1 -1
View File
@@ -1,4 +1,4 @@
EBC_ROOT=$(LIBR)/asm/arch/ebc
EBC_ROOT=$(LIBRZ)/asm/arch/ebc
OBJ_EBC=asm_ebc.o
OBJ_EBC+=$(EBC_ROOT)/ebc_disas.o
CFLAGS+=-I$(EBC_ROOT)
librz/asm/p/h8300.mk
+1 -1
View File
@@ -1,5 +1,5 @@
OBJ_H8300=asm_h8300.o
H8300_ROOT=$(LIBR)/asm/arch/h8300
H8300_ROOT=$(LIBRZ)/asm/arch/h8300
OBJ_H8300+=$(H8300_ROOT)/h8300_disas.o
CFLAGS+=-I$(H8300_ROOT)
librz/asm/p/msp430.mk
+2 -2
View File
@@ -1,6 +1,6 @@
OBJ_MSP430=asm_msp430.o
OBJ_MSP430+=$(LIBR)/asm/arch/msp430/msp430_disas.o
CFLAGS+=-I$(LIBR)/asm/arch/msp430/
OBJ_MSP430+=$(LIBRZ)/asm/arch/msp430/msp430_disas.o
CFLAGS+=-I$(LIBRZ)/asm/arch/msp430/
STATIC_OBJ+=${OBJ_MSP430}
TARGET_MSP430=asm_msp430.${EXT_SO}
librz/asm/p/pyc.mk
+1 -1
View File
@@ -1,4 +1,4 @@
PYC_ROOT=$(LIBR)/asm/arch/pyc
PYC_ROOT=$(LIBRZ)/asm/arch/pyc
OBJ_PYC=asm_pyc.o
OBJ_PYC+=$(PYC_ROOT)/opcode_10.o
OBJ_PYC+=$(PYC_ROOT)/opcode_11.o
librz/asm/p/rsp.mk
+1 -1
View File
@@ -1,5 +1,5 @@
OBJ_RSP=asm_rsp.o
RSP_ROOT=$(LIBR)/asm/arch/rsp
RSP_ROOT=$(LIBRZ)/asm/arch/rsp
OBJ_RSP+=$(RSP_ROOT)/rsp_idec.o
CFLAGS+=-I$(RSP_ROOT)
librz/asm/p/v850.mk
+2 -2
View File
@@ -1,6 +1,6 @@
OBJ_V850=asm_v850.o
OBJ_V850+=$(LIBR)/asm/arch/v850/v850_disas.o
CFLAGS+=-I$(LIBR)/asm/arch/v850
OBJ_V850+=$(LIBRZ)/asm/arch/v850/v850_disas.o
CFLAGS+=-I$(LIBRZ)/asm/arch/v850
STATIC_OBJ+=${OBJ_V850}
librz/asm/p/wasm.mk
+1 -1
View File
@@ -1,4 +1,4 @@
WASM_ROOT=$(LIBR)/asm/arch/wasm
WASM_ROOT=$(LIBRZ)/asm/arch/wasm
OBJ_WASM=asm_wasm.o
OBJ_WASM+=$(WASM_ROOT)/wasm.o
CFLAGS+=-I$(WASM_ROOT)
librz/bin/Makefile
+1 -1
View File
@@ -17,7 +17,7 @@ include ${STATIC_BIN_XTR_PLUGINS}
include ${STATIC_BIN_LDR_PLUGINS}
include $(SHLR)/java/deps.mk
include $(SHLR)/ar/deps.mk
include $(LIBR)/magic/deps.mk
include $(LIBRZ)/magic/deps.mk
STATIC_OBJS=$(addprefix $(LTOP)/bin/p/, $(STATIC_OBJ))
OBJS=bin.o dbginfo.o bin_ldr.o bin_write.o demangle.o
librz/bin/d/jni.h
+1 -1
View File
@@ -25,7 +25,7 @@
#define JNI_H_
#if __R2TINYC__
#if __RZTINYC__
typedef char* va_list;
#else
#include <stdarg.h>
librz/bin/pdb/pdb.c
-1
View File
@@ -233,7 +233,6 @@ static int init_pdb7_root_stream(RzPdb *pdb, int *root_page_list, int pages_amou
}
///////////////////////////////////////////////////////////////////////////////
// R2: ugly indentation
// static void init_parsed_pdb_stream(SParsedPDBStream *pdb_stream, FILE *fp, int *pages,
// int pages_amount, int index, int size,
// int page_size, f_load pLoad)
librz/config.mk.tail
+13 -13
View File
@@ -1,39 +1,39 @@
# config.mk.tail
LIBR:=$(abspath $(dir $(lastword $(MAKEFILE_LIST))))
LIBRZ:=$(abspath $(dir $(lastword $(MAKEFILE_LIST))))
# neat???!? trick to support path with spaces
null:=
SPACE:=$(null) $(null)
ifeq ($(LIBR),)
ifeq ($(R2DIR),)
$(error ERROR: Cannot find R2DIR. Please define this variable)
ifeq ($(LIBRZ),)
ifeq ($(RZDIR),)
$(error ERROR: Cannot find RZDIR. Please define this variable)
else
LIBR=$(R2DIR)/librz
MSVC=$(R2DIR)/msvc
LIBRZ=$(RZDIR)/librz
MSVC=$(RZDIR)/msvc
endif
endif
SHLR:=$(LIBR)/../shlr
SHLR:=$(LIBRZ)/../shlr
#include $(LIBR)/../config-user.mk
include $(LIBR)/../global.mk
include $(LIBR)/../mk/${COMPILER}.mk
#include $(LIBRZ)/../config-user.mk
include $(LIBRZ)/../global.mk
include $(LIBRZ)/../mk/${COMPILER}.mk
CFLAGS+=${CFLAGS_APPEND}
CFLAGS+=${CPPFLAGS}
ifeq (1,1)
#$(WITHPIC),1)
LINK+=$(subst rz_,-L$(LIBR)/,$(RZ_DEPS))
LINK+=$(subst rz_,-L$(LIBRZ)/,$(RZ_DEPS))
LINK+=$(subst rz_,-lrz_,$(RZ_DEPS))
LINK+=$(subst rz_,-L$(LIBR)/,$(BINDEPS))
LINK+=$(subst rz_,-L$(LIBRZ)/,$(BINDEPS))
LINK+=$(subst rz_,-lrz_,$(BINDEPS))
CFLAGS+=${PIC_CFLAGS}
LINK+=${PIC_CFLAGS}
else
ifneq ($(RZ_DEPS),)
LINK+=$(shell echo ${RZ_DEPS} | sed -e 's:rz_\([^ ]\+\):$(LIBR)/\1/libr_\1.${EXT_AR}:g')
LINK+=$(shell echo ${RZ_DEPS} | sed -e 's:rz_\([^ ]\+\):$(LIBRZ)/\1/librz_\1.${EXT_AR}:g')
endif
endif
librz/core/p/java.mk
+1 -1
View File
@@ -25,5 +25,5 @@ ${CORE_TARGET_JAVA}: ${CORE_OBJ_JAVA}
${CORE_OBJ_JAVA} ${CORE_SHARED2_JAVA} \
$(SHLR)/java/librz_java.$(EXT_AR) \
$(SHLR)/sdb/src/libsdb.$(EXT_AR) \
-L$(LIBR)/crypto -lrz_crypto
-L$(LIBRZ)/crypto -lrz_crypto
endif
librz/include/rz_project.h
+2 -2
View File
@@ -1,6 +1,6 @@
#ifndef R2_PROJECT_H
#define R2_PROJECT_H
#ifndef RZ_PROJECT_H
#define RZ_PROJECT_H
#include <rz_util/rz_serialize.h>
#include <rz_core.h>
librz/include/rz_userconf.h.acr
+3 -3
View File
@@ -28,7 +28,7 @@
#define RZ_PLUGINS "@PLUGINS@"
#define RZ_EXTRAS "@EXTRAS@"
#define RZ_BINDINGS "@BINDINGS@"
#define RZ_DATDIR_R2 "@DATADIR_R2@"
#define RZ_DATDIR_RZ "@DATADIR_RZ@"
#define RZ_SDB "@SDB@"
#define RZ_ZIGNS "@ZIGNS@"
#define RZ_THEMES "@THEMES@"
@@ -55,7 +55,7 @@
#define RZ_EXTRAS "lib/rizin-extras/" RZ_VERSION
#define RZ_BINDINGS "lib/rizin-bindings/" RZ_VERSION
#endif
#define RZ_DATDIR_R2 RZ_JOIN_2_PATHS ("share", "rizin")
#define RZ_DATDIR_RZ RZ_JOIN_2_PATHS ("share", "rizin")
#define RZ_SDB RZ_JOIN_3_PATHS ("share", "rizin", RZ_VERSION)
#define RZ_ZIGNS RZ_JOIN_4_PATHS ("share", "rizin", RZ_VERSION, "zigns")
#define RZ_THEMES RZ_JOIN_4_PATHS ("share", "rizin", RZ_VERSION, "cons")
@@ -89,7 +89,7 @@
#define RZ_HOME_RC RZ_JOIN_2_PATHS (RZ_HOME_CONFIGDIR, "rizinrc")
#define RZ_HOME_RC_DIR RZ_JOIN_2_PATHS (RZ_HOME_CONFIGDIR, "rizinrc.d")
#define RZ_GLOBAL_RC RZ_JOIN_2_PATHS (RZ_DATDIR_R2, "rizinrc")
#define RZ_GLOBAL_RC RZ_JOIN_2_PATHS (RZ_DATDIR_RZ, "rizinrc")
#define HAVE_LIB_MAGIC @HAVE_LIB_MAGIC@
#define USE_LIB_MAGIC @USE_LIB_MAGIC@
librz/io/p/bochs.mk
+1 -1
View File
@@ -8,7 +8,7 @@ LIB_PATH=$(SHLR)/bochs/
CFLAGS+=-I$(SHLR)/bochs/include/
LDFLAGS+=$(SHLR)/bochs/lib/libbochs.$(EXT_AR)
include $(LIBR)/socket/deps.mk
include $(LIBRZ)/socket/deps.mk
ifeq (${WITHPIC},0)
LINKFLAGS=../../socket/librz_socket.a
librz/io/p/gdb.mk
+1 -1
View File
@@ -8,7 +8,7 @@ LIB_PATH=$(SHLR)/gdb/
CFLAGS+=-I$(SHLR)/gdb/include/
LDFLAGS+=$(SHLR)/gdb/lib/libgdbr.$(EXT_AR)
include $(LIBR)/socket/deps.mk
include $(LIBRZ)/socket/deps.mk
ifeq (${WITHPIC},0)
LINKFLAGS=../../socket/librz_socket.a
librz/io/p/io_rzk_linux.h
+2 -2
View File
@@ -1,5 +1,5 @@
#ifndef __IO_R2K_LINUX_H__
#define __IO_R2K_LINUX_H__
#ifndef __IO_RZK_LINUX_H__
#define __IO_RZK_LINUX_H__
#include <rz_io.h>
#include <rz_lib.h>
librz/io/p/io_rzk_windows.c
+1 -1
View File
@@ -70,7 +70,7 @@ BOOL StartStopService(LPCTSTR lpServiceName, BOOL bStop) {
static BOOL InitDriver(VOID) {
const int genericFlags = GENERIC_READ | GENERIC_WRITE;
const int shareFlags = FILE_SHARE_READ | FILE_SHARE_WRITE;
gHandleDriver = CreateFile (TEXT (R2K_DEVICE), genericFlags, shareFlags,
gHandleDriver = CreateFile (TEXT (RZK_DEVICE), genericFlags, shareFlags,
NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_DIRECTORY, 0);
return (gHandleDriver != INVALID_HANDLE_VALUE);
}
librz/io/p/io_rzk_windows.h
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef __IO_R2k_WINDOWS_H__
#define __IO_R2k_WINDOWS_H__
#ifndef __IO_RZK_WINDOWS_H__
#define __IO_RZK_WINDOWS_H__
#include <rz_io.h>
#include <rz_lib.h>
@@ -34,7 +34,7 @@ typedef struct _RTL_PROCESS_MODULES {
RTL_PROCESS_MODULE_INFORMATION Modules[1];
} RTL_PROCESS_MODULES, *PRTL_PROCESS_MODULES;
#define R2K_DEVICE "\\\\.\\rzk\\"
#define RZK_DEVICE "\\\\.\\rzk\\"
#define IOCTL_CODE(DeviceType, Function, Method, Access) \
(((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method))
librz/io/p/qnx.mk
+1 -1
View File
@@ -8,7 +8,7 @@ LIB_PATH=$(SHLR)/qnx/
CFLAGS+=-I$(SHLR)/qnx/include/
LDFLAGS+=$(SHLR)/qnx/lib/libqnxr.$(EXT_AR)
include $(LIBR)/socket/deps.mk
include $(LIBRZ)/socket/deps.mk
ifeq (${WITHPIC},0)
LINKFLAGS=../../socket/librz_socket.a
librz/io/p/rzk.mk
+8 -8
View File
@@ -1,14 +1,14 @@
OBJ_R2K = io_rzk.o
OBJ_RZK = io_rzk.o
ifeq ($(OSTYPE),$(filter $(OSTYPE),gnulinux android))
OBJ_R2K += io_rzk_linux.o
OBJ_RZK += io_rzk_linux.o
endif
ifeq (${OSTYPE},$(filter $(OSTYPE),windows mingw32 mingw64 cygwin))
OBJ_R2K += io_rzk_windows.o
OBJ_RZK += io_rzk_windows.o
endif
STATIC_OBJ+=${OBJ_R2K}
TARGET_R2K=io_rzk.${EXT_SO}
ALL_TARGETS+=${TARGET_R2K}
STATIC_OBJ+=${OBJ_RZK}
TARGET_RZK=io_rzk.${EXT_SO}
ALL_TARGETS+=${TARGET_RZK}
ifeq (${WITHPIC},0)
LINKFLAGS+=../../util/librz_util.a
@@ -18,5 +18,5 @@ LINKFLAGS+=-L../../util -lrz_util
LINKFLAGS+=-L.. -lrz_io
endif
${TARGET_R2K}: ${OBJ_R2K}
${CC} $(call libname,io_rzk) ${CFLAGS} -o ${TARGET_R2K} ${OBJ_R2K} ${LINKFLAGS}
${TARGET_RZK}: ${OBJ_RZK}
${CC} $(call libname,io_rzk) ${CFLAGS} -o ${TARGET_RZK} ${OBJ_RZK} ${LINKFLAGS}
librz/io/p/rzpipe.mk
+6 -6
View File
@@ -1,8 +1,8 @@
OBJ_R2PIPE=io_rzpipe.o
OBJ_RZPIPE=io_rzpipe.o
STATIC_OBJ+=${OBJ_R2PIPE}
TARGET_R2PIPE=io_rzpipe.${EXT_SO}
ALL_TARGETS+=${TARGET_R2PIPE}
STATIC_OBJ+=${OBJ_RZPIPE}
TARGET_RZPIPE=io_rzpipe.${EXT_SO}
ALL_TARGETS+=${TARGET_RZPIPE}
ifeq (${WITHPIC},0)
LINKFLAGS+=../../util/librz_util.a
@@ -14,6 +14,6 @@ LINKFLAGS+=-L../../socket -lrz_socket
LINKFLAGS+=-L.. -lrz_io
endif
${TARGET_R2PIPE}: ${OBJ_R2PIPE}
${TARGET_RZPIPE}: ${OBJ_RZPIPE}
${CC_LIB} $(call libname,io_rzpipe) ${CFLAGS} \
-o ${TARGET_R2PIPE} ${OBJ_R2PIPE} ${LINKFLAGS}
-o ${TARGET_RZPIPE} ${OBJ_RZPIPE} ${LINKFLAGS}
librz/io/p/winedbg.mk
+1 -1
View File
@@ -4,7 +4,7 @@ STATIC_OBJ+=${OBJ_WINEDBG}
TARGET_WINEDBG=io_winedbg.${EXT_SO}
ALL_TARGETS+=${TARGET_WINEDBG}
include $(LIBR)/socket/deps.mk
include $(LIBRZ)/socket/deps.mk
ifeq (${WITHPIC},0)
LINKFLAGS=../../socket/librz_socket.a
librz/lang/p/cpipe.c
+1 -1
View File
@@ -78,7 +78,7 @@ static int lang_cpipe_run(RzLang *lang, const char *code, int len) {
return false;
}
fputs ("#include <rz_socket.h>\n\n"
"#define R2P(x,y...) rzpipe_cmdf(r2p,x,##y)\n"
"#define RZP(x,y...) rzpipe_cmdf(r2p,x,##y)\n"
"int main() {\n"
" RzPipe *r2p = rzpipe_open(NULL);", fd);
fputs (code, fd);
librz/main/deps.mk
+1 -1
View File
@@ -7,5 +7,5 @@ RZ_DEPS+=rz_reg rz_search rz_syscall rz_socket rz_magic rz_crypto
else
# only works
WITH_LIBS=0
WITH_LIBR=1
WITH_LIBRZ=1
endif
librz/rules.mk
+5 -5
View File
@@ -12,12 +12,12 @@ CFLAGS+=-g
LINK+=-g
endif
LIBR:=$(abspath $(dir $(lastword $(MAKEFILE_LIST))))
LIBRZ:=$(abspath $(dir $(lastword $(MAKEFILE_LIST))))
# /librz
ALL?=
CFLAGS+=-I$(LIBR)
CFLAGS+=-I$(LIBR)/include
CFLAGS+=-I$(LIBRZ)
CFLAGS+=-I$(LIBRZ)/include
-include $(SHLR)/sdb.mk
@@ -87,14 +87,14 @@ $(LIBSO): $(EXTRA_TARGETS) ${WFD} ${OBJS} ${SHARED_OBJ}
echo "LD $(LIBSO)" || \
echo "\"${CC_LIB} ${LIBNAME} ${OBJS} ${SHARED_OBJ} ${LINK} ${LDFLAGS}\"" ; \
${CC_LIB} ${LIBNAME} ${CFLAGS} ${OBJS} ${SHARED_OBJ} ${LINK} ${LDFLAGS} || exit 1; \
[ -f "$(LIBR)/stripsyms.sh" ] && sh $(LIBR)/stripsyms.sh ${LIBSO} ${NAME} ; \
[ -f "$(LIBRZ)/stripsyms.sh" ] && sh $(LIBRZ)/stripsyms.sh ${LIBSO} ${NAME} ; \
break ; \
fi ; done
else
$(LIBSO): ;
endif
ifeq ($(WITH_LIBR),1)
ifeq ($(WITH_(LIBRZ)),1)
$(LIBAR): ${OBJS}
@[ "${SILENT}" = 1 ] && echo "CC_AR $(LIBAR)" || true
rm -f $(LIBAR)
meson.build
+2 -2
View File
@@ -282,12 +282,12 @@ userconf.set('PREFIX', rizin_prefix)
if host_machine.system() == 'windows'
userconf.set('LIBDIR', rizin_libdir)
userconf.set('INCLUDEDIR', rizin_incdir)
userconf.set('DATADIR_R2', rizin_datdir)
userconf.set('DATADIR_RZ', rizin_datdir)
userconf.set10('HAVE_JEMALLOC', false)
else
userconf.set('LIBDIR', rizin_prefix / rizin_libdir)
userconf.set('INCLUDEDIR', rizin_prefix / rizin_incdir)
userconf.set('DATADIR_R2', rizin_datdir_rz)
userconf.set('DATADIR_RZ', rizin_datdir_rz)
userconf.set10('HAVE_JEMALLOC', true)
endif
userconf.set('DATADIR', rizin_prefix / rizin_datdir)
shlr/bochs/Makefile
+6 -6
View File
@@ -6,17 +6,17 @@ AR?=ar
RANLIB?=ranlib
LIBNAME=libbochs
LIBFILE=$(LIBNAME).$(EXT_SO)
CFLAGS+=-I$(LIBR)/include $(PIC_CFLAGS)
CFLAGS+=-Iinclude -I${LIBR}/include
CFLAGS+=-I$(LIBRZ)/include $(PIC_CFLAGS)
CFLAGS+=-Iinclude -I${LIBRZ}/include
MAJOR=0
MINOR=1
LD=$(CC)
ifeq ($(LD),cccl)
LDFLAGS+=-L${LIBR}/socket -llibrz_socket
LDFLAGS+=-L${LIBR}/util -llibrz_util
LDFLAGS+=-L${LIBRZ}/socket -llibrz_socket
LDFLAGS+=-L${LIBRZ}/util -llibrz_util
else
LDFLAGS+=-L${LIBR}/socket -lrz_socket
LDFLAGS+=-L${LIBR}/util -lrz_util
LDFLAGS+=-L${LIBRZ}/socket -lrz_socket
LDFLAGS+=-L${LIBRZ}/util -lrz_util
endif
ifeq ($(OSTYPE),darwin)
LDFLAGS_SHARED=-dynamiclib
shlr/gdb/Makefile
+7 -7
View File
@@ -9,18 +9,18 @@ AR?=$(CC_AR)
RANLIB?=ranlib
LIBNAME=libgdbr
LIBFILE=$(LIBNAME).$(EXT_SO)
CFLAGS+=-I$(LIBR)/include $(PIC_CFLAGS)
CFLAGS+=-Iinclude -I${LIBR}/include
CFLAGS+=-I$(LIBRZ)/include $(PIC_CFLAGS)
CFLAGS+=-Iinclude -I${(LIBRZ)}/include
MAJOR=0
MINOR=1
LD=$(CC)
ifeq ($(LD),cccl)
LDFLAGS+=-L${LIBR}/socket -llibrz_socket
LDFLAGS+=-L${LIBR}/util -llibrz_util
LDFLAGS+=-L${(LIBRZ)}/socket -llibrz_socket
LDFLAGS+=-L${(LIBRZ)}/util -llibrz_util
EXT_AR?=lib
else
LDFLAGS+=-L${LIBR}/socket -lrz_socket
LDFLAGS+=-L${LIBR}/util -lrz_util
LDFLAGS+=-L${(LIBRZ)}/socket -lrz_socket
LDFLAGS+=-L${(LIBRZ)}/util -lrz_util
EXT_AR?=a
endif
@@ -81,7 +81,7 @@ unit: lib
$(LD) $(TEST_D)/unit.o -o $(TEST_D)/unit -L$(LIB) -lgdbr -lglib-2.0
run_unit: unit
LD_LIBRARY_PATH=./lib ./test/unit
LD_(LIBRZ)ARY_PATH=./lib ./test/unit
client: lib
$(CC) $(CFLAGS) $(INCLUDES) -c $(CLIENT) -o $(TEST_D)/client.o
shlr/gdb/deps.mk
+1 -1
View File
@@ -1,3 +1,3 @@
LINK+=$(STOP)/gdb/lib/libgdbr.$(EXT_AR)
LDFLAGS+=-lrz_cons
include $(LIBR)/socket/deps.mk
include $(LIBRZ)/socket/deps.mk
shlr/ptrace-wrap/Makefile
+1 -1
View File
@@ -6,7 +6,7 @@ AR ?= ar
RANLIB ?= ranlib
EXT_AR ?= a
CFLAGS+=-I$(LIBR)/include
CFLAGS+=-I$(LIBRZ)/include
CFLAGS+=-I$(SHLR)/sdb/src
CFLAGS+=-Iinclude
LIBPTRACE_WRAP=libptrace_wrap.${EXT_AR}
shlr/qnx/Makefile
+6 -6
View File
@@ -7,17 +7,17 @@ AR?=ar
RANLIB?=ranlib
LIBNAME=libqnxr
LIBFILE=$(LIBNAME).$(EXT_SO)
CFLAGS+=-I$(LIBR)/include $(PIC_CFLAGS)
CFLAGS+=-Iinclude -I${LIBR}/include
CFLAGS+=-I$(LIBRZ)/include $(PIC_CFLAGS)
CFLAGS+=-Iinclude -I${LIBRZ}/include
MAJOR=0
MINOR=1
LD=$(CC)
ifeq ($(LD),cccl)
LDFLAGS+=-L${LIBR}/socket -llibrz_socket
LDFLAGS+=-L${LIBR}/util -llibrz_util
LDFLAGS+=-L${LIBRZ}/socket -llibrz_socket
LDFLAGS+=-L${LIBRZ}/util -llibrz_util
else
LDFLAGS+=-L${LIBR}/socket -lrz_socket
LDFLAGS+=-L${LIBR}/util -lrz_util
LDFLAGS+=-L${LIBRZ}/socket -lrz_socket
LDFLAGS+=-L${LIBRZ}/util -lrz_util
endif
ifeq ($(OSTYPE),darwin)
LDFLAGS_SHARED=-dynamiclib
shlr/tcc/libtcc.c
+1 -1
View File
@@ -542,7 +542,7 @@ LIBTCCAPI TCCState *tcc_new(const char *arch, int bits, const char *os)
sscanf (TCC_VERSION, "%d.%d.%d", &a, &b, &c);
sprintf (buffer, "%d", a * 10000 + b * 100 + c);
tcc_define_symbol (s, "__TINYC__", buffer);
tcc_define_symbol (s, "__R2TINYC__", buffer);
tcc_define_symbol (s, "__RZTINYC__", buffer);
/* standard defines */
tcc_define_symbol (s, "__STDC__", NULL);
shlr/winkd/deps.mk
+1 -1
View File
@@ -1,3 +1,3 @@
LINK+=$(STOP)/winkd/librz_winkd.${EXT_AR}
LDFLAGS+=-lrz_crypto -lrz_hash
include $(LIBR)/socket/deps.mk
include $(LIBRZ)/socket/deps.mk
sys/osx-pkg/Resources/welcome.rtf
+1 -1
View File
@@ -9,4 +9,4 @@
You will be guided through the steps necessary to\
install this software.\
\
This will install R2 to /usr/}
This will install Rizin to /usr/}
sys/rz-docker.sh
+1 -1
View File
@@ -45,7 +45,7 @@ case "$1" in
docker rmi rizin/rizin:latest 2> /dev/null
;;
-d)
R2FLAGS=-d $0 $2
RZFLAGS=-d $0 $2
;;
-u)
docker build -t rizin/rizin:latest .
test/unit/test_sdb.h
+1 -1
View File
@@ -25,4 +25,4 @@ static inline void print_sdb(Sdb *sdb) {
if (expected) { mu_assert_streq (actual, expected, message); } \
} while(0)
#endif //R2DB_TEST_UTILS_H
#endif // TEST_SDB_H
travis-extract-var.sh
+1 -1
View File
@@ -10,7 +10,7 @@ print_var()
}
env -0 | while IFS='=' read -r -d '' n v; do
if [[ "${n}" =~ ^TRAVIS* || "${n}" =~ ^R2* || "${n}" =~ SAN_* || "%{n}" =~ CODECOV_* || "%{n}" =~ VCS_* || "%{n}" =~ CI_* ]]; then
if [[ "${n}" =~ ^TRAVIS* || "${n}" =~ ^RZ* || "${n}" =~ SAN_* || "%{n}" =~ CODECOV_* || "%{n}" =~ VCS_* || "%{n}" =~ CI_* ]]; then
print_var "${n}" "${v}"
fi
done