Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-23 13:19:54 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Update capstone and embed it into the 'make dist' tarball

Browse Source
This commit is contained in:
pancake 2014-05-25 03:58:58 +02:00
parent 7cde5cd39e
commit 8c0ed5a6ee
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -181,8 +181,9 @@ dist:
git log $$(git show-ref `git tag |tail -n1`)..HEAD > ChangeLog
DIR=`basename $$PWD` ; \
FILES=`git ls-files | sed -e s,^,radare2-${VERSION}/,` ; \
CS_FILES=`cd shlr/capstone ; git ls-files | sed -e s,^,radare2-${VERSION}/shlr/capstone/,` ; \
cd .. && mv $${DIR} radare2-${VERSION} && \
${TAR} radare2-${VERSION}.tar $${FILES} radare2-${VERSION}/ChangeLog ;\
${TAR} radare2-${VERSION}.tar $${FILES} $${CS_FILES} radare2-${VERSION}/ChangeLog ;\
${CZ} radare2-${VERSION}.tar ; \
mv radare2-${VERSION} $${DIR}

3
libr/bin/bin.c
View File

@ -486,7 +486,6 @@ int r_bin_load_io_at_offset_as_sz(RBin *bin, RIODesc *desc, ut64 baseaddr, ut64
r_list_foreach (bin->binxtrs, it, xtr) {
if (xtr->check && xtr->check_bytes (buf_bytes, sz)) {
if (xtr && (xtr->extract_from_bytes || xtr->extractall_from_bytes)) {
if (is_debugger && sz != file_sz) {
free (buf_bytes);
RIODesc *tdesc = iob->desc_open (io, desc->name, desc->flags, R_IO_READ);
@ -877,7 +876,7 @@ static int r_bin_file_object_new_from_xtr_data (RBinFile *bf, ut64 baseaddr, ut6
}
static RBinFile * r_bin_file_new_from_bytes (const char *file, const ut8 * bytes, ut64 sz, ut64 file_sz, int rawstr, ut64 baseaddr,
ut64 loadaddr, int fd, const char *pluginname, const char *xtrname, ut64 offset) {
ut64 loadaddr, int fd, const char *pluginname, const char *xtrname, ut64 offset) {
RBinPlugin *plugin = NULL;
RBinXtrPlugin *xtr = NULL;
RBinFile *bf = NULL;

4
shlr/Makefile
View File

@ -8,8 +8,8 @@ CS_TAR=
CS_URL=https://github.com/aquynh/capstone.git
CS_UPD=20140307
CS_BRA=next
CS_TIP=897379f03080491d4de75bbb33c65bf804831dbe
CS_TIP=1e93adf5c3e123416c211fddbb9f18f7f5cc5f24
#CS_TIP=1e93adf5c3e123416c211fddbb9f18f7f5cc5f24
CS_TIP=0ebbf1e49c49d7bcd046fccf3f1a78667fb1c115
.PHONY: capstone-sync capstone-build all clean mrproper libgdbr