Fix #5924 - r_flags -> r_flag

This commit is contained in:
pancake 2016-10-27 01:02:26 +02:00
parent 3ab7122df2
commit d41b577106
53 changed files with 59 additions and 59 deletions

View File

@ -38,7 +38,7 @@ LDFLAGS+=../../libr/fs/libr_fs.a
LDFLAGS+=../../libr/magic/libr_magic.a
LDFLAGS+=../../libr/cons/libr_cons.a
LDFLAGS+=../../libr/syscall/libr_syscall.a
LDFLAGS+=../../libr/flags/libr_flags.a
LDFLAGS+=../../libr/flag/libr_flag.a
LDFLAGS+=../../libr/reg/libr_reg.a
LDFLAGS+=../../libr/debug/libr_debug.a
LDFLAGS+=../../libr/search/libr_search.a
@ -68,7 +68,7 @@ LDFLAGS+=-L../../libr/egg -lr_egg
LDFLAGS+=-L../../libr/core -lr_core
LDFLAGS+=-L../../libr/anal -lr_anal
LDFLAGS+=-L../../libr/crypto -lr_crypto
LDFLAGS+=-L../../libr/flags -lr_flags
LDFLAGS+=-L../../libr/flag -lr_flag
LDFLAGS+=-L../../libr/parse -lr_parse
LDFLAGS+=-L../../libr/fs -lr_fs
LDFLAGS+=-L../../libr/magic -lr_magic

View File

@ -3,7 +3,7 @@ ISLIB=1
BINDEPS=r_core r_parse r_search r_cons r_config
BINDEPS+=r_bin r_debug r_anal r_reg r_bp r_io
BINDEPS+=r_lang r_asm r_syscall r_hash r_crypto
BINDEPS+=r_magic r_socket r_flags r_util r_egg r_fs
BINDEPS+=r_magic r_socket r_flag r_util r_egg r_fs
include ../rules.mk

View File

@ -9,7 +9,7 @@ exe rabin2 : rabin2.c :
<library>../../libr/io
<library>../../libr/asm
<library>../../libr/bin
<library>../../libr/flags
<library>../../libr/flag
<library>../../libr/db
<library>../../libr/cons
<library>../../libr/parse

View File

@ -1,6 +1,6 @@
BIN=rabin2
BINDEPS=r_magic r_core r_bin r_egg r_cons
BINDEPS+=r_config r_io r_flags r_asm
BINDEPS+=r_config r_io r_flag r_asm
BINDEPS+=r_debug r_hash r_lang r_anal r_parse r_bp r_reg
BINDEPS+=r_search r_syscall r_socket r_fs r_magic r_crypto r_util

View File

@ -21,7 +21,7 @@ exe radare2 : radare2.c :
<library>../../libr/crypto
<library>../../libr/egg
<library>../../libr/socket
<library>../../libr/flags
<library>../../libr/flag
<include>../../libr/include
<library>../../shlr/sdb

View File

@ -2,7 +2,7 @@ BIN=radare2
BINDEPS=r_core r_parse r_search r_cons r_config
BINDEPS+=r_bin r_debug r_anal r_reg r_bp r_io r_fs
BINDEPS+=r_lang r_asm r_syscall r_hash
BINDEPS+=r_magic r_socket r_flags r_egg r_crypto r_util
BINDEPS+=r_magic r_socket r_flag r_egg r_crypto r_util
# Apple Sign #
CERTID?=org.radare.radare2

View File

@ -2,7 +2,7 @@ BIN=radiff2
BINDEPS=r_core r_config r_cons r_search r_anal
BINDEPS+=r_bin r_debug r_io r_asm r_hash r_fs r_crypto
BINDEPS+=r_socket r_flags r_lang r_reg r_bp r_parse
BINDEPS+=r_socket r_flag r_lang r_reg r_bp r_parse
BINDEPS+=r_syscall r_magic r_util r_parse r_egg
include ../rules.mk

