Fix #19628 - wx+ as an alias for wxs ##core

libr/core/cmd_write.c

@@ -182,7 +182,7 @@ static const char *help_msg_wx[] = {
 	"Usage:", "wx[f] [arg]", "",
 	"wx", " 9090", "write two intel nops",
 	"wxf", " -|file", "write contents of hexpairs file here",
-	"wxs", " 9090", "write hexpairs and seek at the end",
+	"wx+", " 9090", "write hexpairs and seek forward",
 	NULL
 };
 
@@ -1742,6 +1742,9 @@ static int wx_handler_old(void *data, const char *input) {
 		}
 		break;
 	case 's': // "wxs"
+		eprintf ("Warning: wxs has been renamed to wx+\n");
+		// fallthrough
+	case '+': // "wx+"
 		{
 			int len = cmd_write_hexpair (core, input + 1);
 			if (len > 0) {

test/db/anal/arm

@@ -855,20 +855,20 @@ FILE=malloc://2048
 CMDS=<<EOF
 e asm.arch=arm
 e asm.bits=16
-wxs 01380793d3b24ff00109024600bf00bf00bf00bf59b2a1f120005a28139200f28d81404d02eb8004082601270122dfe810f09700850185015c0085015b008501850185018501a2
-wxs 0097008501ac007b008501af005d005d005d005d005d005d005d005d005d008501850185018501850185018501c300850185018501c3008501c30085018501850185019c008501
-wxs 85018501850185018501850185018501850185010d0185018501850185018501850185018501c30085011c01e700c300c300c300b200e700b50085019c00850129016801390185
-wxs 0185014c019f006201850185010e0185019f00b1e6d7e6139ca1f13000224612f9013fa3f1300109293ff686afa21c00eb800012f9013b01eb4000a3f130010a29f5d3dbb2013a
-wxs c0f1000878e700bf07df0100139a104610f9011fcbb22a2b35d0303900274ff00109079709293ff662af901c002303eb830310f9012b01eb4303a2f130010a29f5d34fe758b20a
-wxs 9001200b9096e60cf1010c93e64ff0010c90e609981ef0010f50f8048b099018bfc8f1000886e60122129f85e60120089080e6acf1010c7de64ff0020c7ae6139000e013920998
-wxs 4ff0010950f8041b079109906fe6bcf1010f18bfbcf1000f40f0bb800998ddf830a008300990e7e0ddf830a0139d109c0e98012805d195f90000119900f02dfc05e014f0ff0f04
-wxs bf28780af8010b0d9801300d9018e60cf10200042800f29980dfe810f00500050005000500a901099a52f8040bc1170a9f0029d14d4ff030090b9eb8bf01260b96b8bf2d2710eb
-wxs e1700a9780eae17441ebe17080eae1770a26b3e0c84d129810f0010f52d058b2302141ea00200a90022010260b9001204ae00999bcf1000f01f10400dcbf09688df86b10099001
-wxs 9f0121dfe00cf10200042857d8dfe810f078028102050005008a02099951f8040b099185e20998002250f8044b0990002c00f0c48004920220ac4d10220b900820079047f63000
-wxs 0a9030e0099819f0010f50f8047b099000f0ac80079a30230021002a00f0b080785c002800f0ac8001319142f8d3a7e09d4d0a2602e00020102612900cf10200042817d8dfe800
-wxs f0030308084d00099a52f8044be71748e00998324650f8044b09900020049020463023059014ae029f104662e00696139d2c4614f8010d2528fbd1ddf830a0ac4229d80d980025
-wxs 009901eb00080f98b0f1ff3f06d018eb050002bf0af801bb012010900e98012806d1139e119996f9000000f061fb07e01098139e10f0ff0f04bf30780af8010b01356019b042de
-wxs d90d9828440d90139d109c
+wx+ 01380793d3b24ff00109024600bf00bf00bf00bf59b2a1f120005a28139200f28d81404d02eb8004082601270122dfe810f09700850185015c0085015b008501850185018501a2
+wx+ 0097008501ac007b008501af005d005d005d005d005d005d005d005d005d008501850185018501850185018501c300850185018501c3008501c30085018501850185019c008501
+wx+ 85018501850185018501850185018501850185010d0185018501850185018501850185018501c30085011c01e700c300c300c300b200e700b50085019c00850129016801390185
+wx+ 0185014c019f006201850185010e0185019f00b1e6d7e6139ca1f13000224612f9013fa3f1300109293ff686afa21c00eb800012f9013b01eb4000a3f130010a29f5d3dbb2013a
+wx+ c0f1000878e700bf07df0100139a104610f9011fcbb22a2b35d0303900274ff00109079709293ff662af901c002303eb830310f9012b01eb4303a2f130010a29f5d34fe758b20a
+wx+ 9001200b9096e60cf1010c93e64ff0010c90e609981ef0010f50f8048b099018bfc8f1000886e60122129f85e60120089080e6acf1010c7de64ff0020c7ae6139000e013920998
+wx+ 4ff0010950f8041b079109906fe6bcf1010f18bfbcf1000f40f0bb800998ddf830a008300990e7e0ddf830a0139d109c0e98012805d195f90000119900f02dfc05e014f0ff0f04
+wx+ bf28780af8010b0d9801300d9018e60cf10200042800f29980dfe810f00500050005000500a901099a52f8040bc1170a9f0029d14d4ff030090b9eb8bf01260b96b8bf2d2710eb
+wx+ e1700a9780eae17441ebe17080eae1770a26b3e0c84d129810f0010f52d058b2302141ea00200a90022010260b9001204ae00999bcf1000f01f10400dcbf09688df86b10099001
+wx+ 9f0121dfe00cf10200042857d8dfe810f078028102050005008a02099951f8040b099185e20998002250f8044b0990002c00f0c48004920220ac4d10220b900820079047f63000
+wx+ 0a9030e0099819f0010f50f8047b099000f0ac80079a30230021002a00f0b080785c002800f0ac8001319142f8d3a7e09d4d0a2602e00020102612900cf10200042817d8dfe800
+wx+ f0030308084d00099a52f8044be71748e00998324650f8044b09900020049020463023059014ae029f104662e00696139d2c4614f8010d2528fbd1ddf830a0ac4229d80d980025
+wx+ 009901eb00080f98b0f1ff3f06d018eb050002bf0af801bb012010900e98012806d1139e119996f9000000f061fb07e01098139e10f0ff0f04bf30780af8010b01356019b042de
+wx+ d90d9828440d90139d109c
 s 0
 af
 pds 1@0x2e~:1

test/db/anal/avr

@@ -186,15 +186,15 @@ RUN
 NAME=avr rjmp - relative jump forward
 FILE=malloc://8192
 CMDS=<<EOF
-wxs 00c0 01c0 02c0 03c0 7ec0 7fc0 80c0 81c0
-wxs fec0 ffc0 00c1 01c1 7ec1 7fc1 80c1 81c1
-wxs fec1 ffc1 00c2 01c2 7ec2 7fc2 80c2 81c2
-wxs fec2 ffc2 00c3 01c3 7ec3 7fc3 80c3 81c3
-wxs fec3 ffc3 00c4 01c4 7ec4 7fc4 80c4 81c4
-wxs fec4 ffc4 00c5 01c5 7ec5 7fc5 80c5 81c5
-wxs fec5 ffc5 00c6 01c6 7ec6 7fc6 80c6 81c6
-wxs fec6 ffc6 00c7 01c7 7ec7 7fc7 80c7 81c7
-wxs fec7 ffc7
+wx+ 00c0 01c0 02c0 03c0 7ec0 7fc0 80c0 81c0
+wx+ fec0 ffc0 00c1 01c1 7ec1 7fc1 80c1 81c1
+wx+ fec1 ffc1 00c2 01c2 7ec2 7fc2 80c2 81c2
+wx+ fec2 ffc2 00c3 01c3 7ec3 7fc3 80c3 81c3
+wx+ fec3 ffc3 00c4 01c4 7ec4 7fc4 80c4 81c4
+wx+ fec4 ffc4 00c5 01c5 7ec5 7fc5 80c5 81c5
+wx+ fec5 ffc5 00c6 01c6 7ec6 7fc6 80c6 81c6
+wx+ fec6 ffc6 00c7 01c7 7ec7 7fc7 80c7 81c7
+wx+ fec7 ffc7
 e asm.arch=avr
 e asm.cpu=ATmega640
 aoe 66 @ 0

test/db/cmd/cmd_pf2

@@ -245,11 +245,11 @@ e asm.bits=64
 wz root @ 0x0000000100000faf
 pf z @ 0x0000000100000faf
 e cfg.bigendian=false
-16wxs cc @ 0x200
+16wx+cc @ 0x200
 wv8 0x0000000100000faf @ 0x204
 pf *z @ 0x204
 e cfg.bigendian=true
-16wxs cc @ 0x200
+16wx+cc @ 0x200
 wv8 0x0000000100000faf @ 0x204
 pf *z @ 0x204
 EOF

test/db/cmd/cmd_w

@@ -301,7 +301,7 @@ CMDS=<<EOF
 wx 553344
 p8 3
 s
-wxs 1111
+wx+1111
 s
 p8 2 @ -2
 EOF

test/db/cmd/write

@@ -410,12 +410,12 @@ EXPECT=<<EOF
 EOF
 RUN
 
-## wxs: write hex and seek
+## wx+: write hex and seek
 
 FILE=malloc://1024
-NAME=data written after multiple wxs
+NAME=data written after multiple wx+
 CMDS=<<EOF
-2 wxs 9090 @ 8
+2 wx+ 9090 @ 8
 x 16 @ 0
 EOF
 EXPECT=<<EOF
@@ -425,9 +425,9 @@ EOF
 RUN
 
 FILE=malloc://1024
-NAME=address after wxs at tmpseek
+NAME=address after wx+ at tmpseek
 CMDS=<<EOF
-2 wxs 9090 @ 8
+2 wx+ 9090 @ 8
 ?vi $$
 EOF
 EXPECT=<<EOF