Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-01-27 08:12:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix pf usage syntax, Cf help, tweak o+ help

Browse Source
This commit is contained in:
SchumBlubBlub 2017-02-08 11:37:31 +00:00 committed by radare
parent 313cb98073
commit 7b2c107d7b
3 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libr/core/cmd_meta.c
View File

@ -789,7 +789,7 @@ static int cmd_meta(void *data, const char *input) {
"Cz", "[@addr]", "add zero-terminated string",
"Ch", "[-] [size] [@addr]", "hide data",
"Cd", "[-] [size] [repeat] [@addr]", "hexdump data array (Cd 4 10 == dword [10])",
"Cf", "[-] [sz] [fmt..] [@addr]", "format memory (see pf?)",
"Cf", "[-] [sz] [0|cnt][fmt..] [@addr]", "format memory (see pf?)",
"CF", "[sz] [fcn-sign..] [@addr]", "function signature",
"Cm", "[-] [sz] [fmt..] [@addr]", "magic parse (see pm?)",
NULL};

2
libr/core/cmd_open.c
View File

@ -335,7 +335,7 @@ static int cmd_open(void *data, const char *input) {
"o-","*","close all opened files",
"o--","","close all files, analysis, binfiles, flags, same as !r2 --",
"o"," [file]","open [file] file in read-only",
"o","+[file]","open file in read-write mode",
"o","+ [file]","open file in read-write mode",
"o"," [file] 0x4000","map file at 0x4000",
NULL
};

34
libr/core/cmd_print.c
View File

@ -11,6 +11,8 @@
#define R_CORE_MAX_DISASM (1024*1024*8)
#define PF_USAGE_STR "pf[.k[.f[=v]]|[v]]|[n]|[0|cnt][fmt] [a0 a1 ...]"
static void cmd_pCd(RCore *core, const char *input) {
#define C(x) r_cons_canvas_##x
int h, w = r_cons_get_size (&h);
@ -437,31 +439,32 @@ R_API int r_core_process_input_pade(RCore *core, const char *input, char** hex,
static void print_format_help(RCore *core) {
const char* help_msg[] = {
"pf:", "pf[.k[.f[=v]]|[ v]]|[n]|[0][ [sz] fmt] [a0 a1 ...]", "",
"pf:", PF_USAGE_STR, "",
"Commands:","","",
"pf", "?", "Show this help",
"pf", "??", "Format characters",
"pf", "???", "pf usage examples",
"pf", " xsi foo bar cow", "format named hex str and int (see `pf??`)",
"pf.", "", "List all formats",
"pf?", "fmt_name", "Show format of that stored one",
"pfs", " fmt_name", "Print the size of the format in bytes",
"pfo", "", "List all format files",
"pfo", " elf32", "Load the elf32 format definition file",
"pf.", "fmt_name", "Run stored format",
"pf.", "fmt_name.field_name", "Show specific field inside format",
"pf", " fmt", "Show data using the given format-string. See 'pf??' and 'pf???'.",
"pf.", "fmt_name", "Show data using named format",
"pf.", "fmt_name.field_name", "Show specific data field using named format",
"pfj ", "fmt_name|fmt", "Show data using (named) format in JSON",
"pf* ", "fmt_name|fmt", "Show data using (named) format as r2 flag create commands",
"pfd.", "fmt_name", "Show data using named format as graphviz commands",
"pf.", "name [0|cnt]fmt", "Define a new named format",
"pf.", "", "List all format definitions",
"pf?", "fmt_name", "Show the definition of a named format",
"pfo", "", "List all format definition files (fdf)",
"pfo", " fdf_name", "Load a Format Definition File (fdf)",
"pf.", "fmt_name.size=33", "Set new value for the size field in obj",
"pfj.", "fmt_name", "Print format in JSON",
"pfv.", "fmt_name", "Print the value(s) only. Useful for one-liners",
"pf*.", "fmt_name", "Display flag commands",
"pfd.", "fmt_name", "Display graphviz commands",
"pfv.", "fmt_name[.field]", "Print value(s) only for named format. Useful for one-liners",
"pfs", " fmt_name|fmt", "Print the size of (named) format in bytes",
NULL};
r_core_cmd_help (core, help_msg);
}
static void print_format_help_help(RCore *core) {
const char* help_msg[] = {
"pf:", "pf[.k[.f[=v]]|[ v]]|[n]|[0][ [sz] fmt] [a0 a1 ...]", "",
"pf:", PF_USAGE_STR, "",
"Format:", "", "",
" ", "b", "byte (unsigned)",
" ", "B", "resolve enum bitfield (see t?)",
@ -499,8 +502,9 @@ static void print_format_help_help(RCore *core) {
static void print_format_help_help_help(RCore *core) {
const char* help_msg[] = {
"pf:", "pf[.k[.f[=v]]|[ v]]|[n]|[0][ [sz] fmt] [a0 a1 ...]", "",
"pf:", PF_USAGE_STR, "",
"Examples:","","",
"pf", " 3xi foo bar", "3-array of struct, each with named fields: 'foo' as hex, and 'bar' as int",
"pf", " B (BitFldType)arg_name`", "bitfield type",
"pf", " E (EnumType)arg_name`", "enum type",
"pf.", "obj xxdz prev next size name", "Define the obj format as xxdz",