From 200558b9a8de2a701cae68fab9f2f2153e68473c Mon Sep 17 00:00:00 2001 From: Eduardo Novella Date: Mon, 29 Jan 2024 22:30:35 +0100 Subject: [PATCH 1/2] Fix #548: :i? doesnt provide command description --- src/agent/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/agent/index.ts b/src/agent/index.ts index b8948941..e1836622 100644 --- a/src/agent/index.ts +++ b/src/agent/index.ts @@ -85,7 +85,7 @@ const commandHandlers = { 'ii*': info.listImportsR2, iij: info.listImportsJson, il: [info.listModules, 'list libraries'], - 'il.': info.listModulesHere, + 'il.': [info.listModulesHere, 'list libraries of current offset'], 'il*': info.listModulesR2, ilq: info.listModulesQuiet, ilj: info.listModulesJson, From f37bf1d0429cc961428283c6dd61199fdb6bb2a7 Mon Sep 17 00:00:00 2001 From: Eduardo Novella Date: Mon, 29 Jan 2024 23:02:13 +0100 Subject: [PATCH 2/2] Change comments regarding operation at current address --- src/agent/index.ts | 18 +++++++++--------- src/io_frida.c | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/agent/index.ts b/src/agent/index.ts index e1836622..ca82e2c8 100644 --- a/src/agent/index.ts +++ b/src/agent/index.ts @@ -85,7 +85,7 @@ const commandHandlers = { 'ii*': info.listImportsR2, iij: info.listImportsJson, il: [info.listModules, 'list libraries'], - 'il.': [info.listModulesHere, 'list libraries of current offset'], + 'il.': [info.listModulesHere, 'list libraries at current offset'], 'il*': info.listModulesR2, ilq: info.listModulesQuiet, ilj: info.listModulesJson, @@ -95,15 +95,15 @@ const commandHandlers = { 'iAs*': info.listAllSymbolsR2, iAn: [classes.listAllClassesNatives, 'list all native classes (ANDROID)'], is: [info.listSymbols, 'list symbols'], - 'is.': [lookup.lookupSymbolHere, 'lookup symbol name in current address'], + 'is.': [lookup.lookupSymbolHere, 'lookup symbol name at current address'], isj: info.listSymbolsJson, 'is*': info.listSymbolsR2, iSS: [info.listSegments, 'list current bin segments'], - 'iSS.': [info.listSegmentsHere, 'show segment name of current address'], + 'iSS.': [info.listSegmentsHere, 'show segment name at current address'], 'iSS*': info.listSegmentsR2, iSSj: info.listSegmentsJson, iS: [info.listSections, 'list current bin sections'], - 'iS.': [info.listSectionsHere, 'show section name of current address'], + 'iS.': [info.listSectionsHere, 'show section name at current address'], 'iS*': info.listSectionsR2, iSj: info.listSectionsJson, ias: [lookup.lookupSymbol, 'resolve symbol name in given address', '[addr]'], @@ -116,8 +116,8 @@ const commandHandlers = { isam: [lookup.lookupSymbolMany, 'resolve multiple symbol names from many addresses', '[addr ...]'], isamj: lookup.lookupSymbolManyJson, 'isam*': lookup.lookupSymbolManyR2, - iE: [info.listExports, 'list exports of current binary'], - 'iE.': [lookup.lookupSymbolHere, 'show symbol name in current address (see `:is.`)'], + iE: [info.listExports, 'list exports at current binary'], + 'iE.': [lookup.lookupSymbolHere, 'show symbol name at current address (see `:is.`)'], iEj: info.listExportsJson, 'iE*': info.listExportsR2, iaE: [lookup.lookupExport, 'lookup implementation address for given export name'], @@ -133,11 +133,11 @@ const commandHandlers = { init: [initBasicInfoFromTarget, 'print initialization commands to import basic r2frida info into r2'], 'init*': [initBasicInfoFromTarget, 'same as init'], fD: [lookup.lookupDebugInfo, 'lookup debug information'], - fd: [lookup.lookupAddress, 'describe flag name in current address'], + fd: [lookup.lookupAddress, 'describe flag name at current address'], 'fd.': [lookup.lookupAddress, 'same as fd but using current offset instead of taking it as argument'], 'fd*': lookup.lookupAddressR2, fdj: lookup.lookupAddressJson, - ic: [classes.listClasses, 'list classes associated with the binary in current address'], + ic: [classes.listClasses, 'list classes associated with the binary at current address'], ich: [classes.listClassesHooks, 'list class hooks'], icw: [classes.listClassesWhere, 'list classes where'], icv: [classes.listClassVariables, 'list class variables'], @@ -166,7 +166,7 @@ const commandHandlers = { dmm: [memory.listMemoryMaps, 'like :dm but easier to read as it groups consecutive maps'], 'dmm*': [memory.listMemoryMapsR2, 'add a flag in r2 for every memory map'], 'dmmj': [memory.listMemoryMapsJson, 'list memory maps in json format'], - 'dmm.': [memory.listMemoryMapsHere, 'show memory map name in current address (see `dm.`)'], + 'dmm.': [memory.listMemoryMapsHere, 'show memory map name at current address (see `dm.`)'], dmh: [memory.listMallocRanges, 'list memory'], 'dmh*': memory.listMallocRangesR2, dmhj: memory.listMallocRangesJson, diff --git a/src/io_frida.c b/src/io_frida.c index f68ba96c..bc26f321 100644 --- a/src/io_frida.c +++ b/src/io_frida.c @@ -510,10 +510,10 @@ static char *__system_continuation(RIO *io, RIODesc *fd, const char *command) { ":i Show target information\n" ":iE[*] Same as is, but only for the export global ones\n" ":iS[*] List sections\n" - ":iS. Show section name of current address\n" + ":iS. Show section name at current address\n" ":iSj List sections in Json format\n" ":iSS[*] List segments\n" - ":iSS. Show segment name of current address\n" + ":iSS. Show segment name at current address\n" ":iSSj List segments in Json format\n" ":ic List Objective-C/Android Java classes, or methods of \n" ":ii[*] List imports\n"