View File

@ -1,7 +1,7 @@
BIN=rafind2
BINDEPS=r_search r_io r_asm r_anal r_reg r_cons r_lang
BINDEPS+=r_socket r_parse r_util r_syscall r_flags
BINDEPS+=r_socket r_parse r_util r_syscall r_flag
include ../rules.mk

View File

@ -1,7 +1,7 @@
BIN=ragg2
BINDEPS=r_egg r_bin r_syscall r_asm
BINDEPS+=r_io r_socket
BINDEPS+=r_lang r_parse r_anal r_reg r_flags
BINDEPS+=r_lang r_parse r_anal r_reg r_flag
BINDEPS+=r_magic r_cons r_util
include ../rules.mk

View File

@ -2,7 +2,7 @@ BIN=rahash2
BINDEPS=r_io r_hash r_socket r_asm r_cons
BINDEPS+=r_anal r_syscall r_reg r_parse
BINDEPS+=r_flags r_lang r_crypto r_util
BINDEPS+=r_flag r_lang r_crypto r_util
include ../rules.mk

View File

@ -6,7 +6,7 @@ exe rasm2 : rasm2.c :
<library>../../libr/reg
<library>../../libr/diff
<library>../../libr/db
<library>../../libr/flags
<library>../../libr/flag
<library>../../libr/util
<library>../../libr/cons
<include>../../libr/include ;

View File

@ -1,5 +1,5 @@
BIN=rasm2
BINDEPS=r_asm r_parse r_syscall r_anal r_reg
BINDEPS+=r_flags r_cons r_lang r_util
BINDEPS+=r_flag r_cons r_lang r_util
include ../rules.mk

10
configure vendored
View File

