Remove last vestiges of newshell

This commit is contained in:
Lazula 2022-03-28 17:44:10 -05:00 committed by pancake
parent 4431b392e3
commit c7dfa70ade
9 changed files with 15 additions and 67 deletions

View File

@ -149,7 +149,6 @@ static int main_help(int line) {
" R2_LIBR_PLUGINS " R_JOIN_2_PATHS ("%s", R2_PLUGINS) "\n"
" R2_USER_ZIGNS " R_JOIN_2_PATHS ("~", R2_HOME_ZIGNS) "\n"
"Environment:\n"
" R2_CFG_NEWSHELL sets cfg.newshell=true\n"
" R2_DEBUG if defined, show error messages and crash signal.\n"
" R2_DEBUG_ASSERT=1 set a breakpoint when hitting an assert.\n"
" R2_IGNVER=1 load plugins ignoring the specified version. (be careful)\n"

View File

@ -125,7 +125,6 @@ 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
.Sh ENVIRONMENT
R2_CFG_NEWSHELL sets cfg.newshell=true
R2_IGNVER load plugins ignoring the specified version. (be careful)
R2_DEBUG if defined, show error messages and crash signal
R2_DEBUG_ASSERT=1 set a breakpoint when hitting an assert

View File

@ -41,9 +41,7 @@ RUN
# this test fails on newshell and windows better to mark it as broken
NAME=r2 remote webserver two
BROKEN=1
FILE=--
CMDS=<<EOF
e cfg.newshell=true
& !rarun2 timeout=3 daemon=1 system="r2 -e http.root=/404 -e http.port=9292 -c=h -qcq -"
sleep 1
=+ http://127.0.0.1:9292/cmd/

View File

@ -32,7 +32,6 @@ EOF
RUN
NAME=$foo=#!pipe
ARGS=-ecfg.newshell=true
FILE=-
CMDS=<<EOF
#!pipe echo hello

View File

@ -1303,9 +1303,7 @@ EXPECT=<<EOF
EOF
RUN
NAME=pdJ string - oldshell
ARGS=-ecfg.newshell=false
FILE=malloc://128
NAME=pdJ string
CMDS=<<EOF
w Snoo"ping as" usual,
Cs 30
@ -1316,19 +1314,6 @@ EXPECT=<<EOF
EOF
RUN
NAME=pdJ string - newshell
ARGS=-ecfg.newshell=true
FILE=malloc://128
CMDS=<<EOF
w "Snoo\"ping as\" usual,"
Cs 30
pdJ 1
EOF
EXPECT=<<EOF
[{"offset":0,"text":" 0x00000000 .string \"Snoo\\\"ping as\\\" usual,\" ; len=30"}]
EOF
RUN
NAME=pdJ str in opcode
FILE=bins/java/Hello.class
CMDS=pdJ 1 @ 0x000002ae

View File

@ -740,10 +740,9 @@ EXPECT=<<EOF
EOF
RUN
NAME=af ; af ; zfs libc-v7.sig - newshell
ARGS=-ecfg.newshell=true
NAME=af ; af ; zfs libc-v7.sig oneliner
FILE=bins/elf/analysis/pid_stripped
CMDS=s 0x4e2420 ; af ; s 0x4e25c7 ; af ; zfs bins/other/sigs/libc-v7.sig ; afl ~4e2420
CMDS=s 0x4e2420 ; af ; s 0x4e25c7 ; af ; zfs bins/other/sigs/libc-v7.sig ; afl~4e2420
EXPECT=<<EOF
Found flirt.__libc_start_main
0x004e2420 40 664 flirt.__libc_start_main
@ -783,10 +782,9 @@ EXPECT=<<EOF
EOF
RUN
NAME=af ; af ; zfs libc-v10.sig - newshell
ARGS=-ecfg.newshell=true
NAME=af ; af ; zfs libc-v10.sig - oneliner
FILE=bins/elf/analysis/pid_stripped
CMDS=s 0x4e2420 ; af ; s 0x4e25c7 ; af ; zfs bins/other/sigs/libc-v10.sig ; afl ~4e2420
CMDS=s 0x4e2420 ; af ; s 0x4e25c7 ; af ; zfs bins/other/sigs/libc-v10.sig ; afl~4e2420
EXPECT=<<EOF
Found flirt.__libc_start_main
0x004e2420 40 664 flirt.__libc_start_main

View File

@ -427,7 +427,6 @@ EOF
RUN
NAME=multi-command single-line grep
ARGS=-ecfg.newshell=true
CMDS=<<EOF
?e Hello World; ?e 4e2420~4e2420
EOF

View File

@ -1,6 +1,4 @@
NAME=Double quotes - newshell
ARGS=-e cfg.newshell=true
FILE=-
NAME=Double quotes
CMDS=<<EOF
w "Hello World"
ps
@ -22,9 +20,7 @@ Hello@World
EOF
RUN
NAME=Single quotes - newshell
ARGS=-e cfg.newshell=true
FILE=-
NAME=Single quotes
CMDS=<<EOF
w 'Hello World'
ps
@ -50,9 +46,7 @@ Hello@World
EOF
RUN
NAME=Quotes and substitution - newshell
ARGS=-e cfg.newshell=true
FILE=-
NAME=Quotes and substitution
CMDS=<<EOF
w "Hello $(?e World)"
ps
@ -73,4 +67,4 @@ Hello $(?e World)
Hello $(?e World)
Hello `?e World`
EOF
RUN
RUN

View File

@ -29,40 +29,17 @@ EXPECT=<<EOF
EOF
RUN
NAME="/e /t\wst\d\d\d\s\w\w/i" - oldshell
ARGS=-ecfg.newshell=false
BROKEN=1
FILE=malloc://1024
NAME=/e /t\wst\d\d\d\s\w\w/i
CMDS=<<EOF
w "test123 ab"
w "Test123 ab" @444
?e
w test123 ab
w Test123 ab @444
e search.in=block
b 777
"/e /t\wst\d\d\d\s\w\w/i"
/e /t\wst\d\d\d\s\w\w/i
EOF
EXPECT=<<EOF
0x00000001 hit0_0 ""test123 ab""
0x000001bd hit0_1 ""Test123 ab""
EOF
RUN
NAME="/e /t\wst\d\d\d\s\w\w/i" - newshell
ARGS=-ecfg.newshell=true
FILE=malloc://1024
CMDS=<<EOF
w '"test123 ab"'
w '"Test123 ab"' @444
?e
e search.in=block
b 777
"/e /t\wst\d\d\d\s\w\w/i"
EOF
EXPECT=<<EOF
0x00000001 hit0_0 ""test123 ab""
0x000001bd hit0_1 ""Test123 ab""
0x00000000 hit0_0 "test123 ab"
0x000001bc hit0_1 "Test123 ab"
EOF
RUN