From 7ceebc725e89337dfbbe1faff622391f26c95958 Mon Sep 17 00:00:00 2001 From: Riccardo Schirone Date: Tue, 13 Oct 2020 11:30:58 +0200 Subject: [PATCH] Mass renaming r2 to rz/rizin --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- .github/workflows/ci.yml | 6 +- .github/workflows/continuous.yml | 6 +- DEVELOPERS.md | 12 +- binrz/blob/Makefile | 5 +- binrz/blob/meson_install_links.sh | 2 +- binrz/preload/librz2.c | 2 +- binrz/rizin/rizin.c | 4 +- doc/fortunes.fun | 52 +++---- doc/fortunes.nsfw | 4 +- doc/fortunes.tips | 12 +- librz/anal/d/meson.build | 2 +- librz/anal/meson.build | 4 +- librz/asm/d/meson.build | 2 +- librz/asm/meson.build | 4 +- librz/bin/d/meson.build | 4 +- librz/bin/meson.build | 4 +- librz/bp/meson.build | 4 +- librz/config/meson.build | 4 +- librz/cons/d/meson.build | 2 +- librz/cons/meson.build | 4 +- librz/core/cconfig.c | 12 +- librz/core/cmd.c | 46 +++--- librz/core/cmd_anal.c | 26 ++-- librz/core/cmd_cmp.c | 6 +- librz/core/cmd_debug.c | 8 +- librz/core/cmd_eval.c | 2 +- librz/core/cmd_flag.c | 10 +- librz/core/cmd_help.c | 8 +- librz/core/cmd_helps.c | 6 +- librz/core/cmd_info.c | 2 +- librz/core/cmd_log.c | 2 +- librz/core/cmd_meta.c | 16 +- librz/core/cmd_open.c | 16 +- librz/core/cmd_print.c | 14 +- librz/core/cmd_search.c | 2 +- librz/core/cmd_seek.c | 2 +- librz/core/cmd_type.c | 4 +- librz/core/cmd_write.c | 4 +- librz/core/core.c | 2 +- librz/core/meson.build | 4 +- librz/core/panels.c | 10 +- librz/core/rtr.c | 4 +- librz/core/visual.c | 2 +- librz/core/vmenus.c | 12 +- librz/core/vmenus_graph.c | 2 +- librz/core/vmenus_zigns.c | 2 +- librz/crypto/meson.build | 4 +- librz/debug/meson.build | 4 +- librz/egg/egg_Cfile.c | 4 +- librz/egg/meson.build | 4 +- librz/flag/d/Makefile | 8 +- librz/flag/d/meson.build | 6 +- librz/flag/meson.build | 4 +- librz/hash/meson.build | 4 +- librz/include/rz_egg.h | 2 +- librz/io/meson.build | 4 +- librz/io/p/io_mach.c | 2 +- librz/io/p/io_ptrace.c | 4 +- librz/io/p/io_self.c | 2 +- librz/lang/meson.build | 4 +- librz/lang/p/lib.c | 2 +- librz/magic/d/meson.build | 2 +- librz/magic/meson.build | 4 +- librz/main/main.c | 16 +- librz/main/meson.build | 4 +- librz/main/rz_agent.c | 2 +- librz/main/rz_find.c | 2 +- librz/main/rz_hash.c | 2 +- librz/meson.build | 10 +- librz/parse/meson.build | 4 +- librz/reg/meson.build | 4 +- librz/search/meson.build | 4 +- librz/socket/meson.build | 4 +- librz/socket/run.c | 4 +- librz/syscall/d/meson.build | 2 +- librz/syscall/meson.build | 4 +- librz/util/file.c | 4 +- librz/util/meson.build | 4 +- man/rizin.1 | 8 +- man/rz-asm.1 | 2 +- man/rz-bin.1 | 14 +- man/rz-docker.1 | 6 +- man/rz-find.1 | 2 +- man/rz-run.1 | 18 +-- meson.build | 212 +++++++++++++-------------- meson_options.txt | 26 ++-- 87 files changed, 393 insertions(+), 394 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 6e20105ca0..984b6f2816 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -17,7 +17,7 @@ Make sure you are testing using the latest git version of rizin before submittin | OS/arch/bits (mandatory) | Debian arm 64, Ubuntu x86 32 | File format of the file you reverse (mandatory) | PE, ELF etc. | Architecture/bits of the file (mandatory) | PPC, x86/32, x86/64 etc. -| r2 -v full output, **not truncated** (mandatory) | rizin 2.4.0-git 17284 @ darwin-x86-64 git.2.2.0-476-gf8cf84e06 commit: f8cf84e0653642d9ad34e760e0e56dd81860e799 build: 2018-02-17__11:08:27 +| rizin -v full output, **not truncated** (mandatory) | rizin 2.4.0-git 17284 @ darwin-x86-64 git.2.2.0-476-gf8cf84e06 commit: f8cf84e0653642d9ad34e760e0e56dd81860e799 build: 2018-02-17__11:08:27 ### Expected behavior diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a522e562f6..22439b2b4b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -224,7 +224,7 @@ jobs: steps: - name: Install tools run: yum install -y patch unzip git gcc make - - name: Checkout r2 + - name: Checkout rizin run: | git clone https://github.com/${{ github.repository }} cd rizin @@ -555,7 +555,7 @@ jobs: runs-on: ubuntu-latest env: TESTS: 'armthumb baleful bcl ba2 blackfin blessr2 keystone-lib keystone lang-duktape mc6809 microblaze msil pcap ppcdisasm psosvm swf unicorn-lib unicorn vc4 x86udis x86bea x86tab x86olly x86zyan z80-nc' - R2PIPE_TESTS: 'rzpipe-go rzpipe-js rzpipe-py' + RZPIPE_TESTS: 'rzpipe-go rzpipe-js rzpipe-py' steps: - uses: actions/download-artifact@v2 with: @@ -583,7 +583,7 @@ jobs: - name: Compile and install rzpipe run: | set -e - for p in $R2PIPE_TESTS ; do + for p in $RZPIPE_TESTS ; do echo $p rz-pm -i $p done diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml index c31be4bf94..2889573ddb 100644 --- a/.github/workflows/continuous.yml +++ b/.github/workflows/continuous.yml @@ -12,13 +12,13 @@ jobs: steps: - name: Install tools run: apt-get update && apt-get install --yes patch unzip git gcc make curl pkg-config xz-utils wget file python - - name: Checkout r2 + - name: Checkout rizin run: | git clone https://github.com/${{ github.repository }} cd rizin git fetch origin ${{ github.ref }} git checkout -b local_branch FETCH_HEAD - - name: Extract r2 version + - name: Extract rizin version shell: bash run: echo "##[set-output name=branch;]$(python sys/version.py)" id: extract_version @@ -44,7 +44,7 @@ jobs: needs: [build-continuous-deb] steps: - uses: actions/checkout@v2 - - name: Extract r2 version + - name: Extract rizin version shell: bash run: echo "##[set-output name=branch;]$(python sys/version.py)" id: extract_version diff --git a/DEVELOPERS.md b/DEVELOPERS.md index eb7c9fc88b..58888d8a39 100644 --- a/DEVELOPERS.md +++ b/DEVELOPERS.md @@ -162,7 +162,7 @@ a = (b << 3) * 5; * Structure in the C files -The structure of the C files in r2 must be like this: +The structure of the C files in rizin must be like this: ```c /* Copyright ... */ ## copyright @@ -177,7 +177,7 @@ RZ_API void public(void) {} ## public apis starting with constructor/destruct * Why return int vs enum -The reason why many places in r2land functions return int instead of an enum type is because enums can't be OR'ed; otherwise, it breaks the usage within a switch statement and swig can't handle that stuff. +The reason why many places in rizin-land functions return int instead of an enum type is because enums can't be OR'ed; otherwise, it breaks the usage within a switch statement and swig can't handle that stuff. ``` rz_core_wrap.cxx:28612:60: error: assigning to 'RzRegisterType' from incompatible type 'long' @@ -226,7 +226,7 @@ rz_core_wrap.cxx:32103:61: error: assigning to 'RzDebugReasonType' from incompat * See .clang-format for work-in-progress support for automated indentation -* Use the r2 types instead of the ones in stdint, which are known to cause some +* Use the rizin types instead of the ones in stdint, which are known to cause some portability issues. So, instead of uint8_t, use ut8, etc.. * Never ever use %lld or %llx. This is not portable. Always use the PFMT64x @@ -391,7 +391,7 @@ a C compiler, a GNU make and a unix-like system. ## Cross compilation -The instructions to crosscompile r2 to Windows are in doc/windows. +The instructions to crosscompile rizin to Windows are in doc/windows. You may find other documents in doc/ explaining how to build it on iOS, linux-arm and others, but the procedure is like this: @@ -494,7 +494,7 @@ to contribute. ## HOW TO RELEASE - - Set `RELEASE=1` in global.mk and r2-bindings/config.mk.acr. + - Set `RELEASE=1` in global.mk and rizin-bindings/config.mk.acr. - Use `bsdtar` from libarchive package. GNU tar is broken. RIZIN @@ -503,7 +503,7 @@ to contribute. - `./configure` - `make dist` - R2-BINDINGS + RIZIN-BINDINGS --- - `./configure --enable-devel` - `make` diff --git a/binrz/blob/Makefile b/binrz/blob/Makefile index 661f9cb32a..c73fbe06a1 100644 --- a/binrz/blob/Makefile +++ b/binrz/blob/Makefile @@ -68,7 +68,7 @@ include ../../shlr/rizin-shell-parser-deps.mk all: symlinks symlinks: build - for FILE in r2 ${BINS} ; do \ + for FILE in ${BINS} ; do \ ln -fs rizin $$FILE ; \ done @@ -76,7 +76,6 @@ clean: mv main.c main.k rm -f *.[ch] mv main.k main.c - rm -f ${BINS2} r2 build: mv main.c main.k @@ -97,7 +96,7 @@ build: install: mkdir -p "${DESTDIR}${BINDIR}" - for FILE in r2 ${BINS2} ; do \ + for FILE in ${BINS2} ; do \ rm -f "${DESTDIR}${BINDIR}/$$FILE" ; \ cp -PRpf "$$FILE" "${DESTDIR}${BINDIR}/$$FILE" ; \ done diff --git a/binrz/blob/meson_install_links.sh b/binrz/blob/meson_install_links.sh index 958e6469f0..724fe23e01 100644 --- a/binrz/blob/meson_install_links.sh +++ b/binrz/blob/meson_install_links.sh @@ -4,7 +4,7 @@ set -e mkdir -p "${DESTDIR}/${MESON_INSTALL_PREFIX}/bin" cd "${DESTDIR}/${MESON_INSTALL_PREFIX}/bin" -TOOLS="rz_hash rz_run rz_asm rz_bin rz_gg rz_agent rz_diff rz_find rassign2 rz_ax r2" +TOOLS="rz_hash rz_run rz_asm rz_bin rz_gg rz_agent rz_diff rz_find rassign2 rz_ax" for TOOL in $TOOLS ; do ln -sf rizin $TOOL ; diff --git a/binrz/preload/librz2.c b/binrz/preload/librz2.c index ef0d637c13..f31492f210 100644 --- a/binrz/preload/librz2.c +++ b/binrz/preload/librz2.c @@ -39,7 +39,7 @@ static void _libwrap_init(void) { char *web; rz_sys_signal (SIGUSR1, sigusr1); rz_sys_signal (SIGUSR2, sigusr2); - printf ("librz initialized. send SIGUSR1 to %d in order to reach the r2 prompt\n", getpid ()); + printf ("librz initialized. send SIGUSR1 to %d in order to reach the rizin prompt\n", getpid ()); printf ("kill -USR1 %d\n", getpid ()); fflush (stdout); web = rz_sys_getenv ("RZ_RUN_WEB"); diff --git a/binrz/rizin/rizin.c b/binrz/rizin/rizin.c index e39c7b35ac..74ef7664d3 100644 --- a/binrz/rizin/rizin.c +++ b/binrz/rizin/rizin.c @@ -81,7 +81,7 @@ static int rz_main_rzpipe(int argc, const char **argv) { } } else { eprintf ("Error: R2PIPE_(IN|OUT) environment not set\n"); - eprintf ("Usage: r2 -c '!*r2p x' # run commands via rzpipe\n"); + eprintf ("Usage: rizin -c '!*rzp x' # run commands via rzpipe\n"); rc = 1; } free (_in); @@ -90,7 +90,7 @@ static int rz_main_rzpipe(int argc, const char **argv) { } int main(int argc, const char **argv) { - if (argc > 0 && strstr (argv[0], "r2p")) { + if (argc > 0 && strstr (argv[0], "rzp")) { return rz_main_rzpipe (argc, argv); } return rz_main_rizin (argc, argv); diff --git a/doc/fortunes.fun b/doc/fortunes.fun index 90624912c5..27138e1b86 100644 --- a/doc/fortunes.fun +++ b/doc/fortunes.fun @@ -17,17 +17,17 @@ rizin is like windows 7 but even better. We are surrounded by the enemy. - Excellent, we can attack in any direction! rizin-built farm beats the facebook one. Thank you for using rizin. Have a nice night! -Your r2 was built 20h ago. TOO OLD! +Your rizin was built 20h ago. TOO OLD! Use rizin! Lemons included! rz_ax -s 20e296b20ae296b220e296b20a -Connection lost with the license server, your r2 session will terminate in 30 minutes. +Connection lost with the license server, your rizin session will terminate in 30 minutes. This is amazing ... I love gradients. Wait a moment ... Don't do this. No such file or directory. Default scripting languages are NodeJS and Python. --bash: r2: command not found +-bash: rizin: command not found Press any key to continue ... Ilo ni li pona li pali e lipu. mi wile e ni: sina kama jo e musi rizin for FideOS, now with extra potato @@ -54,7 +54,7 @@ I am Pentium of Borg. Division is futile. You will be approximated. Don't look at the code. Don't look. Dissasemble? No dissasemble, no dissassemble!!!!! Warning, your trial license is about to expire. -Please register your copy of r2 today! Only £29.90! +Please register your copy of rizin today! Only £29.90! Welcome to IDA 10.0. It's not you, it's me. This software comes with no brain included. Please use your own. @@ -104,7 +104,7 @@ I accidentally radared my filesystem today. No fix, no sleep You see it, you fix it! V is for Visual -r2-goverity: found corruption - please eliminate! +rizin-goverity: found corruption - please eliminate! Stop debugging me! THIS IS NOT A BUG Polish reversers blame git @@ -112,11 +112,11 @@ vm is like a small cow in ascii Do you want to print 333.5K chars? (y/N) Now with more better English! :(){ :|:& };: -All your base are belong to r2 -Ask not what r2 can do for you - ask what you can do for r2 +All your base are belong to rizin +Ask not what rizin can do for you - ask what you can do for rizin Try with ASAN, and be amazed bash: r3: command not found -R2 loves everyone, even Java coders, but less than others +rizin loves everyone, even Java coders, but less than others It's not a bug, it's a work in progress Stop swearing! I didn't say that it was working, I said that it's implemented @@ -125,8 +125,8 @@ Remember that word: C H A I R what happens in #radare, stays in #radare For a full list of commands see `strings /dev/urandom` Good morning, pal *<:-) -Of course r2 runs FreeBSD -Reverser by Birth, r2 by Choice +Of course rizin runs FreeBSD +Reverser by Birth, rizin by Choice Radare2, what else? This incident will be reported command not found: calc.exe @@ -157,7 +157,7 @@ Hello Mr. Anderson Try pressing the pigeon-shaped button What has been executed cannot be unexecuted What about taking a break? Here, have this nice 0xCC. -r2 is meant to be read by machines. +rizin is meant to be read by machines. Prove you are a robot to continue ... This is fine. Using rizin to generate intelligence ... @@ -166,38 +166,38 @@ It's the year of desktop on rizin 💺 It's the year of rizin on the desktop SSAbotage from ISIL -"a collection of garbage" -- an r2 pro user +"a collection of garbage" -- an rizin pro user A git pull a day keeps the segfault away Are you a wizard? Learn pancake as if you were radare! -r2 is a great OS, but a terrible hex editor +rizin is a great OS, but a terrible hex editor THE CAKE IS A PIE rizin 0.9.7 is so old, my grandfarther was using it with his enigma in WWII Have you seen the latest rizin TV spot? scp ~/.idapro/ida.key radare.org:/var/www/radare.org/pub/losers/ -Too bad there is no gif support in r2. Yet. -- @r2gif +Too bad there is no gif support in rizin. Yet. -- @rizingif Almost 5am, maybe you should go to bed. Jingle sploits, jingle sploits, ropchain all the way. Mind that the 'g' in radare is silent 256 colors ought to be enough for anybody Hang in there, Baby! Run a command with unspecified long sequence of 'a', pancake will be summoned and do the analysis for you. -In r2land usability is treated as a bug +In rizinland usability is treated as a bug rizin is WYSIWYF - what you see is what you fix Your endian swaps *(ut64*)buffer ought to be illegal How about Global Thermonuclear War? There is no F5 key in rizin yet -Did you know that r2 is 10 years old? +Did you know that rizin is 10 years old? Beer in mind. -r2 -- leading options since 2006 +rizin -- leading options since 2006 Don’t feed the bugs! (except delicious stacktraces)! Feed the bugs! You haxor! Me jane? -r2 talks to you. tries to make you feel well. +rizin talks to you. tries to make you feel well. Now i'm like an evil engineer. MUAHAHAH We only have bugs, features are an unintended side-effect -There are 5 minutes from WTF to FIX in r2land +There are 5 minutes from WTF to FIX in rizinland Quantum dissasemble: it's there as long as you don't observe it Ceci n'est pas une rzpipe Buy a mac @@ -210,7 +210,7 @@ Disassemble?! No Disassemble Johnny No. 5!!! You crackme up! Welcome, "reenigne" Search returned no hits. Did you mean 'Misassemble'? -º|<|<| -( glu glu glu, im the r2 fish ) +º|<|<| -( glu glu glu, im the rizin fish ) Everybody hates warnings. Mr. Pancake, tear down this -Wall TIRED OF WAITING We fix bugs while you sleep. @@ -227,7 +227,7 @@ Mind the tab Buy a Mac You have been designated for disassembly Helping siol merge? No way, that would be like.. way too much not lazy. - vifino -What is the most complex r2 command? q - then you have to deal with real life /o\ +What is the most complex rizin command? q - then you have to deal with real life /o\ If you're having fun using rizin, odds are that you're doing something wrong. Don't trust what can't be compiled Coffee time! @@ -241,7 +241,7 @@ git checkout hamster Noot noot This is an unregistered copy. 10 reasons you want to bt on all threads - you will be shocked by number 3! -Place a cat on your keyboard while running r2, you'll not believe what will happen next +Place a cat on your keyboard while running rizin, you'll not believe what will happen next This binary may contain traces of human Help subcommand will be eventually removed. Carpe noctum. @@ -249,11 +249,11 @@ Your mouse has moved. Radare2 NT must be restarted for the change to take effect There is only one binary, and we are all just reversing pieces of it. Radare2 is like violence. If it doesn't solve your problem, you aren't using enough. Order pizza for $12.48? [Y/n] -r2OS r2pad 0.1 SMP GENERIC r2_64 GNU/r2OS +rizinOS rizinpad 0.1 SMP GENERIC rizin_64 GNU/rizinOS AHHHHH!!!! ASSEMBLY CODE!!!!!! HOLD ME I'M SCARED!!!!!!!!!! In radare we trust We don't make mistakes... just happy little segfaults. -r2 is for the people +rizin is for the people Use headphones for best experience. Starting bitcoin miner in background... Downloading and verifying the blockchain... @@ -263,7 +263,7 @@ This software is sold for home use only and all other rights are expressly rever Any commercial use or duplication of this copylefted material without prior licensing is forbidden. Violators will be prosecuted. This shell has been seized by the Internet's Police. -OpenBSD might pledge r2 but r2 unveils OpenBSD. +OpenBSD might pledge rizin but rizin unveils OpenBSD. Error: There's a missing space before the opening parenthesis '(' WARNING: r_list_length: assertion 'list' failed (line 55) This accessory is not supported by this version of rizin. @@ -286,7 +286,7 @@ You will soon have an out of memory experience. This binary no good. Try another. BSOD! Mind the trap. -For a full documentation see `r2 -qc iz /lib/librz_core.so` +For a full documentation see `rizin -qc iz /lib/librz_core.so` 99 bugs, take one down pass it around. 100 bugs... I like my binary stripped. Now 8-bit clean with better ＡＳＣＩＩ! diff --git a/doc/fortunes.nsfw b/doc/fortunes.nsfw index 540b0647f4..0a6568456f 100644 --- a/doc/fortunes.nsfw +++ b/doc/fortunes.nsfw @@ -15,9 +15,9 @@ You should know that ptracing binaries younger than 18yo is illegal. Bitch Kentucky Fried Children Fill the bug. Fill it with love. With the creamy and hot sauce of love. -This is a compressed PDF. Why the hell are you opening this in r2 ? SIGSEGV +This is a compressed PDF. Why the hell are you opening this in rizin ? SIGSEGV I hope you segfault in hell. -r2 your penis +rizin your penis I script in C, because fuck you. Fuck you, fuck you in the mouth, with a chair! Git histories, allowing us to recover profanity because fuck you diff --git a/doc/fortunes.tips b/doc/fortunes.tips index 3b2a91d145..46867c8447 100644 --- a/doc/fortunes.tips +++ b/doc/fortunes.tips @@ -4,17 +4,17 @@ In visual mode press 'c' to toggle the cursor mode. Use tab to navigate You can mark an offset in visual mode with the cursor and the ',' key. Later press '.' to go back You can debug a program from the graph view ('ag') using standard rizin commands Use the '[' and ']' keys in visual mode to adjust the screen width -Select your architecture with: 'e asm.arch=' or r2 -a from the shell +Select your architecture with: 'e asm.arch=' or rizin -a from the shell Move between your search hits in visual mode using the 'f' and 'F' keys Save your projects with 'Ps ' and restore then with 'Po ' Enable asm.trace to see the tracing information inside the disassembly Change the registers of the child process in this way: 'dr eax=0x333' -Check your IO plugins with 'r2 -L' +Check your IO plugins with 'rizin -L' Change the size of the file with the 'r' (resize) command Calculate checksums for the current block with the commands starting with '#' (#md5, #crc32, #all, ..) Use +,-,*,/ to change the size of the block Change the block size with 'b '. In visual mode you can also enter rizin command pressing the ':' key (like vi does) -If you want to open the file in read-write mode, invoke r2 with '-w' +If you want to open the file in read-write mode, invoke rizin with '-w' Print the contents of the current block with the 'p' command Command layout is: @. For example: 3x20@0x33 will show 3 hexdumps of 20 bytes at 0x33 Press 'c' in visual mode to toggle the cursor mode @@ -59,7 +59,7 @@ Use scr.accel to browse the file faster! Use the 'id' command to see the source line related to the current seek Analyze socket connections with the socket plugin: 'rizin socket://www.foo.com:80'. Use 'w' to send data Setup dbg.fpregs to true to visualize the fpu registers in the debugger view. -To debug a program, you can call r2 with 'dbg://' or '-d ' +To debug a program, you can call rizin with 'dbg://' or '-d ' Use 'e' and 't' in Visual mode to edit configuration and track flags. Use 'rz_bin -ris' to get the import/export symbols of any binary. Remember to maintain your ~/.radare_history @@ -71,8 +71,8 @@ Rename a function using the 'afr @ ' command. You can redefine descriptive commands in the hud file and using the 'V_' command. Pass '-j' to rz_bin to get the information of the binary in JSON format. Use rz_run to launch your programs with a predefined environment. -You are probably using an old version of r2, go checkout the git! -Run your own r2 scripts in awk using the r2awk program. +You are probably using an old version of rizin, go checkout the git! +Run your own rizin scripts in awk using the rizinawk program. Use '-e bin.strings=false' to disable automatic string search when loading the binary. The unix-like reverse engineering framework. This code was intentionally left blank, try 'e asm.arch = ws' diff --git a/librz/anal/d/meson.build b/librz/anal/d/meson.build index dd871c3a88..15c3920972 100644 --- a/librz/anal/d/meson.build +++ b/librz/anal/d/meson.build @@ -82,6 +82,6 @@ foreach file : sdb_files depends: sdb_exe, build_by_default: true, install: true, - install_dir: join_paths(r2_sdb, 'fcnsign') + install_dir: join_paths(rizin_sdb, 'fcnsign') ) endforeach diff --git a/librz/anal/meson.build b/librz/anal/meson.build index 9e68fb35fe..d005eece32 100644 --- a/librz/anal/meson.build +++ b/librz/anal/meson.build @@ -185,7 +185,7 @@ rz_anal = library('rz_anal', rz_anal_sources, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - soversion: r2_libversion + soversion: rizin_libversion ) rz_anal_dep = declare_dependency(link_with: rz_anal, @@ -193,7 +193,7 @@ rz_anal_dep = declare_dependency(link_with: rz_anal, pkgconfig_mod.generate(rz_anal, subdirs: 'librz', - version: r2_version, + version: rizin_version, name: 'rz_anal', filebase: 'rz_anal', libraries: pkgcfg_sanitize_libs, diff --git a/librz/asm/d/meson.build b/librz/asm/d/meson.build index 1c9e5c1b42..08ef17d420 100644 --- a/librz/asm/d/meson.build +++ b/librz/asm/d/meson.build @@ -38,6 +38,6 @@ foreach file : sdb_files depends: sdb_exe, build_by_default: true, install: true, - install_dir: join_paths(r2_sdb, 'opcodes') + install_dir: join_paths(rizin_sdb, 'opcodes') ) endforeach diff --git a/librz/asm/meson.build b/librz/asm/meson.build index 9724c461e7..b80e0d33de 100644 --- a/librz/asm/meson.build +++ b/librz/asm/meson.build @@ -229,7 +229,7 @@ rz_asm = library('rz_asm', rz_asm_sources, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - soversion: r2_libversion + soversion: rizin_libversion ) rz_asm_dep = declare_dependency(link_with: rz_asm, @@ -237,7 +237,7 @@ rz_asm_dep = declare_dependency(link_with: rz_asm, pkgconfig_mod.generate(rz_asm, subdirs: 'librz', - version: r2_version, + version: rizin_version, name: 'rz_asm', filebase: 'rz_asm', libraries: pkgcfg_sanitize_libs, diff --git a/librz/bin/d/meson.build b/librz/bin/d/meson.build index 98358e51f2..ef699c07c5 100644 --- a/librz/bin/d/meson.build +++ b/librz/bin/d/meson.build @@ -161,7 +161,7 @@ foreach file : sdb_files depends: sdb_exe, build_by_default: true, install: true, - install_dir: join_paths(r2_sdb, 'format/dll') + install_dir: join_paths(rizin_sdb, 'format/dll') ) endforeach @@ -176,5 +176,5 @@ format_files = [ ] install_data(format_files, - install_dir: join_paths(r2_sdb, 'format') + install_dir: join_paths(rizin_sdb, 'format') ) diff --git a/librz/bin/meson.build b/librz/bin/meson.build index 411b1fb4ef..1cde05bed9 100644 --- a/librz/bin/meson.build +++ b/librz/bin/meson.build @@ -154,7 +154,7 @@ rz_bin = library('rz_bin', rz_bin_sources, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - soversion: r2_libversion + soversion: rizin_libversion ) rz_bin_dep = declare_dependency(link_with: rz_bin, @@ -162,7 +162,7 @@ rz_bin_dep = declare_dependency(link_with: rz_bin, pkgconfig_mod.generate(rz_bin, subdirs: 'librz', - version: r2_version, + version: rizin_version, name: 'rz_bin', filebase: 'rz_bin', libraries: pkgcfg_sanitize_libs, diff --git a/librz/bp/meson.build b/librz/bp/meson.build index b8c184e0cd..7d295c2f83 100644 --- a/librz/bp/meson.build +++ b/librz/bp/meson.build @@ -19,7 +19,7 @@ rz_bp = library('rz_bp', rz_bp_sources, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - soversion: r2_libversion + soversion: rizin_libversion ) rz_bp_dep = declare_dependency(link_with: rz_bp, @@ -27,7 +27,7 @@ rz_bp_dep = declare_dependency(link_with: rz_bp, pkgconfig_mod.generate(rz_bp, subdirs: 'librz', - version: r2_version, + version: rizin_version, name: 'rz_bp', filebase: 'rz_bp', libraries: pkgcfg_sanitize_libs, diff --git a/librz/config/meson.build b/librz/config/meson.build index b80b38d6c5..c61b095109 100644 --- a/librz/config/meson.build +++ b/librz/config/meson.build @@ -12,7 +12,7 @@ rz_config = library('rz_config', rz_config_sources, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - soversion: r2_libversion + soversion: rizin_libversion ) rz_config_dep = declare_dependency(link_with: rz_config, @@ -20,7 +20,7 @@ rz_config_dep = declare_dependency(link_with: rz_config, pkgconfig_mod.generate(rz_config, subdirs: 'librz', - version: r2_version, + version: rizin_version, name: 'rz_config', filebase: 'rz_config', libraries: pkgcfg_sanitize_libs, diff --git a/librz/cons/d/meson.build b/librz/cons/d/meson.build index 2ff61bac0a..6557a995f5 100644 --- a/librz/cons/d/meson.build +++ b/librz/cons/d/meson.build @@ -1,4 +1,4 @@ install_subdir('.', - install_dir: join_paths(get_option('prefix'), r2_themes), + install_dir: join_paths(get_option('prefix'), rizin_themes), exclude_files: ['Makefile', 'meson.build'] ) diff --git a/librz/cons/meson.build b/librz/cons/meson.build index 53b048beec..a0ff6e3dd2 100644 --- a/librz/cons/meson.build +++ b/librz/cons/meson.build @@ -28,7 +28,7 @@ rz_cons = library('rz_cons', rz_cons_sources, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - soversion: r2_libversion + soversion: rizin_libversion ) rz_cons_dep = declare_dependency(link_with: rz_cons, @@ -36,7 +36,7 @@ rz_cons_dep = declare_dependency(link_with: rz_cons, pkgconfig_mod.generate(rz_cons, subdirs: 'librz', - version: r2_version, + version: rizin_version, name: 'rz_cons', filebase: 'rz_cons', libraries: pkgcfg_sanitize_libs, diff --git a/librz/core/cconfig.c b/librz/core/cconfig.c index ef2af36b5d..0dd84319f9 100644 --- a/librz/core/cconfig.c +++ b/librz/core/cconfig.c @@ -1951,7 +1951,7 @@ static bool cb_iova(void *user, void *data) { RzConfigNode *node = (RzConfigNode *) data; if (node->i_value != core->io->va) { core->io->va = node->i_value; - /* ugly fix for r2 -d ... "r2 is going to die soon ..." */ + /* ugly fix for rizin -d ... "rizin is going to die soon ..." */ if (core->io->desc) { rz_core_block_read (core); } @@ -2842,7 +2842,7 @@ RZ_API int rz_core_config_init(RzCore *core) { if (!pfx) { pfx = strdup (RZ_PREFIX); } - SETCB ("dir.prefix", pfx, (RzConfigCallback)&cb_dirpfx, "Default prefix r2 was compiled for"); + SETCB ("dir.prefix", pfx, (RzConfigCallback)&cb_dirpfx, "Default prefix rizin was compiled for"); free (pfx); } #if __ANDROID__ @@ -3233,7 +3233,7 @@ RZ_API int rz_core_config_init(RzCore *core) { free (p); // RZ_LOGTRAP_LEVEL / log.traplevel p = rz_sys_getenv ("RZ_LOGTRAPLEVEL"); - SETICB ("log.traplevel", p ? atoi(p) : RZ_LOGLVL_FATAL, cb_log_config_traplevel, "Log level for trapping R2 when hit"\ + SETICB ("log.traplevel", p ? atoi(p) : RZ_LOGLVL_FATAL, cb_log_config_traplevel, "Log level for trapping rizin when hit"\ " (0:SILLY, 1:VERBOSE, 2:DEBUG, 3:INFO, 4:WARN, 5:ERROR, 6:FATAL)" ); free (p); @@ -3578,12 +3578,12 @@ RZ_API int rz_core_config_init(RzCore *core) { SETI ("scr.scrollbar", 0, "Show flagzone (fz) scrollbar in visual mode (0=no,1=right,2=top,3=bottom)"); SETBPREF ("scr.randpal", "false", "Random color palete or just get the next one from 'eco'"); SETCB ("scr.highlight.grep", "false", &cb_scr_color_grep_highlight, "Highlight (INVERT) the grepped words"); - SETBPREF ("scr.prompt.file", "false", "Show user prompt file (used by r2 -q)"); + SETBPREF ("scr.prompt.file", "false", "Show user prompt file (used by rizin -q)"); SETBPREF ("scr.prompt.flag", "false", "Show flag name in the prompt"); SETBPREF ("scr.prompt.sect", "false", "Show section name in the prompt"); SETBPREF ("scr.tts", "false", "Use tts if available by a command (see ic)"); SETCB ("scr.hist.block", "true", &cb_scr_histblock, "Use blocks for histogram"); - SETCB ("scr.prompt", "true", &cb_scrprompt, "Show user prompt (used by r2 -q)"); + SETCB ("scr.prompt", "true", &cb_scrprompt, "Show user prompt (used by rizin -q)"); SETCB ("scr.tee", "", &cb_teefile, "Pipe output to file of this name"); SETPREF ("scr.seek", "", "Seek to the specified address on startup"); SETICB ("scr.color", (core->print->flags&RZ_PRINT_FLAGS_COLOR)?COLOR_MODE_16:COLOR_MODE_DISABLED, &cb_color, "Enable colors (0: none, 1: ansi, 2: 256 colors, 3: truecolor)"); @@ -3647,7 +3647,7 @@ RZ_API int rz_core_config_init(RzCore *core) { SETCB ("io.pcache.write", "false", &cb_iopcachewrite, "Enable write-cache"); SETCB ("io.pcache.read", "false", &cb_iopcacheread, "Enable read-cache"); SETCB ("io.ff", "true", &cb_ioff, "Fill invalid buffers with 0xff instead of returning error"); - SETBPREF ("io.exec", "true", "See !!r2 -h~-x"); + SETBPREF ("io.exec", "true", "See !!rizin -h~-x"); SETICB ("io.0xff", 0xff, &cb_io_oxff, "Use this value instead of 0xff to fill unallocated areas"); SETCB ("io.aslr", "false", &cb_ioaslr, "Disable ASLR for spawn and such"); SETCB ("io.va", "true", &cb_iova, "Use virtual address layout"); diff --git a/librz/core/cmd.c b/librz/core/cmd.c index f8b73f3014..82d086c30d 100644 --- a/librz/core/cmd.c +++ b/librz/core/cmd.c @@ -125,7 +125,7 @@ static void cmd_debug_reg(RzCore *core, const char *str); static const char *help_msg_dollar[] = { "Usage:", "$alias[=cmd] [args...]", "Alias commands and strings (See ?$? for help on $variables)", "$", "", "list all defined aliases", - "$*", "", "list all the aliases as r2 commands in base64", + "$*", "", "list all the aliases as rizin commands in base64", "$**", "", "same as above, but using plain text", "$", "foo:=123", "alias for 'f foo=123'", "$", "foo-=4", "alias for 'f foo-=4'", @@ -153,15 +153,15 @@ static const char *help_msg_star[] = { }; static const char *help_msg_dot[] = { - "Usage:", ".[r2cmd] | [file] | [!command] | [(macro)]", "# define macro or interpret r2, rz_lang,\n" + "Usage:", ".[rizincmd] | [file] | [!command] | [(macro)]", "# define macro or interpret rizin, rz_lang,\n" " cparse, d, es6, exe, go, js, lsp, pl, py, rb, sh, vala or zig file", ".", "", "repeat last command backward", - ".", "r2cmd", "interpret the output of the command as r2 commands", - "..", " [file]", "run the output of the execution of a script as r2 commands", + ".", "rizincmd", "interpret the output of the command as rizin commands", + "..", " [file]", "run the output of the execution of a script as rizin commands", "...", "", "repeat last command forward (same as \\n)", ".:", "8080", "listen for commands on given tcp port", ".--", "", "terminate tcp server for remote commands", - ".", " foo.r2", "interpret script", + ".", " foo.rz", "interpret script", ".-", "", "open cfg.editor and interpret tmp file", ".*", " file ...", "same as #!pipe open cfg.editor and interpret tmp file", ".!", "rabin -ri $FILE", "interpret output of command", @@ -171,7 +171,7 @@ static const char *help_msg_dot[] = { }; static const char *help_msg_equal[] = { - "Usage:", " =[:!+-=ghH] [...]", " # connect with other instances of r2", + "Usage:", " =[:!+-=ghH] [...]", " # connect with other instances of rizin", "\nremote commands:", "", "", "=", "", "list all open connections", "=<", "[fd] cmd", "send output of local command to remote fd", // XXX may not be a special char @@ -192,10 +192,10 @@ static const char *help_msg_equal[] = { "=&", ":port", "start rap server in background (same as '&_=h')", "=", ":host:port cmd", "run 'cmd' command on remote server", "\nexamples:","","", - "=+", "tcp://localhost:9090/", "connect to: r2 -c.:9090 ./bin", - // "=+", "udp://localhost:9090/", "connect to: r2 -c.:9090 ./bin", - "=+", "rap://localhost:9090/", "connect to: r2 rap://:9090", - "=+", "http://localhost:9090/cmd/", "connect to: r2 -c'=h 9090' bin", + "=+", "tcp://localhost:9090/", "connect to: rizin -c.:9090 ./bin", + // "=+", "udp://localhost:9090/", "connect to: rizin -c.:9090 ./bin", + "=+", "rap://localhost:9090/", "connect to: rizin rap://:9090", + "=+", "http://localhost:9090/cmd/", "connect to: rizin -c'=h 9090' bin", "o ", "rap://:9090/", "start the rap server on tcp port 9090", NULL }; @@ -203,7 +203,7 @@ static const char *help_msg_equal[] = { #if 0 static const char *help_msg_equalh[] = { "Usage:", "=h[---*&] [port]", " # manage http connections", - "=h", " port", "listen for http connections (r2 -qc=H /bin/ls)", + "=h", " port", "listen for http connections (rizin -qc=H /bin/ls)", "=h-", "", "stop background webserver", "=h--", "", "stop foreground webserver", "=h*", "", "restart current webserver", @@ -215,7 +215,7 @@ static const char *help_msg_equalh[] = { static const char *help_msg_equalh[] = { "Usage:", " =[hH] [...]", " # http server", "http server:", "", "", - "=h", " port", "listen for http connections (r2 -qc=H /bin/ls)", + "=h", " port", "listen for http connections (rizin -qc=H /bin/ls)", "=h-", "", "stop background webserver", "=h--", "", "stop foreground webserver", "=h*", "", "restart current webserver", @@ -240,7 +240,7 @@ static const char *help_msg_b[] = { "b", "", "display current block size", "b", "+3", "increase blocksize by 3", "b", "-16", "decrease blocksize by 16", - "b*", "", "display current block size in r2 command", + "b*", "", "display current block size in rizin command", "bf", " foo", "set block size to flag size", "bj", "", "display block size information in JSON", "bm", " 1M", "set max block size", @@ -274,7 +274,7 @@ static const char *help_msg_r[] = { "rb", "oldbase @ newbase", "rebase all flags, bin.info, breakpoints and analysis", "rm" ," [file]", "remove file", "rh" ,"", "show size in human format", - "r2" ," [file]", "launch r2 (same for rz_ax, rz_asm, ...)", + "rz" ," [file]", "launch rizin (same for rz-ax, rz-asm, ...)", "reset" ,"", "reset console settings (clear --hard)", NULL }; @@ -297,7 +297,7 @@ static const char *help_msg_y[] = { "y", " 16 @ 0x200", "copy 16 bytes into clipboard from 0x200", "y", " 16", "copy 16 bytes into clipboard", "y", "", "show yank buffer information (srcoff len bytes)", - "y*", "", "print in r2 commands what's been yanked", + "y*", "", "print in rizin commands what's been yanked", "yf", " 64 0x200", "copy file 64 bytes from 0x200 from file", "yfa", " file copy", "copy all bytes from file (opens w/ io)", "yfx", " 10203040", "yank from hexpairs (same as ywx)", @@ -1725,7 +1725,7 @@ static bool cmd_rzcmd(RzCore *core, const char *_input) { int rc = 0; if (rz_str_startswith (input, "rz_ax")) { rc = __runMain (core->rz_main_rz_ax, input); - } else if (rz_str_startswith (input, "r2")) { + } else if (rz_str_startswith (input, "rz")) { rz_sys_cmdf ("%s", input); // rc = __runMain (core->rz_main_rizin, input); } else if (rz_str_startswith (input, "rizin")) { @@ -1746,12 +1746,12 @@ static bool cmd_rzcmd(RzCore *core, const char *_input) { } else if (rz_str_startswith (input, "rz_diff")) { rc = __runMain (core->rz_main_rz_diff, input); } else { - const char *r2cmds[] = { - "rz_ax", "rz_pm", "rz_asm", "rz_bin", "rz_hash", "rz_find", "rz_run", "rz_gg", "rizin", "r2", NULL + const char *rzcmds[] = { + "rz-ax", "rz-pm", "rz-asm", "rz-bin", "rz-hash", "rz-find", "rz-run", "rz-gg", "rizin", "rz", NULL }; int i; - for (i = 0; r2cmds[i]; i++) { - if (rz_str_startswith (input, r2cmds[i])) { + for (i = 0; rzcmds[i]; i++) { + if (rz_str_startswith (input, rzcmds[i])) { free (input); return true; } @@ -1803,10 +1803,10 @@ static int cmd_resize(void *data, const char *input) { return true; case 'b': // "rb" rebase return cmd_rebase (core, input + 1); - case '2': // "r2" // XXX should be handled already in cmd_rzcmd() + case 'z': // "rz" // XXX should be handled already in cmd_rzcmd() // TODO: use argv[0] instead of 'rizin' - // TODO: { char **argv = { "r2", NULL }; rz_main_rizin (1, argv); } - rz_sys_cmdf ("radare%s", input); + // TODO: { char **argv = { "rz", NULL }; rz_main_rizin (1, argv); } + rz_sys_cmdf ("rizin%s", input); return true; case 'm': // "rm" if (input[1] == ' ') { diff --git a/librz/core/cmd_anal.c b/librz/core/cmd_anal.c index de1870f240..be179447ad 100644 --- a/librz/core/cmd_anal.c +++ b/librz/core/cmd_anal.c @@ -470,12 +470,12 @@ static const char *help_msg_aft[] = { static const char *help_msg_afv[] = { "Usage:", "afv","[rbs]", - "afv*", "", "output r2 command to add args/locals to flagspace", + "afv*", "", "output rizin command to add args/locals to flagspace", "afv-", "([name])", "remove all or given var", "afv=", "", "list function variables and arguments with disasm refs", "afva", "", "analyze function arguments/locals", "afvb", "[?]", "manipulate bp based arguments/locals", - "afvd", " name", "output r2 command for displaying the value of args/locals in the debugger", + "afvd", " name", "output rizin command for displaying the value of args/locals in the debugger", "afvf", "", "show BP relative stackframe variables", "afvn", " [new_name] ([old_name])", "rename argument/local", "afvr", "[?]", "manipulate register based arguments", @@ -490,7 +490,7 @@ static const char *help_msg_afv[] = { static const char *help_msg_afvb[] = { "Usage:", "afvb", " [idx] [name] ([type])", "afvb", "", "list base pointer based arguments, locals", - "afvb*", "", "same as afvb but in r2 commands", + "afvb*", "", "same as afvb but in rizin commands", "afvb", " [idx] [name] ([type])", "define base pointer based arguments, locals", "afvbj", "", "return list of base pointer based arguments, locals in JSON format", "afvb-", " [name]", "delete argument/locals at the given name", @@ -502,7 +502,7 @@ static const char *help_msg_afvb[] = { static const char *help_msg_afvr[] = { "Usage:", "afvr", " [reg] [type] [name]", "afvr", "", "list register based arguments", - "afvr*", "", "same as afvr but in r2 commands", + "afvr*", "", "same as afvr but in rizin commands", "afvr", " [reg] [name] ([type])", "define register arguments", "afvrj", "", "return list of register arguments in JSON format", "afvr-", " [name]", "delete register arguments at the given index", @@ -514,7 +514,7 @@ static const char *help_msg_afvr[] = { static const char *help_msg_afvs[] = { "Usage:", "afvs", " [idx] [type] [name]", "afvs", "", "list stack based arguments and locals", - "afvs*", "", "same as afvs but in r2 commands", + "afvs*", "", "same as afvs but in rizin commands", "afvs", " [idx] [name] [type]", "define stack based arguments,locals", "afvsj", "", "return list of stack based arguments and locals in JSON format", "afvs-", " [name]", "delete stack based argument or locals with the given name", @@ -543,7 +543,7 @@ static const char *help_msg_ag[] = { "","","", "Output formats:", "", "", "", "", "Ascii art", - "*", "", "r2 commands", + "*", "", "rizin commands", "d", "", "Graphviz dot", "g", "", "Graph Modelling Language (gml)", "j", "", "json ('J' for formatted disassembly)", @@ -648,7 +648,7 @@ static const char *help_msg_ao[] = { static const char *help_msg_ar[] = { "Usage: ar", "", "# Analysis Registers", "ar", "", "Show 'gpr' registers", - "ar.", ">$snapshot", "Show r2 commands to set register values to the current state", + "ar.", ">$snapshot", "Show rizin commands to set register values to the current state", "ar,", "", "Show registers in table format (see dr,)", ".ar*", "", "Import register values as flags", ".ar-", "", "Unflag all registers", @@ -709,7 +709,7 @@ static const char *help_msg_av[] = { "Usage:", "av[?jr*]", " C++ vtables and RTTI", "av", "", "search for vtables in data sections and show results", "avj", "", "like av, but as json", - "av*", "", "like av, but as r2 commands", + "av*", "", "like av, but as rizin commands", "avr", "[j@addr]", "try to parse RTTI at vtable addr (see anal.cpp.abi)", "avra", "[j]", "search for vtables and try to parse RTTI at each of them", "avrr", "", "recover class info from all findable RTTI (see ac)", @@ -748,7 +748,7 @@ static const char *help_msg_axt[]= { "axtj", " [addr]", "find data/code references to this address and print in json format", "axtg", " [addr]", "display commands to generate graphs according to the xrefs", "axtq", " [addr]", "find and list the data/code references in quiet mode", - "axt*", " [addr]", "same as axt, but prints as r2 commands", + "axt*", " [addr]", "same as axt, but prints as rizin commands", NULL }; @@ -903,7 +903,7 @@ static bool cmd_anal_aaft(RzCore *core) { return false; } if (!io_cache) { - // XXX. we shouldnt need this, but it breaks 'r2 -c aaa -w ls' + // XXX. we shouldnt need this, but it breaks 'rizin -c aaa -w ls' rz_config_set_i (core->config, io_cache_key, true); } seek = core->offset; @@ -7551,7 +7551,7 @@ static bool cmd_anal_refs(RzCore *core, const char *input) { { Sdb *db = sdb_new0 (); if (input[1] == '*') { - anal_axg (core, input + 2, 0, db, RZ_CORE_ANAL_GRAPHBODY, NULL); // r2 commands + anal_axg (core, input + 2, 0, db, RZ_CORE_ANAL_GRAPHBODY, NULL); // rizin commands } else if (input[1] == 'j') { PJ *pj = pj_new (); anal_axg (core, input + 2, 0, db, RZ_CORE_ANAL_JSON, pj); @@ -9661,7 +9661,7 @@ static int cmd_anal_all(RzCore *core, const char *input) { bool didAap = false; char *dh_orig = NULL; if (!strncmp (input, "aaaaa", 5)) { - eprintf ("An r2 developer is coming to your place to manually analyze this program. Please wait for it\n"); + eprintf ("A rizin developer is coming to your place to manually analyze this program. Please wait for it\n"); if (rz_cons_is_interactive ()) { rz_cons_any_key (NULL); } @@ -9675,7 +9675,7 @@ static int cmd_anal_all(RzCore *core, const char *input) { rz_print_rowlog_done (core->print, oldstr); rz_core_task_yield (&core->tasks); // Run pending analysis immediately after analysis - // Usefull when running commands with ";" or via r2 -c,-i + // Usefull when running commands with ";" or via rizin -c,-i dh_orig = core->dbg->h ? strdup (core->dbg->h->name) : strdup ("esil"); diff --git a/librz/core/cmd_cmp.c b/librz/core/cmd_cmp.c index 59c1d98d81..0d3576d433 100644 --- a/librz/core/cmd_cmp.c +++ b/librz/core/cmd_cmp.c @@ -5,7 +5,7 @@ static const char *help_msg_c[] = { "Usage:", "c[?dfx] [argument]", " # Compare", "c", " [string]", "Compare a plain with escaped chars string", - "c*", " [string]", "Same as above, but printing r2 commands instead", + "c*", " [string]", "Same as above, but printing rizin commands instead", "c1", " [addr]", "Compare 8 bits from current offset", "c2", " [value]", "Compare a word from a math expression", "c4", " [value]", "Compare a doubleword from a math expression", @@ -27,7 +27,7 @@ static const char *help_msg_c[] = { "cV", "[1248] [addr] @at", "Compare 1,2,4,8-byte address contents (silent, return in $?)", "cw", "[?] [us?] [...]", "Compare memory watchers", "cx", " [hexpair]", "Compare hexpair string (use '.' as nibble wildcard)", - "cx*", " [hexpair]", "Compare hexpair string (output r2 commands)", + "cx*", " [hexpair]", "Compare hexpair string (output rizin commands)", "cX", " [addr]", "Like 'cc' but using hexdiff output", NULL }; @@ -341,7 +341,7 @@ static void cmd_cmp_watcher(RzCore *core, const char *input) { "cw", " addr", "List all compare watchers", "cw", " addr sz cmd", "Add a memory watcher", // "cws", " [addr]", "Show watchers", - "cw", "*", "List compare watchers in r2 cmds", + "cw", "*", "List compare watchers in rizin cmds", "cwr", " [addr]", "Reset/revert watchers", "cwu", " [addr]", "Update watchers", NULL diff --git a/librz/core/cmd_debug.c b/librz/core/cmd_debug.c index d326c1ecc8..fb4beba5fa 100644 --- a/librz/core/cmd_debug.c +++ b/librz/core/cmd_debug.c @@ -193,7 +193,7 @@ static const char *help_msg_des[] = { static const char *help_msg_di[] = { "Usage: di", "", "Debugger target information", "di", "", "Show debugger target information", - "di*", "", "Same as above, but in r2 commands", + "di*", "", "Same as above, but in rizin commands", "diq", "", "Same as above, but in one line", "dij", "", "Same as above, but in JSON format", "dif", " [$a] [$b]", "Compare two files (or $alias files)", @@ -261,7 +261,7 @@ static const char *help_msg_dmi[] = { static const char *help_msg_dmm[] = { "Usage:", "dmm", " # Module memory maps commands", "dmm", "", "List modules of target process", - "dmm*", "", "List modules of target process (r2 commands)", + "dmm*", "", "List modules of target process (rizin commands)", "dmm.", "", "List memory map of current module", "dmmj", "", "List modules of target process (JSON)", NULL @@ -315,7 +315,7 @@ static const char *help_msg_dr[] = { "Usage: dr", "", "Registers commands", "dr", "", "Show 'gpr' registers", "dr", " =", "Set register value", - "dr.", " >$snapshot", "Capture current register values in r2 alias file", + "dr.", " >$snapshot", "Capture current register values in rizin alias file", "dr,", " [table-query]", "Enumerate registers in table format", "dr8", "[1|2|4|8] [type]", "Display hexdump of gpr arena (WIP)", "dr=", "", "Show registers in columns", @@ -349,7 +349,7 @@ static const char *help_msg_drp[] = { "Usage:", "drp", " # Register profile commands", "drp", "", "Show the current register profile", "drp", " [regprofile-file]", "Set the current register profile", - "drp", " [gdb] [regprofile-file]", "Parse gdb register profile and dump an r2 profile string", + "drp", " [gdb] [regprofile-file]", "Parse gdb register profile and dump an rizin profile string", "drpc", "", "Show register profile comments", "drpi", "", "Show internal representation of the register profile", "drp.", "", "Show the current fake size", diff --git a/librz/core/cmd_eval.c b/librz/core/cmd_eval.c index a50e881d55..4f008df130 100644 --- a/librz/core/cmd_eval.c +++ b/librz/core/cmd_eval.c @@ -33,7 +33,7 @@ static const char *help_msg_e[] = { static const char *help_msg_ec[] = { "Usage ec[s?] [key][[=| ]fg] [bg]", "", "", "ec", " [key]", "list all/key color keys", - "ec*", "", "same as above, but using r2 commands", + "ec*", "", "same as above, but using rizin commands", "ecd", "", "set default palette", "ecr", "", "set random palette (see also scr.randpal)", "ecs", "", "show a colorful palette", diff --git a/librz/core/cmd_flag.c b/librz/core/cmd_flag.c index 09028ef5fc..38225ffac5 100644 --- a/librz/core/cmd_flag.c +++ b/librz/core/cmd_flag.c @@ -8,7 +8,7 @@ static const char *help_msg_f[] = { "Usage: f","[?] [flagname]", " # Manage offset-name flags", "f","","list flags (will only list flags from selected flagspaces)", "f?","flagname","check if flag exists or not, See ?? and ?!", - "f."," [*[*]]","list local per-function flags (*) as r2 commands", + "f."," [*[*]]","list local per-function flags (*) as rizin commands", "f.","blah=$$+12","set local function label named 'blah'", "f."," fname","list all local labels for the given function", "f,","","table output for flags", @@ -73,7 +73,7 @@ static const char *help_msg_fd[] = { static const char *help_msg_fs[] = { "Usage: fs","[*] [+-][flagspace|addr]", " # Manage flagspaces", "fs","","display flagspaces", - "fs*","","display flagspaces as r2 commands", + "fs*","","display flagspaces as rizin commands", "fsj","","display flagspaces in JSON", "fs"," *","select all flagspaces", "fs"," flagspace","select flagspace or create if it doesn't exist", @@ -85,7 +85,7 @@ static const char *help_msg_fs[] = { "fsq","", "list flagspaces in quiet mode", "fsm"," [addr]","move flags at given address to the current flagspace", "fss","","display flagspaces stack", - "fss*","","display flagspaces stack in r2 commands", + "fss*","","display flagspaces stack in rizin commands", "fssj","","display flagspaces stack in JSON", "fsr"," newname","rename selected flagspace", NULL @@ -98,7 +98,7 @@ static const char *help_msg_fz[] = { " fz-", "*", "remove all flagzones", " fz.", "", "show around flagzone context", " fz:", "", "show what's in scr.flagzone for visual", - " fz*", "", "dump into r2 commands, for projects", + " fz*", "", "dump into rizin commands, for projects", NULL }; @@ -486,7 +486,7 @@ static void cmd_flag_tags(RzCore *core, const char *input) { eprintf (" ftn tag # get matching flagnames fot given tag\n"); eprintf (" ftw # flag tags within this file\n"); eprintf (" ftj # list all flagtags in JSON format\n"); - eprintf (" ft* # list all flagtags in r2 commands\n"); + eprintf (" ft* # list all flagtags in rizin commands\n"); free (inp); return; } diff --git a/librz/core/cmd_help.c b/librz/core/cmd_help.c index 3b8de07d05..bd68f41418 100644 --- a/librz/core/cmd_help.c +++ b/librz/core/cmd_help.c @@ -57,12 +57,12 @@ static const char *help_msg_exclamation[] = { "Usage:", "!", " Run given command as in system(3)", "!", "", "list all historic commands", "!", "ls", "execute 'ls' in shell", - "!*", "r2p x", "run r2 command via rzpipe in current session", + "!*", "rzp x", "run rizin command via rzpipe in current session", "!!", "", "save command history to hist file", "!!", "ls~txt", "print output of 'ls' and grep for 'txt'", "!!!", "cmd [args|$type]", "adds the autocomplete value", "!!!-", "cmd [args]", "removes the autocomplete value", - ".!", "rz_bin -rpsei ${FILE}", "run each output line as a r2 cmd", + ".!", "rz_bin -rpsei ${FILE}", "run each output line as a rizin cmd", "!", "echo $RZ_SIZE", "display file size", "!-", "", "clear history in current session", "!-*", "", "clear and save empty history log", @@ -75,7 +75,7 @@ static const char *help_msg_root[] = { "%var", "=value", "alias for 'env' command", "*", "[?] off[=[0x]value]", "pointer read/write data/values (see ?v, wx, wv)", "(macro arg0 arg1)", "", "manage scripting macros", - ".", "[?] [-|(m)|f|!sh|cmd]", "Define macro or load r2, cparse or rlang file", + ".", "[?] [-|(m)|f|!sh|cmd]", "Define macro or load rizin, cparse or rlang file", "_", "[?]", "Print last output", "=","[?] [cmd]", "send/listen for remote commands (rap://, raps://, udp://, http://, )", "<","[...]", "push escaped string into the RzCons.readChar buffer", @@ -93,7 +93,7 @@ static const char *help_msg_root[] = { "i","[?] [file]", "get info about opened file from rz_bin", "k","[?] [sdb-query]", "run sdb-query. see k? for help, 'k *', 'k **' ...", "l"," [filepattern]", "list files and directories", - "L","[?] [-] [plugin]", "list, unload load r2 plugins", + "L","[?] [-] [plugin]", "list, unload load rizin plugins", "m","[?]", "mountpoints commands", "o","[?] [file] ([offset])", "open file at optional address", "p","[?] [len]", "print current block with format and length", diff --git a/librz/core/cmd_helps.c b/librz/core/cmd_helps.c index de4791388c..c1cfd4e1d0 100644 --- a/librz/core/cmd_helps.c +++ b/librz/core/cmd_helps.c @@ -291,7 +291,7 @@ const RzCmdDescHelp stdin_help = { }; const RzCmdDescHelp interpret_help = { - .summary = "Define macro or load r2, cparse or rlang file", + .summary = "Define macro or load rizin, cparse or rlang file", }; const RzCmdDescHelp search_help = { @@ -299,7 +299,7 @@ const RzCmdDescHelp search_help = { }; const RzCmdDescHelp rap_help = { - .summary = "connect with other instances of r2", + .summary = "connect with other instances of rizin", }; const RzCmdDescHelp help_help = { @@ -372,7 +372,7 @@ const RzCmdDescHelp h_help = { }; const RzCmdDescHelp L_help = { - .summary = "list, unload, load r2 plugins", + .summary = "list, unload, load rizin plugins", }; const RzCmdDescHelp o_help = { diff --git a/librz/core/cmd_info.c b/librz/core/cmd_info.c index 3e0fc0fa88..5e1e43a135 100644 --- a/librz/core/cmd_info.c +++ b/librz/core/cmd_info.c @@ -60,7 +60,7 @@ static const char *help_msg_i[] = { "iX", "", "Display source files used (via dwarf)", "iz|izj", "", "Strings in data sections (in JSON/Base64)", "izz", "", "Search for Strings in the whole binary", - "izzz", "", "Dump Strings from whole binary to r2 shell (for huge files)", + "izzz", "", "Dump Strings from whole binary to rizin shell (for huge files)", "iz-", " [addr]", "Purge string via bin.str.purge", "iZ", "", "Guess size of binary program", NULL diff --git a/librz/core/cmd_log.c b/librz/core/cmd_log.c index ef34fe6075..1ff38ced9e 100644 --- a/librz/core/cmd_log.c +++ b/librz/core/cmd_log.c @@ -38,7 +38,7 @@ static const char *help_msg_T[] = { "Tm", " [idx]", "display log messages without index", "Ts", "", "list files in current directory (see pwd, cd)", "TT", "", "enter into the text log chat console", - "T=", "[.]", "Pull logs from remote r2 instance specified by http.sync", + "T=", "[.]", "Pull logs from remote rizin instance specified by http.sync", "T=&", "", "Start background thread syncing with the remote server", NULL }; diff --git a/librz/core/cmd_meta.c b/librz/core/cmd_meta.c index 4ec4095f38..b193ea1d1f 100644 --- a/librz/core/cmd_meta.c +++ b/librz/core/cmd_meta.c @@ -13,8 +13,8 @@ char *getcommapath(RzCore *core); static const char *help_msg_C[] = { "Usage:", "C[-LCvsdfm*?][*?] [...]", " # Metadata management", "C", "", "list meta info in human friendly form", - "C*", "", "list meta info in r2 commands", - "C*.", "", "list meta info of current offset in r2 commands", + "C*", "", "list meta info in rizin commands", + "C*.", "", "list meta info of current offset in rizin commands", "C-", " [len] [[@]addr]", "delete metadata at given address range", "C.", "", "list meta info of current offset in human friendly form", "CC!", " [@addr]", "edit comment with $EDITOR", @@ -26,7 +26,7 @@ static const char *help_msg_C[] = { "CL", "[-][*] [file:line] [addr]", "show or add 'code line' information (bininfo)", "CS", "[-][space]", "manage meta-spaces to filter comments, etc..", "C[Cthsdmf]", "", "list comments/types/hidden/strings/data/magic/formatted in human friendly form", - "C[Cthsdmf]*", "", "list comments/types/hidden/strings/data/magic/formatted in r2 commands", + "C[Cthsdmf]*", "", "list comments/types/hidden/strings/data/magic/formatted in rizin commands", "Cd", "[-] [size] [repeat] [@addr]", "hexdump data array (Cd 4 10 == dword [10])", "Cd.", " [@addr]", "show size of data at current address", "Cf", "[?][-] [sz] [0|cnt][fmt] [a0 a1...] [@addr]", "format memory (see pf?)", @@ -45,7 +45,7 @@ static const char *help_msg_CC[] = { "CC!", "", "edit comment using cfg.editor (vim, ..)", "CC", " [text]", "append comment at current address", "CC", "", "list all comments in human friendly form", - "CC*", "", "list all comments in r2 commands", + "CC*", "", "list all comments in rizin commands", "CC+", " [text]", "append comment at current address", "CC,", " [file]", "show or set comment file", "CC-", " @ cmt_addr", "remove comment at given address", @@ -87,7 +87,7 @@ static const char *help_msg_Cs[] = { " Cz", " [size] [@addr]", "ditto", "Cs", " [size] @addr", "add string (guess latin1/utf16le)", "Cs", "", "list all strings in human friendly form", - "Cs*", "", "list all strings in r2 commands", + "Cs*", "", "list all strings in rizin commands", "Cs-", " [@addr]", "remove string", "Cs.", "", "show string at current address", "Cs..", "", "show string + info about it at current address", @@ -102,7 +102,7 @@ static const char *help_msg_Cvb[] = { "Usage:", "Cvb", "[name] [comment]", "Cvb?", "", "show this help", "Cvb", "", "list all base pointer args/vars comments in human friendly format", - "Cvb*", "", "list all base pointer args/vars comments in r2 format", + "Cvb*", "", "list all base pointer args/vars comments in rizin format", "Cvb-", "[name]", "delete comments for var/arg at current offset for base pointer", "Cvb", " [name]", "Show comments for var/arg at current offset for base pointer", "Cvb", " [name] [comment]", "add/append comment for the variable with the current name", @@ -114,7 +114,7 @@ static const char *help_msg_Cvr[] = { "Usage:", "Cvr", "[name] [comment]", "Cvr?", "", "show this help", "Cvr", "", "list all register based args comments in human friendly format", - "Cvr*", "", "list all register based args comments in r2 format", + "Cvr*", "", "list all register based args comments in rizin format", "Cvr-", "[name]", "delete comments for register based arg for that name", "Cvr", "[name]", "Show comments for register based arg for that name", "Cvr", "[name] [comment]", "add/append comment for the variable", @@ -128,7 +128,7 @@ static const char *help_msg_Cvs[] = { "Cvs", "", "list all stack based args/vars comments in human friendly format", "Cvs", "[name] [comment]", "add/append comment for the variable", "Cvs", "[name]", "Show comments for stack pointer var/arg with that name", - "Cvs*", "", "list all stack based args/vars comments in r2 format", + "Cvs*", "", "list all stack based args/vars comments in rizin format", "Cvs-", "[name]", "delete comments for stack pointer var/arg with that name", "Cvs?", "", "show this help", NULL diff --git a/librz/core/cmd_open.c b/librz/core/cmd_open.c index 75b44d0f0d..cc58cd6572 100644 --- a/librz/core/cmd_open.c +++ b/librz/core/cmd_open.c @@ -13,17 +13,17 @@ static const char *help_msg_o[] = { "o"," [file]","open [file] file in read-only", "o","","list opened files", "o","-1","close file descriptor 1", - "o*","","list opened files in r2 commands", + "o*","","list opened files in rizin commands", "o+"," [file]","open file in read-write mode", "o-","!*","close all opened files", - "o--","","close all files, analysis, binfiles, flags, same as !r2 --", + "o--","","close all files, analysis, binfiles, flags, same as !rizin --", "o.","","show current filename (or o.q/oq to get the fd)", "o:"," [len]","open a malloc://[len] copying the bytes from current offset", "o=","","list opened files (ascii-art bars)", "oL","","list all IO plugins registered", "oa","[-] [A] [B] [filename]","Specify arch and bits for given file", "ob","[?] [lbdos] [...]","list opened binary files backed by fd", - "oc"," [file]","open core file, like relaunching r2", + "oc"," [file]","open core file, like relaunching rizin", "of"," [file]","open file and map it at addr 0 as read-only", "oi","[-|idx]","alias for o, but using index instead of fd", "oj","[?] ","list opened files in JSON format", @@ -45,8 +45,8 @@ static const char *help_msg_o_[] = { }; static const char *help_msg_o_star[] = { - "Usage:", "o* [> files.r2]", "", - "o*", "", "list opened files in r2 commands", NULL + "Usage:", "o* [> files.rz]", "", + "o*", "", "list opened files in rizin commands", NULL }; static const char *help_msg_oa[] = { @@ -61,7 +61,7 @@ static const char *help_msg_ob[] = { "Usage:", "ob", " # List open binary files backed by fd", "ob", " [bfid]", "Switch to open given objid", "ob", "", "List opened binary files and objid", - "ob*", "", "List opened binary files and objid (r2 commands)", + "ob*", "", "List opened binary files and objid (rizin commands)", "ob-", "*", "Delete all binfiles", "ob-", "[objid]", "Delete binfile by binobjid", "ob.", " ([addr])", "Show bfid at current address", @@ -70,7 +70,7 @@ static const char *help_msg_ob[] = { "oba", " [addr] [baddr]", "Open file and load bin info at given address", "oba", " [addr] [filename]", "Open file and load bin info at given address", "oba", " [addr]", "Open bin info from the given address", - "obf", " ([file])", "Load bininfo for current file (useful for r2 -n)", + "obf", " ([file])", "Load bininfo for current file (useful for rizin -n)", "obj", "", "List opened binary files and objid (JSON format)", "obn", " [name]", "Select binfile by name", "obo", " [fd]", "Switch to open binfile by fd number", @@ -88,7 +88,7 @@ static const char *help_msg_om[] = { "om", " [fd]", "list all defined IO maps for a specific fd", "om", " fd vaddr [size] [paddr] [rwx] [name]", "create new io map", "om", "", "list all defined IO maps", - "om*", "", "list all maps in r2 commands format", + "om*", "", "list all maps in rizin commands format", "om-", "mapid", "remove the map with corresponding id", "om-*", "", "remove all maps", "om-..", "", "hud view of all the maps to select the one to remove", diff --git a/librz/core/cmd_print.c b/librz/core/cmd_print.c index 6861abb95a..dc6e646b7f 100644 --- a/librz/core/cmd_print.c +++ b/librz/core/cmd_print.c @@ -45,7 +45,7 @@ static const char *help_msg_pp[] = { static const char *help_msg_pc[] = { "Usage:", "pc", " # Print in code", "pc", "", "C", - "pc*", "", "print 'wx' r2 commands", + "pc*", "", "print 'wx' rizin commands", "pcA", "", ".bytes with instructions in comments", "pca", "", "GAS .byte blob", "pcd", "", "C dwords (8 byte)", @@ -128,10 +128,10 @@ static const char *help_msg_at[] = { "#", "cmd", "if # is a number repeat the command # times", "/*", "", "start multiline comment", "*/", "", "end multiline comment", - ".", "cmd", "execute output of command as r2 script", + ".", "cmd", "execute output of command as rizin script", ".:", "8080", "wait for commands on port 8080", - ".!", "rz_bin -re $FILE", "run command output as r2 script", - "*", "", "output of command in r2 script format (CC*)", + ".!", "rz_bin -re $FILE", "run command output as rizin script", + "*", "", "output of command in rizin script format (CC*)", "j", "", "output of command in JSON format (pdj)", "~", "?", "count number of lines (like wc -l)", "~", "??", "show internal grep help", @@ -339,7 +339,7 @@ static const char *help_msg_pf[] = { "pf", "?", "Show this help", "pf", "??", "Format characters", "pf", "???", "pf usage examples", - "pf* ", "fmt_name|fmt", "Show data using (named) format as r2 flag create commands", + "pf* ", "fmt_name|fmt", "Show data using (named) format as rizin flag create commands", "pf.", "", "List all format definitions", "pf.", "fmt_name", "Show data using named format", "pf.", "fmt_name.field_name", "Show specific data field using named format", @@ -527,7 +527,7 @@ static const char *help_msg_px[] = { "pxQ", "[q]", "same as above, but one per line", "pxr", "[j]", "show words with references to flags and code (q=quiet)", "pxs", "", "show hexadecimal in sparse mode", - "pxt", "[*.] [origin]", "show delta pointer table in r2 commands", + "pxt", "[*.] [origin]", "show delta pointer table in rizin commands", "pxw", "", "show hexadecimal words dump (32bit)", "pxW", "[q]", "same as above, but one per line (q=quiet)", "pxx", "", "show N bytes of hex-less hexdump", @@ -1246,7 +1246,7 @@ static const char *help_msg_pg[] = { "Usage: pg[-]", "[asm|hex]", "print (dis)assembled", "pg", " [x y w h cmd]", "add a new gadget", "pg", "", "print them all", - "pg", "*", "print the gadgets as r2 commands", + "pg", "*", "print the gadgets as rizin commands", "pg-", "*", "remove all the gadgets", NULL }; diff --git a/librz/core/cmd_search.c b/librz/core/cmd_search.c index 95db6d355a..48dba4e1ff 100644 --- a/librz/core/cmd_search.c +++ b/librz/core/cmd_search.c @@ -3376,7 +3376,7 @@ reread: cmd_search_bin (core, search_itv); rz_config_set_i (core->config, "bin.verbose", bin_verbose); } else if (input[1] == 'e') { // "/me" - rz_cons_printf ("* r2 thinks%s\n", input + 2); + rz_cons_printf ("* rizin thinks%s\n", input + 2); } else if (input[1] == ' ' || input[1] == '\0' || param.outmode == RZ_MODE_JSON) { int ret; const char *file = input[param_offset - 1]? input + param_offset: NULL; diff --git a/librz/core/cmd_seek.c b/librz/core/cmd_seek.c index 6220ac1da1..21cc19956d 100644 --- a/librz/core/cmd_seek.c +++ b/librz/core/cmd_seek.c @@ -20,7 +20,7 @@ static const char *help_msg_s[] = { "s+", "", "Redo seek", "s+", " n", "Seek n bytes forward", "s++", "[n]", "Seek blocksize bytes forward (/=n)", - "s[j*=!]", "", "List undo seek history (JSON, =list, *r2, !=names, s==)", + "s[j*=!]", "", "List undo seek history (JSON, =list, *rz, !=names, s==)", "s/", " DATA", "Search for next occurrence of 'DATA'", "s/x", " 9091", "Search for next occurrence of \\x90\\x91", "sa", " [[+-]a] [asz]", "Seek asz (or bsize) aligned to addr", diff --git a/librz/core/cmd_type.c b/librz/core/cmd_type.c index 935025dea5..1f38d5b53e 100644 --- a/librz/core/cmd_type.c +++ b/librz/core/cmd_type.c @@ -11,7 +11,7 @@ static const char *help_msg_t[] = { "t", "", "List all loaded types", "tj", "", "List all loaded types as json", "t", " ", "Show type in 'pf' syntax", - "t*", "", "List types info in r2 commands", + "t*", "", "List types info in rizin commands", "t-", " ", "Delete types by its name", "t-*", "", "Remove all types", "tail", " [filename]", "Output the last part of files", @@ -46,7 +46,7 @@ static const char *help_msg_tcc[] = { "tcck", "", "List calling conventions in k=v", "tccl", "", "List the cc signatures", "tccj", "", "List them in JSON", - "tcc*", "", "List them as r2 commands", + "tcc*", "", "List them as rizin commands", NULL }; diff --git a/librz/core/cmd_write.c b/librz/core/cmd_write.c index 0042edaa01..ac83ba206c 100644 --- a/librz/core/cmd_write.c +++ b/librz/core/cmd_write.c @@ -25,7 +25,7 @@ static const char *help_msg_w[] = { "wd"," [off] [n]","duplicate N bytes from offset at current seek (memcpy) (see y?)", "we","[?] [nNsxX] [arg]","extend write operations (insert instead of replace)", "wf","[fs] -|file","write contents of file at current offset", - "wh"," r2","whereis/which shell command", + "wh"," rizin","whereis/which shell command", "wm"," f0ff","set binary mask hexpair to be used as cyclic write mask", "wo","[?] hex","write in block with operation. 'wo?' fmi", "wp","[?] -|file","apply radare patch file. See wp? fmi", @@ -124,7 +124,7 @@ static const char *help_msg_wop[] = { // TODO static const char *help_msg_wp[] = { - "Usage:", "wp", "[-|r2patch-file]", + "Usage:", "wp", "[-|rzpatch-file]", "^#", "", "comments", ".", "", "execute command", "!", "", "execute command", diff --git a/librz/core/core.c b/librz/core/core.c index f9e7efe654..a48ae1ba2c 100644 --- a/librz/core/core.c +++ b/librz/core/core.c @@ -2604,7 +2604,7 @@ RZ_API bool rz_core_init(RzCore *core) { { char *a = rz_str_rz_prefix (RZ_FLAGS); if (a) { - char *file = rz_str_newf ("%s/tags.r2", a); + char *file = rz_str_newf ("%s/tags.rz", a); (void)rz_core_run_script (core, file); free (file); free (a); diff --git a/librz/core/meson.build b/librz/core/meson.build index e128075a85..b25d38aa2c 100644 --- a/librz/core/meson.build +++ b/librz/core/meson.build @@ -116,7 +116,7 @@ rz_core = library('rz_core', rz_core_sources, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - soversion: r2_libversion + soversion: rizin_libversion ) rz_core_dep = declare_dependency(link_with: rz_core, @@ -125,7 +125,7 @@ rz_core_dep = declare_dependency(link_with: rz_core, pkgconfig_mod.generate( rz_core, subdirs: 'librz', - version: r2_version, + version: rizin_version, name: 'rz_core', filebase: 'rz_core', libraries: pkgcfg_sanitize_libs, diff --git a/librz/core/panels.c b/librz/core/panels.c index bb1e4e03b7..82b058f4fc 100644 --- a/librz/core/panels.c +++ b/librz/core/panels.c @@ -112,7 +112,7 @@ static char *menus_View[] = { }; static const char *menus_Tools[] = { - "Calculator", "R2 Shell", "System Shell", + "Calculator", "Rizin Shell", "System Shell", NULL }; @@ -191,7 +191,7 @@ static const char *cache_white_list_cmds[] = { static const char *help_msg_panels[] = { "|", "split the current panel vertically", "-", "split the current panel horizontally", - ":", "run r2 command in prompt", + ":", "run rizin command in prompt", ";", "add/remove comment", "_", "start the hud input mode", "\\", "show the user-friendly hud", @@ -240,7 +240,7 @@ static const char *help_msg_panels[] = { }; static const char *help_msg_panels_window[] = { - ":", "run r2 command in prompt", + ":", "run rizin command in prompt", ";", "add/remove comment", "\"", "create a panel from the list and replace the current one", "?", "show this help", @@ -261,7 +261,7 @@ static const char *help_msg_panels_window[] = { static const char *help_msg_panels_zoom[] = { "?", "show this help", - ":", "run r2 command in prompt", + ":", "run rizin command in prompt", ";", "add/remove comment", "\"", "create a panel from the list and replace the current one", "' '", "(space) toggle graph / panels", @@ -5621,7 +5621,7 @@ void __restore_panel_pos(RPanel* panel) { } char *__get_panels_config_dir_path(void) { - return rz_str_home (RZ_JOIN_2_PATHS (RZ_HOME_DATADIR, ".r2panels")); + return rz_str_home (RZ_JOIN_2_PATHS (RZ_HOME_DATADIR, ".rzpanels")); } char *__create_panels_config_path(const char *file) { diff --git a/librz/core/rtr.c b/librz/core/rtr.c index f3b9a88974..c3f20a7f92 100644 --- a/librz/core/rtr.c +++ b/librz/core/rtr.c @@ -1231,7 +1231,7 @@ static void rtr_cmds_break(uv_async_t *async) { RZ_API int rz_core_rtr_cmds(RzCore *core, const char *port) { if (!port || port[0] == '?') { - rz_cons_printf ("Usage: .:[tcp-port] run r2 commands for clients\n"); + rz_cons_printf ("Usage: .:[tcp-port] run rizin commands for clients\n"); return 0; } @@ -1285,7 +1285,7 @@ RZ_API int rz_core_rtr_cmds (RzCore *core, const char *port) { char *str; if (!port || port[0] == '?') { - rz_cons_printf ("Usage: .:[tcp-port] run r2 commands for clients\n"); + rz_cons_printf ("Usage: .:[tcp-port] run rizin commands for clients\n"); return false; } diff --git a/librz/core/visual.c b/librz/core/visual.c index 935c47fc4b..8988b62ad4 100644 --- a/librz/core/visual.c +++ b/librz/core/visual.c @@ -1544,7 +1544,7 @@ repeat: " jk - select next or previous item (use arrows)\n" " JK - step 10 rows\n" " pP - rotate between various print modes\n" - " : - run r2 command\n" + " : - run rizin command\n" " / - highlight given word\n" " ? - show this help message\n" " <> - '<' for xrefs and '>' for refs\n" diff --git a/librz/core/vmenus.c b/librz/core/vmenus.c index 0126c6b39f..bb527fb791 100644 --- a/librz/core/vmenus.c +++ b/librz/core/vmenus.c @@ -151,7 +151,7 @@ RZ_API bool rz_core_visual_esil(RzCore *core) { analop.type = -1; (void)rz_anal_op (core->anal, &analop, core->offset, buf, sizeof (ut64), RZ_ANAL_OP_MASK_ESIL); analopType = analop.type & RZ_ANAL_OP_TYPE_MASK; - rz_cons_printf ("r2's esil debugger:\n\n"); + rz_cons_printf ("rizin's esil debugger:\n\n"); rz_cons_printf ("pos: %d\n", x); { char *op_hex = rz_asm_op_get_hex (&asmop); @@ -297,7 +297,7 @@ RZ_API bool rz_core_visual_bit_editor(RzCore *core) { analop.type = -1; (void)rz_anal_op (core->anal, &analop, core->offset, buf, sizeof (ut64), RZ_ANAL_OP_MASK_ESIL); analopType = analop.type & RZ_ANAL_OP_TYPE_MASK; - rz_cons_printf ("r2's bit editor:\n\n"); + rz_cons_printf ("rizin's bit editor:\n\n"); rz_cons_printf ("offset: 0x%08"PFMT64x"\n"Color_RESET, core->offset + cur); { char *op_hex = rz_asm_op_get_hex (&asmop); @@ -1611,7 +1611,7 @@ RZ_API int rz_core_visual_view_rop(RzCore *core) { char *cursearch = strdup (line); while (true) { rz_cons_clear00 (); - rz_cons_printf ("[0x%08"PFMT64x"]-[visual-r2rop] %s (see pdp command)\n", + rz_cons_printf ("[0x%08"PFMT64x"]-[visual-rzrop] %s (see pdp command)\n", (addr == UT64_MAX)? 0: addr + delta, cursearch); // compute chain @@ -1684,13 +1684,13 @@ RZ_API int rz_core_visual_view_rop(RzCore *core) { break; case '?': rz_cons_clear00 (); - rz_cons_printf ("[r2rop-visual] Help\n" + rz_cons_printf ("[rzrop-visual] Help\n" " jk - select next/prev rop gadget\n" " JK - scroll next/prev page from list\n" " hl - increase/decrease delta offset in disasm\n" " \\n - enter key or dot will add the current offset into the chain\n" " i - enter a number to be pushed into the chain\n" - " : - run r2 command\n" + " : - run rizin command\n" " ; - add comment in current offset\n" " <- - backspace - delete last gadget from the chain\n" " / - highlight given word\n" @@ -2732,7 +2732,7 @@ static const char *help_vv_visual[] = { "tab", "toggle disasm column selection (to scroll in code)", "!", "run 'afls' to sort all functions by address", ".", "seek to current function address", - ":", "run r2 commands", + ":", "run rizin commands", "_", "hud mode. same as: s $(afl~...)", "enter", "enter function view (variables), xrefs", NULL diff --git a/librz/core/vmenus_graph.c b/librz/core/vmenus_graph.c index c9dbdee5d3..a2f974aa25 100644 --- a/librz/core/vmenus_graph.c +++ b/librz/core/vmenus_graph.c @@ -229,7 +229,7 @@ RZ_API int __core_visual_view_graph_update(RzCore *core, RzCoreVisualViewGraph * /* __reset_status (status); */ /* } */ - char *title = rz_str_newf ("[r2-visual-browser] addr=0x%08"PFMT64x" faddr=0x%08"PFMT64x"", status->addr, status->fcn ? status->fcn->addr : 0); + char *title = rz_str_newf ("[rz-visual-browser] addr=0x%08"PFMT64x" faddr=0x%08"PFMT64x"", status->addr, status->fcn ? status->fcn->addr : 0); if (title) { rz_cons_strcat_at (title, 0, 0, w - 1, 2); free (title); diff --git a/librz/core/vmenus_zigns.c b/librz/core/vmenus_zigns.c index 2eda085f98..1147560be4 100644 --- a/librz/core/vmenus_zigns.c +++ b/librz/core/vmenus_zigns.c @@ -49,7 +49,7 @@ RZ_API int __core_visual_view_zigns_update(RzCore *core, RzCoreVisualViewZigns * RzList *col0 = __signs (status, status->addr, true); char *col0str = rz_str_widget_list (core, col0, colh, status->cur, print_item); - char *title = rz_str_newf ("[r2-visual-signatures] 0x%08"PFMT64x" 0x%08"PFMT64x, status->addr, status->faddr); + char *title = rz_str_newf ("[rz-visual-signatures] 0x%08"PFMT64x" 0x%08"PFMT64x, status->addr, status->faddr); if (title) { rz_cons_strcat_at (title, 0, 0, w - 1, 2); free (title); diff --git a/librz/crypto/meson.build b/librz/crypto/meson.build index 534750cf60..2332950116 100644 --- a/librz/crypto/meson.build +++ b/librz/crypto/meson.build @@ -28,7 +28,7 @@ rz_crypto = library('rz_crypto', rz_crypto_sources, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - soversion: r2_libversion + soversion: rizin_libversion ) rz_crypto_dep = declare_dependency(link_with: rz_crypto, @@ -36,7 +36,7 @@ rz_crypto_dep = declare_dependency(link_with: rz_crypto, pkgconfig_mod.generate(rz_crypto, subdirs: 'librz', - version: r2_version, + version: rizin_version, name: 'rz_crypto', filebase: 'rz_crypto', libraries: pkgcfg_sanitize_libs, diff --git a/librz/debug/meson.build b/librz/debug/meson.build index b6e6f443d6..10f74fc289 100644 --- a/librz/debug/meson.build +++ b/librz/debug/meson.build @@ -106,7 +106,7 @@ rz_debug = library('rz_debug', rz_debug_sources, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - soversion: r2_libversion + soversion: rizin_libversion ) rz_debug_dep = declare_dependency(link_with: rz_debug, @@ -114,7 +114,7 @@ rz_debug_dep = declare_dependency(link_with: rz_debug, pkgconfig_mod.generate(rz_debug, subdirs: 'librz', - version: r2_version, + version: rizin_version, name: 'rz_debug', filebase: 'rz_debug', libraries: pkgcfg_sanitize_libs, diff --git a/librz/egg/egg_Cfile.c b/librz/egg/egg_Cfile.c index 71656e755e..c0b7f55e3c 100644 --- a/librz/egg/egg_Cfile.c +++ b/librz/egg/egg_Cfile.c @@ -82,10 +82,10 @@ static struct cEnv_t* rz_egg_Cfile_set_cEnv(const char *arch, const char *os, in cEnv->SFLIBPATH = rz_sys_getenv ("SFLIBPATH"); if (!cEnv->SFLIBPATH) { - output = rz_sys_cmd_strf ("r2 -hh | grep INCDIR | awk '{print $2}'"); + output = rz_sys_cmd_strf ("rizin -hh | grep INCDIR | awk '{print $2}'"); if (!output || (output[0] == '\0')) { eprintf ("Cannot find SFLIBPATH env var.\n" - "Please define it, or fix r2 installation.\n"); + "Please define it, or fix rizin installation.\n"); goto fail; } diff --git a/librz/egg/meson.build b/librz/egg/meson.build index acd4be777d..5a4c335e77 100644 --- a/librz/egg/meson.build +++ b/librz/egg/meson.build @@ -26,7 +26,7 @@ rz_egg = library('rz_egg', rz_egg_sources, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - soversion: r2_libversion + soversion: rizin_libversion ) rz_egg_dep = declare_dependency(link_with: rz_egg, @@ -34,7 +34,7 @@ rz_egg_dep = declare_dependency(link_with: rz_egg, pkgconfig_mod.generate(rz_egg, subdirs: 'librz', - version: r2_version, + version: rizin_version, name: 'rz_egg', filebase: 'rz_egg', libraries: pkgcfg_sanitize_libs, diff --git a/librz/flag/d/Makefile b/librz/flag/d/Makefile index 47a4d9820f..fb2e7b7f7e 100644 --- a/librz/flag/d/Makefile +++ b/librz/flag/d/Makefile @@ -1,5 +1,5 @@ include ../../../global.mk -TARGET:=tags.r2 +TARGET:=tags.rz RZ_FLAGS=$(DESTDIR)$(DATADIR)/rizin/$(VERSION)/flag FILES:=$(filter-out $(TARGET),$(filter-out Makefile,$(filter-out meson.build,$(shell ls)))) @@ -7,17 +7,17 @@ FILES:=$(filter-out $(TARGET),$(filter-out Makefile,$(filter-out meson.build,$(s all: $(TARGET) $(TARGET): $(FILES) - rm -f *.r2 + rm -f *.rz for a in $(FILES) ; do b=$$(echo `cat $$a`); echo "ft $$a $$b" ; done > $(TARGET) install: $(TARGET) rm -rf "${RZ_FLAGS}" mkdir -p "${RZ_FLAGS}" - cp -f *.r2 "${RZ_FLAGS}" + cp -f *.rz "${RZ_FLAGS}" symstall install-symlink: ${TARGET} mkdir -p "$(RZ_FLAGS)" - -ln -fs $(shell pwd)/tags.r2 $(RZ_FLAGS)/tags.r2 + -ln -fs $(shell pwd)/tags.rz $(RZ_FLAGS)/tags.rz uninstall: rm -rf "$(RZ_FLAGS)" diff --git a/librz/flag/d/meson.build b/librz/flag/d/meson.build index bead4fc792..6a248ef372 100644 --- a/librz/flag/d/meson.build +++ b/librz/flag/d/meson.build @@ -20,12 +20,12 @@ for fname in argv[1:]: print('ft %s %s' % (os.path.basename(fname), text)) ''' -custom_target('tags.r2', +custom_target('tags.rz', input: tags_rz_sources, - output: 'tags.r2', + output: 'tags.rz', command: [py3_exe, '-c', script, '@INPUT@'], capture: true, build_by_default: true, install: true, - install_dir: r2_flags + install_dir: rizin_flags ) diff --git a/librz/flag/meson.build b/librz/flag/meson.build index 87fcb96d7f..127f5897af 100644 --- a/librz/flag/meson.build +++ b/librz/flag/meson.build @@ -13,7 +13,7 @@ rz_flag = library('rz_flag', rz_flag_sources, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - soversion: r2_libversion + soversion: rizin_libversion ) rz_flag_dep = declare_dependency(link_with: rz_flag, @@ -21,7 +21,7 @@ rz_flag_dep = declare_dependency(link_with: rz_flag, pkgconfig_mod.generate(rz_flag, subdirs: 'librz', - version: r2_version, + version: rizin_version, name: 'rz_flag', filebase: 'rz_flag', libraries: pkgcfg_sanitize_libs, diff --git a/librz/hash/meson.build b/librz/hash/meson.build index f3ca9f7cbd..380d337d04 100644 --- a/librz/hash/meson.build +++ b/librz/hash/meson.build @@ -31,7 +31,7 @@ rz_hash = library('rz_hash', rz_hash_sources, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - soversion: r2_libversion + soversion: rizin_libversion ) rz_hash_dep = declare_dependency(link_with: rz_hash, @@ -39,7 +39,7 @@ rz_hash_dep = declare_dependency(link_with: rz_hash, pkgconfig_mod.generate(rz_hash, subdirs: 'librz', - version: r2_version, + version: rizin_version, name: 'rz_hash', filebase: 'rz_hash', libraries: pkgcfg_sanitize_libs, diff --git a/librz/include/rz_egg.h b/librz/include/rz_egg.h index d1d9a327cb..e184646eb2 100644 --- a/librz/include/rz_egg.h +++ b/librz/include/rz_egg.h @@ -112,7 +112,7 @@ typedef struct rz_egg_t { /* XXX: this may fail in different arches */ #if 0 -r2 -q - <_args[0] ? r->_args[0] : "/path/to/exec"; eprintf ("To disable aslr patch mach0.hdr.flags with:\n" - "r2 -qwnc 'wx 000000 @ 0x18' %s\n", argv0); + "rizin -qwnc 'wx 000000 @ 0x18' %s\n", argv0); // f MH_PIE=0x00200000; wB-MH_PIE @ 24\n"); // for osxver>=10.7 // "unset the MH_PIE bit in an already linked executable" with --no-pie flag of the script @@ -628,7 +628,7 @@ RZ_API const char *rz_run_help(void) { "# arg5=:!rz_gg -p n50 -d 10:0x8048123\n" "# arg6=@arg.txt\n" "# arg7=@300@ABCD # 300 chars filled with ABCD pattern\n" - "# system=r2 -\n" + "# system=rizin -\n" "# daemon=false\n" "# aslr=no\n" "setenv=FOO=BAR\n" diff --git a/librz/syscall/d/meson.build b/librz/syscall/d/meson.build index bc07a02474..320b1255f5 100644 --- a/librz/syscall/d/meson.build +++ b/librz/syscall/d/meson.build @@ -66,6 +66,6 @@ foreach file : sdb_files depends: sdb_exe, build_by_default: true, install: true, - install_dir: join_paths(r2_sdb, 'syscall') + install_dir: join_paths(rizin_sdb, 'syscall') ) endforeach diff --git a/librz/syscall/meson.build b/librz/syscall/meson.build index 1d22fce6ad..9f3359c75c 100644 --- a/librz/syscall/meson.build +++ b/librz/syscall/meson.build @@ -12,7 +12,7 @@ rz_syscall = library('rz_syscall', rz_syscall_sources, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - soversion: r2_libversion + soversion: rizin_libversion ) rz_syscall_dep = declare_dependency(link_with: rz_syscall, @@ -20,7 +20,7 @@ rz_syscall_dep = declare_dependency(link_with: rz_syscall, pkgconfig_mod.generate(rz_syscall, subdirs: 'librz', - version: r2_version, + version: rizin_version, name: 'rz_syscall', filebase: 'rz_syscall', libraries: pkgcfg_sanitize_libs, diff --git a/librz/util/file.c b/librz/util/file.c index 904e470242..1b894f7859 100644 --- a/librz/util/file.c +++ b/librz/util/file.c @@ -1060,7 +1060,7 @@ RZ_API int rz_file_mkstemp(RZ_NULLABLE const char *prefix, char **oname) { int h = -1; char *path = rz_file_tmpdir (); if (!prefix) { - prefix = "r2"; + prefix = "rz"; } #if __WINDOWS__ LPTSTR name = NULL; @@ -1101,7 +1101,7 @@ err_r_file_mkstemp: suffix = ""; } - char *name = rz_str_newf ("%s/r2.%s.XXXXXX%s", path, prefix, suffix); + char *name = rz_str_newf ("%s/rz.%s.XXXXXX%s", path, prefix, suffix); mode_t mask = umask (S_IWGRP | S_IWOTH); if (suffix && *suffix) { #if defined(__GLIBC__) && defined(__GLIBC_MINOR__) && 2 <= __GLIBC__ && 19 <= __GLIBC__MINOR__ diff --git a/librz/util/meson.build b/librz/util/meson.build index 28868d13a4..dc9dddc38f 100644 --- a/librz/util/meson.build +++ b/librz/util/meson.build @@ -105,7 +105,7 @@ rz_util = library('rz_util', rz_util_sources, install: true, implicit_include_directories: false, install_rpath: rpath_lib, - soversion: r2_libversion + soversion: rizin_libversion ) rz_util_dep = declare_dependency(link_with: rz_util, @@ -114,7 +114,7 @@ rz_util_dep = declare_dependency(link_with: rz_util, pkgconfig_mod.generate(rz_util, subdirs: ['librz', 'librz/sdb'], - version: r2_version, + version: rizin_version, libraries: pkgcfg_sanitize_libs, name: 'rz_util', filebase: 'rz_util', diff --git a/man/rizin.1 b/man/rizin.1 index f306693b8a..a20a1dcfa5 100644 --- a/man/rizin.1 +++ b/man/rizin.1 @@ -24,7 +24,7 @@ .Sh DESCRIPTION rizin is a commandline hexadecimal editor. .Pp -"r2" is the alias program name for rizin. +"rz" is the alias program name for rizin. .Pp This manpage is not updated yet. Feel free to contribute. .Pp @@ -33,7 +33,7 @@ The options are: .It Fl Fl Open rizin on an empty file .It Fl -Equivalent of 'r2 malloc://512' +Equivalent of 'rizin malloc://512' .It Fl 0 Print \\x00 after initialization and after every command executed .It Fl 2 @@ -123,13 +123,13 @@ Type '?' for help .Sh VISUAL To enter visual mode use the 'V' command. Then press '?' for help .Sh DEBUGGER -In r2 the debugger commands are implemented under the 'd' command. Type 'd?' for help +In rizin the debugger commands are implemented under the 'd' command. Type 'd?' for help .Sh ENVIRONMENT RZ_CFG_OLDSHELL sets cfg.newshell=false RZ_DEBUG if defined, show error messages and crash signal RZ_DEBUG_ASSERT=1 set a breakpoint when hitting an assert RZ_MAGICPATH /Users/pancake/.local/share/rizin/share/rizin/4.5.0-git/magic - RZ_NOPLUGINS do not load r2 shared plugins + RZ_NOPLUGINS do not load rizin shared plugins RZ_RCFILE ~/.rizinrc (user preferences, batch script) RZ_RDATAHOME /usr/local .Ar FILE diff --git a/man/rz-asm.1 b/man/rz-asm.1 index b7703545e4..86e48a1dac 100644 --- a/man/rz-asm.1 +++ b/man/rz-asm.1 @@ -62,7 +62,7 @@ Alias for -o .It Fl O Ar ofile output to file, for example 'rz-asm \-BF a a.asm' .It Fl r -Show output in r2 script +Show output in rizin script .It Fl s Ar syntax Select syntax output (intel, att) .It Fl w diff --git a/man/rz-bin.1 b/man/rz-bin.1 index e98cb8242f..bd220a693f 100644 --- a/man/rz-bin.1 +++ b/man/rz-bin.1 @@ -61,9 +61,9 @@ Load address . offset to header .It Fl h Show usage help message. .It Fl H -Show header fields (see ih command in r2) +Show header fields (see ih command in rizin) .It Fl I -Show binary info (iI in r2) +Show binary info (iI in rizin) .It Fl i Show imports (symbols imported from libraries) (ii) .It Fl j @@ -139,17 +139,17 @@ Dump raw strings to stdout (for huge files) .El .Sh ENVIRONMENT .Pp -RZ_BIN_LANG same as r2 -e bin.lang for rz-bin +RZ_BIN_LANG same as rizin -e bin.lang for rz-bin .Pp RZ_BIN_DEMANGLE demangle symbols .Pp -RZ_BIN_MAXSTRBUF same as r2 -e bin.maxstrbuf for rz-bin +RZ_BIN_MAXSTRBUF same as rizin -e bin.maxstrbuf for rz-bin .Pp RZ_BIN_DEBASE64 try to decode all strings as base64 if possible .Pp -RZ_BIN_STRFILTER same as r2 -e bin.str.filter for rz-bin +RZ_BIN_STRFILTER same as rizin -e bin.str.filter for rz-bin .Pp -RZ_BIN_STRPURGE same as r2 -e bin.str.purge for rz-bin +RZ_BIN_STRPURGE same as rizin -e bin.str.purge for rz-bin .Sh EXAMPLES .Pp List symbols of a program @@ -166,7 +166,7 @@ Get entrypoint .Pp Load symbols and imports from rizin .Pp - $ r2 -n /bin/ls + $ rizin -n /bin/ls [0x00000000]> .!rz-bin \-prsi $FILE .Sh SEE ALSO .Pp diff --git a/man/rz-docker.1 b/man/rz-docker.1 index ab78812cab..131ed3c9be 100644 --- a/man/rz-docker.1 +++ b/man/rz-docker.1 @@ -2,7 +2,7 @@ .Dt RZ-DOCKER 1 .Sh NAME .Nm rz-docker -.Nd Open files within an r2 contained in a Docker image +.Nd Open files within an rizin contained in a Docker image .Sh SYNOPSIS .Nm rz-docker .Op Fl s @@ -17,11 +17,11 @@ rizin is a commandline hexadecimal editor, and this tool allows you to create a The options are: .Bl -tag -width Fl .It Fl s -open shell inside the docker image (user r2, pass r2) +open shell inside the docker image (user rizin, pass rizin) .It Fl d debug program (only for linux-x86-32/64) .It Fl u -update or create the docker image with r2 inside +update or create the docker image with rizin inside .It Fl l List all docker images with rizin .It Fl r diff --git a/man/rz-find.1 b/man/rz-find.1 index 73314cf023..a40eade3d8 100644 --- a/man/rz-find.1 +++ b/man/rz-find.1 @@ -33,7 +33,7 @@ Search for a regular expression string matches .It Fl x Ar hex Search for an hexpair string .It Fl i -Identify filetype (like file, uses r2 -qcpm) +Identify filetype (like file, uses rizin -qcpm) .It Fl m Carve for known file-types using the r_magic signatures .It Fl M Ar mask diff --git a/man/rz-run.1 b/man/rz-run.1 index 2ba1a82fca..211de8e97b 100644 --- a/man/rz-run.1 +++ b/man/rz-run.1 @@ -6,7 +6,7 @@ .Sh SYNOPSIS .Nm rz-run .Op [directives] -.Op [script.rr2] +.Op [script.rrz] .Op [--] [program] [args] .Sh DESCRIPTION This program is used as a launcher for running programs with different environment, arguments, permissions, directories and overridden default filedescriptors. @@ -18,7 +18,7 @@ The program just accepts a single argument which is the filename of the configur It is useful when you have to run a program using long arguments or pass long data to stdin or things like that usually required for exploiting crackmes :) .Sh DIRECTIVES .Pp -The rr2 (rz-run) configuration file accepts the following directives, described as key=value entries and comments defined as lines starting with '#'. +The rrz (rz-run) configuration file accepts the following directives, described as key=value entries and comments defined as lines starting with '#'. .Bl -tag -width Fl .It Ar arg[0-N] set value for argument N passed to the program @@ -69,7 +69,7 @@ path to the library to be executed .It Ar runlib.fcn function name to call from runlib library .It Ar r2preload -preload with librz, kill -USR1 to get an r2 shell or -USR2 to spawn a webserver in a thread +preload with librz, kill -USR1 to get an rizin shell or -USR2 to spawn a webserver in a thread .It Ar r2preweb run the webserver in a thread just at starting the r2preload .It Ar setenv @@ -119,7 +119,7 @@ Parses the input string and returns it as integer .Sh EXAMPLES Sample rz-run script .Pp - $ cat foo.rr2 + $ cat foo.rrz #!/usr/bin/rz-run program=./pp400 arg0=10 @@ -131,7 +131,7 @@ Sample rz-run script unsetenv=NOFUN # EGG will be the only env variable #chroot=. - ./foo.rr2 + ./foo.rrz .Pp Connecting a program to a socket .Pp @@ -143,13 +143,13 @@ Debugging a program redirecting io to another terminal ## open a new terminal and type 'tty' to get $ tty ; clear ; sleep 999999 /dev/ttyS010 - ## in another terminal run r2 - $ r2 \-r foo.rr2 -d ls - $ cat foo.rr2 + ## in another terminal run rizin + $ rizin \-r foo.rrz -d ls + $ cat foo.rrz #!/usr/bin/rz-run stdio=/dev/ttys010 ## Or you can use -R to set a key=value - r2 \-R stdio=/dev/ttys010 -d ls + rizin \-R stdio=/dev/ttys010 -d ls .Pp You can also use the -- flag to specify program and arguments in a more natural way: .Pp diff --git a/meson.build b/meson.build index f532c65396..90e69e0740 100644 --- a/meson.build +++ b/meson.build @@ -4,22 +4,22 @@ py3_exe = import('python').find_installation('python3') git_exe = find_program('git', required: false) pkgconfig_mod = import('pkgconfig') -# Get r2 version -r2_version = 'unknown-error' -r2_version_major = 0 -r2_version_minor = 0 -r2_version_patch = 0 -r2_version_number = 0 +# Get rizin version +rizin_version = 'unknown-error' +rizin_version_major = 0 +rizin_version_minor = 0 +rizin_version_patch = 0 +rizin_version_number = 0 r = run_command(py3_exe, 'sys/version.py', '--full-version') if r.returncode() == 0 vers = r.stdout().strip().split('\n') - r2_version = vers[0] - r2_version_major = vers[1] - r2_version_minor = vers[2] - r2_version_patch = vers[3] - r2_version_number = vers[4] + rizin_version = vers[0] + rizin_version_major = vers[1] + rizin_version_minor = vers[2] + rizin_version_patch = vers[3] + rizin_version_number = vers[4] if host_machine.system() == 'darwin' - r2_version = r2_version.split('-')[0] + rizin_version = rizin_version.split('-')[0] endif else message('Cannot find project version with sys/version.py') @@ -33,7 +33,7 @@ if meson.is_subproject() py_cmd = run_command(py3_exe, '-c', py_cmd) if py_cmd.returncode() == 0 repo = py_cmd.stdout().strip() - message('r2 real path: ' + repo) + message('rizin real path: ' + repo) endif endif endif @@ -64,37 +64,37 @@ if git_exe.found() endif endif -if get_option('r2_version_commit') != '' - version_commit = get_option('r2_version_commit') +if get_option('rizin_version_commit') != '' + version_commit = get_option('rizin_version_commit') endif -if get_option('r2_gittap') != '' - gittap = get_option('r2_gittap') +if get_option('rizin_gittap') != '' + gittap = get_option('rizin_gittap') endif # gittap is used for the version of each rz_ library # in case it has not been set (e.g. a release tarball) set it if gittap == '' - gittap = r2_version + gittap = rizin_version endif -if get_option('r2_gittip') != '' - gittip = get_option('r2_gittip') +if get_option('rizin_gittip') != '' + gittip = get_option('rizin_gittip') endif # Get current date if host_machine.system() == 'windows' - r2birth = run_command('cmd', '/c', 'echo %date%__%time%') + rizinbirth = run_command('cmd', '/c', 'echo %date%__%time%') else - r2birth = run_command('date', '+%Y-%m-%d__%H:%M:%S') + rizinbirth = run_command('date', '+%Y-%m-%d__%H:%M:%S') endif -if r2birth.returncode() != 0 - r2birth = '' +if rizinbirth.returncode() != 0 + rizinbirth = '' else - r2birth = r2birth.stdout().strip() + rizinbirth = rizinbirth.stdout().strip() endif -r2_libversion = host_machine.system() == 'windows' ? '' : r2_version -message('r2 lib version: ' + r2_libversion) +rizin_libversion = host_machine.system() == 'windows' ? '' : rizin_version +message('rizin lib version: ' + rizin_libversion) # system dependencies cc = meson.get_compiler('c') @@ -138,15 +138,15 @@ endif library_cflags = ['-DRZ_PLUGIN_INCORE=1'] if host_machine.system() == 'windows' - r2_prefix = '.' - r2_libdir = 'lib' - r2_incdir = join_paths('include', 'librz') - r2_datdir = 'share' + rizin_prefix = '.' + rizin_libdir = 'lib' + rizin_incdir = join_paths('include', 'librz') + rizin_datdir = 'share' opts1 = [ - 'r2_libdir', - 'r2_incdir', - 'r2_datdir' + 'rizin_libdir', + 'rizin_incdir', + 'rizin_datdir' ] foreach opt : opts1 val = get_option(opt) @@ -155,22 +155,22 @@ if host_machine.system() == 'windows' endif endforeach - r2_wwwroot = join_paths(r2_datdir, 'www') - r2_sdb = join_paths(r2_datdir) - r2_zigns = join_paths(r2_datdir, 'zigns') - r2_themes = join_paths(r2_datdir, 'cons') - r2_fortunes = join_paths(r2_datdir, 'doc') - r2_flags = join_paths(r2_datdir, 'flag') - r2_hud = join_paths(r2_datdir, 'hud') + rizin_wwwroot = join_paths(rizin_datdir, 'www') + rizin_sdb = join_paths(rizin_datdir) + rizin_zigns = join_paths(rizin_datdir, 'zigns') + rizin_themes = join_paths(rizin_datdir, 'cons') + rizin_fortunes = join_paths(rizin_datdir, 'doc') + rizin_flags = join_paths(rizin_datdir, 'flag') + rizin_hud = join_paths(rizin_datdir, 'hud') opts2 = [ - 'r2_wwwroot', - 'r2_sdb', - 'r2_zigns', - 'r2_themes', - 'r2_fortunes', - 'r2_flags', - 'r2_hud' + 'rizin_wwwroot', + 'rizin_sdb', + 'rizin_zigns', + 'rizin_themes', + 'rizin_fortunes', + 'rizin_flags', + 'rizin_hud' ] foreach opt : opts2 val = get_option(opt) @@ -180,13 +180,13 @@ if host_machine.system() == 'windows' endforeach opts3 = [ - 'r2_plugins', - 'r2_extras', - 'r2_bindings' + 'rizin_plugins', + 'rizin_extras', + 'rizin_bindings' ] - r2_plugins = join_paths(r2_libdir, 'plugins') - r2_extras = join_paths(r2_libdir, 'extras') - r2_bindings = join_paths(r2_libdir, 'bindings') + rizin_plugins = join_paths(rizin_libdir, 'plugins') + rizin_extras = join_paths(rizin_libdir, 'extras') + rizin_bindings = join_paths(rizin_libdir, 'bindings') foreach opt : opts1 + opts2 + opts3 val = get_variable(opt) @@ -194,24 +194,24 @@ if host_machine.system() == 'windows' set_variable(opt, val) endforeach else - r2_prefix = get_option('prefix') - r2_libdir = get_option('libdir') - r2_incdir = join_paths(get_option('includedir'), 'librz') - r2_datdir = get_option('datadir') - r2_datdir_rz = join_paths(r2_datdir, 'rizin') - r2_wwwroot = join_paths(r2_datdir_rz, r2_version, 'www') - r2_sdb = join_paths(r2_datdir_rz, r2_version) - r2_zigns = join_paths(r2_datdir_rz, r2_version, 'zigns') - r2_themes = join_paths(r2_datdir_rz, r2_version, 'cons') - r2_fortunes = join_paths(r2_datdir, 'doc', 'rizin') - r2_flags = join_paths(r2_datdir_rz, r2_version, 'flag') - r2_hud = join_paths(r2_datdir_rz, r2_version, 'hud') - r2_plugins = join_paths(r2_libdir, 'rizin', r2_version) - r2_extras = join_paths(r2_libdir, 'rizin-extras', r2_version) - r2_bindings = join_paths(r2_libdir, 'rizin-bindings', r2_version) + rizin_prefix = get_option('prefix') + rizin_libdir = get_option('libdir') + rizin_incdir = join_paths(get_option('includedir'), 'librz') + rizin_datdir = get_option('datadir') + rizin_datdir_rz = join_paths(rizin_datdir, 'rizin') + rizin_wwwroot = join_paths(rizin_datdir_rz, rizin_version, 'www') + rizin_sdb = join_paths(rizin_datdir_rz, rizin_version) + rizin_zigns = join_paths(rizin_datdir_rz, rizin_version, 'zigns') + rizin_themes = join_paths(rizin_datdir_rz, rizin_version, 'cons') + rizin_fortunes = join_paths(rizin_datdir, 'doc', 'rizin') + rizin_flags = join_paths(rizin_datdir_rz, rizin_version, 'flag') + rizin_hud = join_paths(rizin_datdir_rz, rizin_version, 'hud') + rizin_plugins = join_paths(rizin_libdir, 'rizin', rizin_version) + rizin_extras = join_paths(rizin_libdir, 'rizin-extras', rizin_version) + rizin_bindings = join_paths(rizin_libdir, 'rizin-bindings', rizin_version) endif -r2_zsh_compdir = join_paths(r2_datdir, 'zsh', 'site-functions') +rizin_zsh_compdir = join_paths(rizin_datdir, 'zsh', 'site-functions') # load plugin configuration subdir('librz') @@ -313,29 +313,29 @@ userconf.set10('USE_LIB_MAGIC', use_syslib_magic) userconf.set10('HAVE_LIB_XXHASH', sys_xxhash.found()) userconf.set10('USE_LIB_XXHASH', use_sys_xxhash) userconf.set10('DEBUGGER', has_debugger) -userconf.set('PREFIX', r2_prefix) +userconf.set('PREFIX', rizin_prefix) if host_machine.system() == 'windows' - userconf.set('LIBDIR', r2_libdir) - userconf.set('INCLUDEDIR', r2_incdir) - userconf.set('DATADIR_R2', r2_datdir) + userconf.set('LIBDIR', rizin_libdir) + userconf.set('INCLUDEDIR', rizin_incdir) + userconf.set('DATADIR_R2', rizin_datdir) userconf.set10('HAVE_JEMALLOC', false) else - userconf.set('LIBDIR', join_paths(r2_prefix, r2_libdir)) - userconf.set('INCLUDEDIR', join_paths(r2_prefix, r2_incdir)) - userconf.set('DATADIR_R2', r2_datdir_rz) + userconf.set('LIBDIR', join_paths(rizin_prefix, rizin_libdir)) + userconf.set('INCLUDEDIR', join_paths(rizin_prefix, rizin_incdir)) + userconf.set('DATADIR_R2', rizin_datdir_rz) userconf.set10('HAVE_JEMALLOC', true) endif -userconf.set('DATADIR', join_paths(r2_prefix, r2_datdir)) -userconf.set('WWWROOT', join_paths(r2_prefix, r2_wwwroot)) -userconf.set('SDB', r2_sdb) -userconf.set('ZIGNS', r2_zigns) -userconf.set('THEMES', r2_themes) -userconf.set('FORTUNES', r2_fortunes) -userconf.set('FLAGS', r2_flags) -userconf.set('HUD', r2_hud) -userconf.set('PLUGINS', r2_plugins) -userconf.set('EXTRAS', r2_extras) -userconf.set('BINDINGS', r2_bindings) +userconf.set('DATADIR', join_paths(rizin_prefix, rizin_datdir)) +userconf.set('WWWROOT', join_paths(rizin_prefix, rizin_wwwroot)) +userconf.set('SDB', rizin_sdb) +userconf.set('ZIGNS', rizin_zigns) +userconf.set('THEMES', rizin_themes) +userconf.set('FORTUNES', rizin_fortunes) +userconf.set('FLAGS', rizin_flags) +userconf.set('HUD', rizin_hud) +userconf.set('PLUGINS', rizin_plugins) +userconf.set('EXTRAS', rizin_extras) +userconf.set('BINDINGS', rizin_bindings) userconf.set10('HAVE_OPENSSL', use_sys_openssl) userconf.set10('HAVE_LIBUV', use_libuv) userconf.set10('HAVE_FORK', true) @@ -368,25 +368,25 @@ rz_userconf_h = configure_file( input: 'librz/include/rz_userconf.h.acr', output: 'rz_userconf.h', configuration: userconf, - install_dir: join_paths(r2_incdir) + install_dir: join_paths(rizin_incdir) ) versionconf = configuration_data() versionconf.set('MESON_VERSION', meson.version()) versionconf.set('VERSIONCOMMIT', version_commit) -versionconf.set('RZ_VERSION_MAJOR', r2_version_major) -versionconf.set('RZ_VERSION_MINOR', r2_version_minor) -versionconf.set('RZ_VERSION_PATCH', r2_version_patch) -versionconf.set('RZ_VERSION_NUMBER', r2_version_number) -versionconf.set('RZ_VERSION', r2_version) +versionconf.set('RZ_VERSION_MAJOR', rizin_version_major) +versionconf.set('RZ_VERSION_MINOR', rizin_version_minor) +versionconf.set('RZ_VERSION_PATCH', rizin_version_patch) +versionconf.set('RZ_VERSION_NUMBER', rizin_version_number) +versionconf.set('RZ_VERSION', rizin_version) versionconf.set('RZ_GITTAP', gittap) versionconf.set('RZ_GITTIP', gittip) -versionconf.set('RZ_BIRTH', r2birth) +versionconf.set('RZ_BIRTH', rizinbirth) rz_version_h = configure_file( input: 'librz/include/rz_version.h.in', output: 'rz_version.h', configuration: versionconf, - install_dir: join_paths(r2_incdir) + install_dir: join_paths(rizin_incdir) ) # Copy missing header @@ -395,7 +395,7 @@ run_command(py3_exe, '-c', '__import__("shutil").copyfile("shlr/spp/config.def.h pcconf = configuration_data() pcconf.set('PREFIX', get_option('prefix')) pcconf.set('LIBDIR', join_paths(get_option('prefix'), get_option('libdir'))) -pcconf.set('VERSION', r2_version) +pcconf.set('VERSION', rizin_version) libr_pc = configure_file( input: 'librz/librz.pc.acr', output: 'librz.pc', @@ -428,7 +428,7 @@ if not zlib_dep.found() or not get_option('use_sys_zlib') zlib_inc = [platform_inc, include_directories('shlr/zip/zlib')] - librzzlib = static_library('r2zlib', zlib_files, + librzzlib = static_library('rzzlib', zlib_files, include_directories: zlib_inc, implicit_include_directories: false ) @@ -500,9 +500,9 @@ sdb_inc_files = [ 'shlr/sdb/src/sdb_version.h', 'shlr/sdb/src/types.h' ] -install_headers(sdb_inc_files, install_dir: join_paths(r2_incdir, 'sdb')) +install_headers(sdb_inc_files, install_dir: join_paths(rizin_incdir, 'sdb')) -librzsdb = static_library('r2sdb', sdb_files, +librzsdb = static_library('rzsdb', sdb_files, include_directories: sdb_inc, implicit_include_directories: false, c_args: host_machine.system() == 'windows' ? '-DSDB_API=__declspec(dllexport)' : [], @@ -535,7 +535,7 @@ spp_files = [ spp_inc = [platform_inc, include_directories('shlr/spp')] -librzspp = static_library('r2spp', spp_files, +librzspp = static_library('rzspp', spp_files, dependencies: sdb_dep, include_directories: spp_inc, c_args: ['-DHAVE_R_UTIL', '-DUSE_R2=1'], @@ -649,13 +649,13 @@ if meson.is_subproject() rz_util_dep ], include_directories: include_directories('.', 'librz/include'), - version: r2_version + version: rizin_version ) endif if get_option('use_webui') install_subdir('shlr/www', - install_dir: r2_wwwroot, + install_dir: rizin_wwwroot, strip_directory: true ) endif @@ -667,7 +667,7 @@ install_data( 'doc/fortunes.fun', 'doc/fortunes.nsfw', 'doc/fortunes.tips', - install_dir: r2_fortunes + install_dir: rizin_fortunes ) if cli_enabled @@ -688,7 +688,7 @@ if cli_enabled ) install_data('doc/hud', - install_dir: r2_hud, + install_dir: rizin_hud, rename: 'main' ) @@ -701,6 +701,6 @@ if cli_enabled 'doc/zsh/_rz_hash', 'doc/zsh/_rz_asm', 'doc/zsh/_rz_ax', - install_dir: r2_zsh_compdir + install_dir: rizin_zsh_compdir ) endif diff --git a/meson_options.txt b/meson_options.txt index 35b9d4f07b..28a566638f 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -4,20 +4,20 @@ option('local', type: 'boolean', value: false, description: 'Adds support for lo option('blob', type: 'boolean', value: false, description: 'Compile just one binary which dispatch to the right handlers based on the name used to call it') # For Windows -option('r2_libdir', type: 'string', value: '') -option('r2_incdir', type: 'string', value: '') -option('r2_datdir', type: 'string', value: '') -option('r2_wwwroot', type: 'string', value: '') -option('r2_sdb', type: 'string', value: '') -option('r2_zigns', type: 'string', value: '') -option('r2_themes', type: 'string', value: '') -option('r2_fortunes', type: 'string', value: '') -option('r2_flags', type: 'string', value: '') -option('r2_hud', type: 'string', value: '') +option('rizin_libdir', type: 'string', value: '') +option('rizin_incdir', type: 'string', value: '') +option('rizin_datdir', type: 'string', value: '') +option('rizin_wwwroot', type: 'string', value: '') +option('rizin_sdb', type: 'string', value: '') +option('rizin_zigns', type: 'string', value: '') +option('rizin_themes', type: 'string', value: '') +option('rizin_fortunes', type: 'string', value: '') +option('rizin_flags', type: 'string', value: '') +option('rizin_hud', type: 'string', value: '') -option('r2_version_commit', type: 'string', value: '') -option('r2_gittap', type: 'string', value: '') -option('r2_gittip', type: 'string', value: '') +option('rizin_version_commit', type: 'string', value: '') +option('rizin_gittap', type: 'string', value: '') +option('rizin_gittip', type: 'string', value: '') option('checks_level', type: 'integer', value: 9999, description: 'Value between 0 and 3 to enable different level of assert (see RZ_CHECKS_LEVEL). By default its value depends on buildtype (2 on debug, 1 on release).') option('capstone_in_builddir', type: 'boolean', value: false, description: 'When true, capstone is downloaded in the build directory and not in the source one') option('use_sys_capstone', type: 'boolean', value: false)