@ -114,12 +114,12 @@ done
: ${INSTALL_PROGRAM_STRIP:=${INSTALL} -m 755 -s}
: ${INSTALL_MAN:=${INSTALL} -m 444}
: ${INSTALL_LIB:=${INSTALL} -m 755 -c}
PKGNAME='radare2' ; VERSION='0.10.6' ; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake <pancake@nopcode.org>" ;
PKGNAME='radare2' ; VERSION='0.99.9-git' ; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake <pancake@nopcode.org>" ;
}
show_usage() {
cat <<EOF2
'configure' configures radare2-0.10.6 to adapt to many kinds of systems.
'configure' configures radare2-0.99.9-git to adapt to many kinds of systems.
Usage: ./configure [OPTION]... [VAR=VALUE]...
@ -200,7 +200,7 @@ take_environ() {
}
show_version() {
echo "radare2-0.10.6 configuration script done with acr v0.10.2.
echo "radare2-0.99.9-git configuration script done with acr v0.10.2.
The 'Free Software Foundation' message is only for autodetection.
Originally written by pancake <nopcode.org>."
exit 0
@ -224,7 +224,7 @@ case $flag in
show_version ; ;;
-r|--r|--report)
echo "PKGNAME: radare2"
echo "VERSION: 0.10.6"
echo "VERSION: 0.99.9-git"
echo "LANGS: c"
echo "REQUIRED: libdl"
echo "OPTIONAL: libmagic"
@ -516,7 +516,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_magic.pc pkgcfg/r_asm.pc pkgcfg/r_bin.pc pkgcfg/r_anal.pc pkgcfg/r_hash.pc pkgcfg/r_cons.pc pkgcfg/r_core.pc pkgcfg/r_lang.pc pkgcfg/r_socket.pc pkgcfg/r_debug.pc pkgcfg/r_reg.pc pkgcfg/r_config.pc pkgcfg/r_flags.pc pkgcfg/r_syscall.pc pkgcfg/r_util.pc pkgcfg/r_search.pc pkgcfg/r_bp.pc pkgcfg/r_parse.pc pkgcfg/r_fs.pc ; do # SUBDIRS
for A in ./config-user.mk libr/include/r_userconf.h pkgcfg/r_io.pc pkgcfg/r_magic.pc pkgcfg/r_asm.pc pkgcfg/r_bin.pc pkgcfg/r_anal.pc pkgcfg/r_hash.pc pkgcfg/r_cons.pc pkgcfg/r_core.pc pkgcfg/r_lang.pc pkgcfg/r_socket.pc pkgcfg/r_debug.pc pkgcfg/r_reg.pc pkgcfg/r_config.pc pkgcfg/r_flag.pc pkgcfg/r_syscall.pc pkgcfg/r_util.pc pkgcfg/r_search.pc pkgcfg/r_bp.pc pkgcfg/r_parse.pc pkgcfg/r_fs.pc ; do # SUBDIRS
if [ -f "${VPATH}/${A}.acr" ]; then
SD_TARGET=${A}
else

View File

@ -1,5 +1,5 @@
PKGNAME radare2
VERSION 0.10.6
VERSION 0.99.9-git
CONTACT pancake ; pancake@nopcode.org
LANG_C!
@ -152,7 +152,7 @@ SUBDIRS ./config-user.mk
pkgcfg/r_debug.pc
pkgcfg/r_reg.pc
pkgcfg/r_config.pc
pkgcfg/r_flags.pc
pkgcfg/r_flag.pc
pkgcfg/r_syscall.pc
pkgcfg/r_util.pc
pkgcfg/r_search.pc

View File

@ -13,7 +13,7 @@ PWD=$(shell pwd)
LIBS0=util hash
LIBS1=socket reg cons magic bp search config
LIBS2=syscall lang io crypto flags
LIBS2=syscall lang io crypto flag
LIBS3=fs anal bin
LIBS4=parse
LIBS5=asm debug

View File

@ -2,7 +2,7 @@ include ../../global.mk
NAME=r_asm
DEPS=r_syscall r_lang r_util r_parse
DEPS+=r_flags r_cons r_reg
DEPS+=r_flag r_cons r_reg
CFLAGS+=-DCORELIB -Iarch/include -Iarch -I../../shlr
CURDIR=p/

View File

@ -3,8 +3,8 @@ include ../../../mk/platform.mk
CFLAGS+=-I$(TOP)/shlr -I../../include -I../arch/ -I../arch/include
CFLAGS+=-Wall -shared ${PIC_CFLAGS} ${LDFLAGS_LIB} ${LDFLAGS_LINKPATH}..
LDFLAGS+=-L../../util -L../../lib -L../../flags
LDFLAGS+=${LINK} -lr_flags -lr_util
LDFLAGS+=-L../../util -L../../lib -L../../flag
LDFLAGS+=${LINK} -lr_flag -lr_util
CURDIR=

View File

@ -1,6 +1,6 @@
/* Copyright (C) 2008-2016 - pancake */
#include <r_flags.h>
#include <r_flag.h>
#include <r_core.h>
#include <r_asm.h>
#include <r_lib.h>

View File

@ -6,7 +6,7 @@ lib r_core : $(CORE_OBJS) :
<define>CORELIB
<library>../util
<library>../anal
<library>../flags
<library>../flag
<library>../asm
<library>../bin
<library>../debug

View File

@ -2,7 +2,7 @@ include ../config.mk
NAME=r_core
DEPS=r_config r_cons r_io r_util r_flags r_asm
DEPS=r_config r_cons r_io r_util r_flag r_asm
DEPS+=r_debug r_hash r_bin r_lang r_io r_anal r_parse r_bp r_egg
DEPS+=r_reg r_search r_syscall r_socket r_fs r_magic r_crypto

View File

@ -2,7 +2,7 @@
#include <r_types.h>
#include <r_list.h>
#include <r_flags.h>
#include <r_flag.h>
#include <r_core.h>
#include <r_bin.h>

View File

@ -8,7 +8,7 @@ CFLAGS+=-L../../util -lr_util -L../../reg -lr_reg -L.. -lr_core
CFLAGS+=-L../../cons -lr_cons -L../../bin -lr_bin
CFLAGS+=-L../../parse -lr_parse -L../../io -lr_io -L../../fs -lr_fs
CFLAGS+=-L../../magic -lr_magic -L../../hash -lr_hash -L../../config -lr_config
CFLAGS+=-L../../anal -lr_anal -L../../egg -lr_egg -L../../flags -lr_flags
CFLAGS+=-L../../anal -lr_anal -L../../egg -lr_egg -L../../flag -lr_flag
CFLAGS+=-L../../syscall -lr_syscall -L../../socket -lr_socket -L../../search -lr_search
CFLAGS+= -L../../lang -lr_lang -L../../debug -lr_debug
CFLAGS+=-L../../bp -lr_bp -L../../reg -lr_reg -L../../asm -lr_asm

View File

@ -2,7 +2,7 @@
#include <r_types.h>
#include <r_list.h>
#include <r_flags.h>
#include <r_flag.h>
#include <r_core.h>
static bool r_core_project_load_xrefs(RCore *core, const char *prjName);

View File

@ -1,7 +1,7 @@
include ../config.mk
NAME=r_debug
DEPS=r_reg r_anal r_bp r_io r_parse r_cons r_syscall r_hash r_flags r_util
DEPS=r_reg r_anal r_bp r_io r_parse r_cons r_syscall r_hash r_flag r_util
DEPS+=r_socket
CFLAGS+=-DCORELIB

View File

@ -1,6 +1,6 @@
#!/bin/sh
LIBS="libr/cons/libr_cons.a libr/util/libr_util.a libr/bin/libr_bin.a libr/anal/libr_anal.a libr/bp/libr_bp.a libr/hash/libr_hash.a libr/debug/libr_debug.a shlr/sdb/src/libsdb.a libr/core/libr_core.a libr/fs/libr_fs.a libr/syscall/libr_syscall.a shlr/java/libr_java.a shlr/zip/librz.a libr/socket/libr_socket.a libr/anal/libr_anal.a libr/flags/libr_flags.a libr/search/libr_search.a libr/reg/libr_reg.a libr/config/libr_config.a libr/io/libr_io.a libr/parse/libr_parse.a libr/bp/libr_bp.a libr/asm/libr_asm.a libr/bp/libr_bp.a libr/egg/libr_egg.a libr/anal/libr_anal.a libr/magic/libr_magic.a libr/lang/libr_lang.a libr/fs/libr_fs.a shlr/grub/libgrubfs.a shlr/capstone/libcapstone.a shlr/gdb/lib/libgdbr.a"
LIBS="libr/cons/libr_cons.a libr/util/libr_util.a libr/bin/libr_bin.a libr/anal/libr_anal.a libr/bp/libr_bp.a libr/hash/libr_hash.a libr/debug/libr_debug.a shlr/sdb/src/libsdb.a libr/core/libr_core.a libr/fs/libr_fs.a libr/syscall/libr_syscall.a shlr/java/libr_java.a shlr/zip/librz.a libr/socket/libr_socket.a libr/anal/libr_anal.a libr/flag/libr_flag.a libr/search/libr_search.a libr/reg/libr_reg.a libr/config/libr_config.a libr/io/libr_io.a libr/parse/libr_parse.a libr/bp/libr_bp.a libr/asm/libr_asm.a libr/bp/libr_bp.a libr/egg/libr_egg.a libr/anal/libr_anal.a libr/magic/libr_magic.a libr/lang/libr_lang.a libr/fs/libr_fs.a shlr/grub/libgrubfs.a shlr/capstone/libcapstone.a shlr/gdb/lib/libgdbr.a"
cd ..
LIB=libr.a

View File

@ -2,7 +2,7 @@ include ../config.mk
NAME=r_egg
DEPS=r_asm r_syscall r_util r_parse r_reg r_anal
DEPS+=r_flags r_cons
DEPS+=r_flag r_cons
LINK+=$(SHLR)/java/libr_java.a
OBJS=egg.o lang.o

View File

@ -1,7 +1,7 @@
include ../config.mk
NAME=r_flags
NAME=r_flag
DEPS=r_util
OBJS=flags.o sort.o spaces.o zones.o
OBJS=flag.o sort.o spaces.o zones.o
include ../rules.mk

View File

@ -1,6 +1,6 @@
/* radare - LGPL - Copyright 2007-2016 - pancake */
#include <r_flags.h>
#include <r_flag.h>
#include <r_util.h>
#include <r_cons.h>
#include <stdio.h>

View File

@ -1,6 +1,6 @@
/* radare - LGPL - Copyright 2007-2015 pancake */
#include <r_flags.h>
#include <r_flag.h>
/* compare names */
static int ncmp(const void *a, const void *b) {

View File

@ -1,6 +1,6 @@
/* radare - LGPL - Copyright 2008-2016 - pancake */
#include <r_flags.h>
#include <r_flag.h>
#include <r_cons.h>
R_API int r_flag_space_get(RFlag *f, const char *name) {

View File

@ -1,6 +1,6 @@
/* radare - LGPL - Copyright 2016 - pancake */
#include <r_flags.h>
#include <r_flag.h>
#include <r_util.h>
#define DB f->zones

View File

@ -18,7 +18,7 @@
#include <r_util.h>
#include <r_bind.h>
#include <r_syscall.h>
#include <r_flags.h>
#include <r_flag.h>
#include <r_bin.h>
#ifdef __cplusplus

View File

@ -20,7 +20,7 @@
#include "r_search.h"
#include "r_sign.h"
#include "r_debug.h"
#include "r_flags.h"
#include "r_flag.h"
#include "r_config.h"
#include "r_bin.h"
#include "r_hash.h"

View File

@ -10,7 +10,7 @@
extern "C" {
#endif
// TODO: rename to r_flags_XXX api
// TODO: rename to r_flag_XXX api
R_LIB_VERSION_HEADER(r_flag);
#define R_FLAG_NAME_SIZE 512

View File

@ -4,7 +4,7 @@
#define R2_PARSE_H
#include <r_types.h>
#include <r_flags.h>
#include <r_flag.h>
#include <r_anal.h>
#include <list.h>

View File

@ -12,7 +12,7 @@ p/parse_mreplace/mmemory.c
lib r_parse : $(OBJS) :
<include>../include
<include>../../shlr/tcc
<library>../flags
<library>../flag
<library>../anal
<library>../util
<define>CORELIB

View File

@ -1,7 +1,7 @@
include ../config.mk
NAME=r_parse
DEPS=r_flags r_util r_syscall r_reg
DEPS=r_flag r_util r_syscall r_reg
# indirect dependencies
DEPS+=r_cons

View File

@ -3,7 +3,7 @@ OBJ_6502PSEUDO+=parse_6502_pseudo.o
TARGET_6502PSEUDO=parse_6502_pseudo.${EXT_SO}
STATIC_OBJ+=${OBJ_6502PSEUDO}
LIBDEPS=-L../../util -lr_util
LIBDEPS+=-L../../flags -lr_flags
LIBDEPS+=-L../../flag -lr_flag
ifeq ($(WITHPIC),1)
ALL_TARGETS+=${TARGET_6502PSEUDO}

View File

@ -3,7 +3,7 @@ OBJ_ARMPSEUDO+=parse_arm_pseudo.o
TARGET_ARMPSEUDO=parse_arm_pseudo.${EXT_SO}
STATIC_OBJ+=${OBJ_ARMPSEUDO}
LIBDEPS=-L../../util -lr_util
LIBDEPS+=-L../../flags -lr_flags
LIBDEPS+=-L../../flag -lr_flag
ifeq ($(WITHPIC),1)
ALL_TARGETS+=${TARGET_ARMPSEUDO}

View File

@ -4,7 +4,7 @@ TARGET_M68KPSEUDO=parse_m68k_pseudo.${EXT_SO}
ALL_TARGETS+=${TARGET_M68KPSEUDO}
STATIC_OBJ+=${OBJ_M68KPSEUDO}
LIBDEPS=-L../../util -lr_util
LIBDEPS+=-L../../flags -lr_flags
LIBDEPS+=-L../../flag -lr_flag
LIBDEPS+=$(STOP)/zip/librz.a
${TARGET_M68KPSEUDO}: ${OBJ_M68KPSEUDO}

View File

@ -6,7 +6,7 @@
#include <r_lib.h>
#include <r_util.h>
#include <r_flags.h>
#include <r_flag.h>
#include <r_anal.h>
#include <r_parse.h>

View File

@ -6,7 +6,7 @@
#include <r_lib.h>
#include <r_util.h>
#include <r_flags.h>
#include <r_flag.h>
#include <r_anal.h>
#include <r_parse.h>

View File

@ -6,7 +6,7 @@
#include <r_lib.h>
#include <r_util.h>
#include <r_flags.h>
#include <r_flag.h>
#include <r_anal.h>
#include <r_parse.h>

View File

@ -6,7 +6,7 @@
#include <r_lib.h>
#include <r_util.h>
#include <r_flags.h>
#include <r_flag.h>
#include <r_anal.h>
#include <r_parse.h>

View File

@ -6,7 +6,7 @@
#include <r_lib.h>
#include <r_util.h>
#include <r_flags.h>
#include <r_flag.h>
#include <r_anal.h>
#include <r_parse.h>

View File

@ -6,7 +6,7 @@
#include <r_lib.h>
#include <r_util.h>
#include <r_flags.h>
#include <r_flag.h>
#include <r_anal.h>
#include <r_parse.h>

View File

@ -6,7 +6,7 @@
#include <r_lib.h>
#include <r_util.h>
#include <r_flags.h>
#include <r_flag.h>
#include <r_anal.h>
#include <r_parse.h>

View File

@ -6,7 +6,7 @@
#include <r_lib.h>
#include <r_util.h>
#include <r_flags.h>
#include <r_flag.h>
#include <r_anal.h>
#include <r_reg.h>
#include <r_parse.h>

View File

@ -6,7 +6,7 @@
#include <r_lib.h>
#include <r_util.h>
#include <r_flags.h>
#include <r_flag.h>
#include <r_anal.h>
#include <r_parse.h>

View File

@ -3,7 +3,7 @@ OBJ_X86PSEUDO+=parse_x86_pseudo.o
TARGET_X86PSEUDO=parse_x86_pseudo.${EXT_SO}
STATIC_OBJ+=${OBJ_X86PSEUDO}
LIBDEPS=-L../../util -lr_util
LIBDEPS+=-L../../flags -lr_flags
LIBDEPS+=-L../../flag -lr_flag
LDFLAGS+=-L../../reg -lr_reg
LDFLAGS+=-L../../cons -lr_cons
LDFLAGS+=-L../../cons

View File

@ -4,7 +4,7 @@ TARGET_z80PSEUDO=parse_z80_pseudo.${EXT_SO}
ALL_TARGETS+=${TARGET_z80PSEUDO}
STATIC_OBJ+=${OBJ_z80PSEUDO}
LIBDEPS=-L../../util -lr_util
LIBDEPS+=-L../../flags -lr_flags
LIBDEPS+=-L../../flag -lr_flag
${TARGET_z80PSEUDO}: ${OBJ_z80PSEUDO}
${CC} $(call libname,parse_z80_pseudo) ${LIBDEPS} $(LDFLAGS_SHARED) \