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

Move ascii table to utils and add ?a command in r2

Browse Source
This commit is contained in:
Akshay Ajayan 2018-03-21 23:06:42 +05:30 committed by radare
parent 06c9903be9
commit fc424815a2
8 changed files with 39 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
binr/rax2/rax2.c
View File

@ -2,6 +2,7 @@
#include "../blob/version.c"
#include <r_print.h>
#include <r_util.h>
#define STDIN_BUFFER_SIZE 354096
#define R_STATIC_ASSERT(x)\
@ -72,77 +73,8 @@ static int format_output(char mode, const char *s) {
return true;
}
static void show_ascii_table() {
printf(
"The following table contains the 128 ASCII characters.\n"
"\n"
"Oct Dec Hex Char Oct Dec Hex Char\n"
"────────────────────────────────────────────────────────────────────────\n"
"000 0 00 NUL '\\0' (null character) 100 64 40 @\n"
"001 1 01 SOH (start of heading) 101 65 41 A\n"
"002 2 02 STX (start of text) 102 66 42 B\n"
"003 3 03 ETX (end of text) 103 67 43 C\n"
"004 4 04 EOT (end of transmission) 104 68 44 D\n"
"005 5 05 ENQ (enquiry) 105 69 45 E\n"
"006 6 06 ACK (acknowledge) 106 70 46 F\n"
"007 7 07 BEL '\\a' (bell) 107 71 47 G\n"
"010 8 08 BS '\\b' (backspace) 110 72 48 H\n"
"011 9 09 HT '\\t' (horizontal tab) 111 73 49 I\n"
"012 10 0A LF '\\n' (new line) 112 74 4A J\n"
"013 11 0B VT '\\v' (vertical tab) 113 75 4B K\n"
"014 12 0C FF '\\f' (form feed) 114 76 4C L\n"
"015 13 0D CR '\\r' (carriage ret) 115 77 4D M\n"
"016 14 0E SO (shift out) 116 78 4E N\n"
"017 15 0F SI (shift in) 117 79 4F O\n"
"020 16 10 DLE (data link escape) 120 80 50 P\n"
"021 17 11 DC1 (device control 1) 121 81 51 Q\n"
"022 18 12 DC2 (device control 2) 122 82 52 R\n"
"023 19 13 DC3 (device control 3) 123 83 53 S\n"
"024 20 14 DC4 (device control 4) 124 84 54 T\n"
"025 21 15 NAK (negative ack.) 125 85 55 U\n"
"026 22 16 SYN (synchronous idle) 126 86 56 V\n"
"027 23 17 ETB (end of trans. blk) 127 87 57 W\n"
"030 24 18 CAN (cancel) 130 88 58 X\n"
"031 25 19 EM (end of medium) 131 89 59 Y\n"
"032 26 1A SUB (substitute) 132 90 5A Z\n"
"033 27 1B ESC (escape) 133 91 5B [\n"
"034 28 1C FS (file separator) 134 92 5C \\ '\\\\'\n"
"035 29 1D GS (group separator) 135 93 5D ]\n"
"036 30 1E RS (record separator) 136 94 5E ^\n"
"037 31 1F US (unit separator) 137 95 5F _\n"
"040 32 20 SPACE 140 96 60 `\n"
"041 33 21 ! 141 97 61 a\n"
"042 34 22 \" 142 98 62 b\n"
"043 35 23 # 143 99 63 c\n"
"044 36 24 $ 144 100 64 d\n"
"045 37 25 %% 145 101 65 e\n"
"046 38 26 & 146 102 66 f\n"
"047 39 27 ' 147 103 67 g\n"
"050 40 28 ( 150 104 68 h\n"
"051 41 29 ) 151 105 69 i\n"
"052 42 2A * 152 106 6A j\n"
"053 43 2B + 153 107 6B k\n"
"054 44 2C , 154 108 6C l\n"
"055 45 2D - 155 109 6D m\n"
"056 46 2E . 156 110 6E n\n"
"057 47 2F / 157 111 6F o\n"
"060 48 30 0 160 112 70 p\n"
"061 49 31 1 161 113 71 q\n"
"062 50 32 2 162 114 72 r\n"
"063 51 33 3 163 115 73 s\n"
"064 52 34 4 164 116 74 t\n"
"065 53 35 5 165 117 75 u\n"
"066 54 36 6 166 118 76 v\n"
"067 55 37 7 167 119 77 w\n"
"070 56 38 8 170 120 78 x\n"
"071 57 39 9 171 121 79 y\n"
"072 58 3A : 172 122 7A z\n"
"073 59 3B ; 173 123 7B {\n"
"074 60 3C < 174 124 7C |\n"
"075 61 3D = 175 125 7D }\n"
"076 62 3E > 176 126 7E ~\n"
"077 63 3F ? 177 127 7F DEL\n"
);
static void print_ascii_table() {
printf("%s", ret_ascii_table());
}
static int help() {
@ -219,7 +151,7 @@ static int rax(char *str, int len, int last) {
while (str[1] && str[1] != ' ') {
switch (str[1]) {
case 'l': nl = "\n"; break;
case 'a': show_ascii_table (); return 0;
case 'a': print_ascii_table (); return 0;
case 's': flags ^= 1; break;
case 'e': flags ^= 1 << 1; break;
case 'S': flags ^= 1 << 2; break;

4
libr/core/cmd_help.c
View File

@ -77,6 +77,7 @@ static const char *help_msg_question[] = {
"??", " [cmd]", "run cmd if $? != 0",
"??", "", "show value of operation",
"?_", " hudfile", "load hud menu with given file",
"?a", "show ascii table",
"?b", " [num]", "show binary value of number",
"?b64[-]", " [str]", "encode/decode in base64",
"?btw", " num|expr num|expr num|expr", "returns boolean value of a <= b <= c",
@ -319,6 +320,9 @@ static int cmd_help(void *data, const char *input) {
r_cons_printf ("0x%"PFMT64x"\n", core->num->value);
}
break;
case 'a': // "?a"
printf("%s", ret_ascii_table());
break;
case 'b': // "?b"
if (input[1] == '6' && input[2] == '4') {
//b64 decoding takes at most strlen(str) * 4

1
libr/include/meson.build
View File

@ -66,6 +66,7 @@ r_util_files = [
'r_util/r_spaces.h',
'r_util/r_tree.h',
'r_util/r_str.h',
'r_util/r_ascii_table.h',
'r_util/r_base91.h',
'r_util/r_signal.h',
'r_util/r_cache.h',

1
libr/include/r_util.h
View File

@ -54,6 +54,7 @@ int gettimeofday (struct timeval* p, void* tz);
#include "r_util/r_spaces.h"
#include "r_util/r_stack.h"
#include "r_util/r_str.h"
#include "r_util/r_ascii_table.h"
#include "r_util/r_strbuf.h"
#include "r_util/r_strpool.h"
#include "r_util/r_sys.h"

16
libr/include/r_util/r_ascii_table.h Normal file
View File

@ -0,0 +1,16 @@
/* radare - LGPL - Copyright 2008-2016 - pancake, r00tus3r */
#ifndef R_ASCII_TABLE_H
#define R_ASCII_TABLE_H
#ifdef __cplusplus
extern "C" {
#endif
R_API const char *ret_ascii_table();
#ifdef __cplusplus
}
#endif
#endif

2
libr/util/Makefile
View File

@ -14,7 +14,7 @@ OBJS+=p_seven.o slist.o randomart.o log.o zip.o debruijn.o
OBJS+=utf8.o utf16.o utf32.o strbuf.o lib.o name.o spaces.o signal.o syscmd.o
OBJS+=diff.o bdiff.o stack.o queue.o tree.o des.o idpool.o
OBJS+=punycode.o r_pkcs7.o r_x509.o r_asn1.o json_indent.o skiplist.o
OBJS+=r_json.o rbtree.o qrcode.o trie.o vector.o str_trim.o
OBJS+=r_json.o rbtree.o qrcode.o trie.o vector.o str_trim.o ascii_table.o
# DO NOT BUILD r_big api (not yet used and its buggy)
ifeq (1,0)

11
libr/util/ascii_table.c Normal file
View File

@ -0,0 +1,11 @@
/* radare - LGPL - Copyright 2007-2018 - pancake, r00tus3r */
#include <stdio.h>
#include <r_util.h>
#include "r_util.h"
static const char *ascii_table = "The following table contains the 128 ASCII characters.\n\nOct Dec Hex Char Oct Dec Hex Char\n────────────────────────────────────────────────────────────────────────\n000 0 00 NUL '\\0' (null character) 100 64 40 @\n001 1 01 SOH (start of heading) 101 65 41 A\n002 2 02 STX (start of text) 102 66 42 B\n003 3 03 ETX (end of text) 103 67 43 C\n004 4 04 EOT (end of transmission) 104 68 44 D\n005 5 05 ENQ (enquiry) 105 69 45 E\n006 6 06 ACK (acknowledge) 106 70 46 F\n007 7 07 BEL '\\a' (bell) 107 71 47 G\n010 8 08 BS '\\b' (backspace) 110 72 48 H\n011 9 09 HT '\\t' (horizontal tab) 111 73 49 I\n012 10 0A LF '\\n' (new line) 112 74 4A J\n013 11 0B VT '\\v' (vertical tab) 113 75 4B K\n014 12 0C FF '\\f' (form feed) 114 76 4C L\n015 13 0D CR '\\r' (carriage ret) 115 77 4D M\n016 14 0E SO (shift out) 116 78 4E N\n017 15 0F SI (shift in) 117 79 4F O\n020 16 10 DLE (data link escape) 120 80 50 P\n021 17 11 DC1 (device control 1) 121 81 51 Q\n022 18 12 DC2 (device control 2) 122 82 52 R\n023 19 13 DC3 (device control 3) 123 83 53 S\n024 20 14 DC4 (device control 4) 124 84 54 T\n025 21 15 NAK (negative ack.) 125 85 55 U\n026 22 16 SYN (synchronous idle) 126 86 56 V\n027 23 17 ETB (end of trans. blk) 127 87 57 W\n030 24 18 CAN (cancel) 130 88 58 X\n031 25 19 EM (end of medium) 131 89 59 Y\n032 26 1A SUB (substitute) 132 90 5A Z\n033 27 1B ESC (escape) 133 91 5B [\n034 28 1C FS (file separator) 134 92 5C \\ '\\\\'\n035 29 1D GS (group separator) 135 93 5D ]\n036 30 1E RS (record separator) 136 94 5E ^\n037 31 1F US (unit separator) 137 95 5F _\n040 32 20 SPACE 140 96 60 `\n041 33 21 ! 141 97 61 a\n042 34 22 \" 142 98 62 b\n043 35 23 # 143 99 63 c\n044 36 24 $ 144 100 64 d\n045 37 25 % 145 101 65 e\n046 38 26 & 146 102 66 f\n047 39 27 ' 147 103 67 g\n050 40 28 ( 150 104 68 h\n051 41 29 ) 151 105 69 i\n052 42 2A * 152 106 6A j\n053 43 2B + 153 107 6B k\n054 44 2C , 154 108 6C l\n055 45 2D - 155 109 6D m\n056 46 2E . 156 110 6E n\n057 47 2F / 157 111 6F o\n060 48 30 0 160 112 70 p\n061 49 31 1 161 113 71 q\n062 50 32 2 162 114 72 r\n063 51 33 3 163 115 73 s\n064 52 34 4 164 116 74 t\n065 53 35 5 165 117 75 u\n066 54 36 6 166 118 76 v\n067 55 37 7 167 119 77 w\n070 56 38 8 170 120 78 x\n071 57 39 9 171 121 79 y\n072 58 3A : 172 122 7A z\n073 59 3B ; 173 123 7B {\n074 60 3C < 174 124 7C |\n075 61 3D = 175 125 7D }\n076 62 3E > 176 126 7E ~\n077 63 3F ? 177 127 7F DEL\n";
R_API const char *ret_ascii_table() {
return ascii_table;
}

1
libr/util/meson.build
View File

@ -4,6 +4,7 @@
# 'iconv.c',
files = [
'ascii_table.c',
'base85.c',
'base91.c',
'bdiff.c',