github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 21:03:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

ADD: case insensitive commands :) finally, you can write LF SEARCH ...

Browse source
This commit is contained in:
iceman1001 2017-09-15 14:45:26 +02:00
commit 55a1ef1549
3 changed files with 94 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

174
client/cmdparser.c
View file

@ -11,6 +11,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "util.h"
#include "ui.h" #include "ui.h"
#include "cmdparser.h" #include "cmdparser.h"
#include "proxmark3.h" #include "proxmark3.h"
@ -25,49 +26,48 @@ void CmdsHelp(const command_t Commands[]) {
} }
} }
int CmdsParse(const command_t Commands[], const char *Cmd) {
// Help dump children
if (strcmp( Cmd, "XX_internal_command_dump_XX") == 0) {
dumpCommandsRecursive(Commands, 0);
return 0;
}
// Markdown help dump children
if(strcmp( Cmd, "XX_internal_command_dump_markdown_XX") == 0) {
dumpCommandsRecursive(Commands, 1);
return 0;
}
char cmd_name[64];
int len = 0;
memset(cmd_name, 0, sizeof(cmd_name));
sscanf(Cmd, "%63s%n", cmd_name, &len);
str_lower(cmd_name);
int i = 0;
while (Commands[i].Name && strcmp(Commands[i].Name, cmd_name))
++i;
int CmdsParse(const command_t Commands[], const char *Cmd) /* try to find exactly one prefix-match */
{ if (!Commands[i].Name) {
if(strcmp( Cmd, "XX_internal_command_dump_XX") == 0) int last_match = 0;
{// Help dump children int matches = 0;
dumpCommandsRecursive(Commands, 0);
return 0;
}
if(strcmp( Cmd, "XX_internal_command_dump_markdown_XX") == 0)
{// Markdown help dump children
dumpCommandsRecursive(Commands, 1);
return 0;
}
char cmd_name[32];
int len = 0;
memset(cmd_name, 0, sizeof(cmd_name));
sscanf(Cmd, "%31s%n", cmd_name, &len);
int i = 0;
while (Commands[i].Name && strcmp(Commands[i].Name, cmd_name))
++i;
/* try to find exactly one prefix-match */ for (i=0; Commands[i].Name;i++) {
if(!Commands[i].Name) { if( !strncmp(Commands[i].Name, cmd_name, strlen(cmd_name)) ) {
int last_match = 0; last_match = i;
int matches = 0; matches++;
}
}
if(matches == 1) i = last_match;
}
for(i=0;Commands[i].Name;i++) { if (Commands[i].Name) {
if( !strncmp(Commands[i].Name, cmd_name, strlen(cmd_name)) ) { while (Cmd[len] == ' ')
last_match = i; ++len;
matches++; return Commands[i].Parse(Cmd + len);
} } else {
} // show help for selected hierarchy or if command not recognised
if(matches == 1) i=last_match; CmdsHelp(Commands);
} }
if (Commands[i].Name) {
while (Cmd[len] == ' ')
++len;
return Commands[i].Parse(Cmd + len);
} else {
// show help for selected hierarchy or if command not recognised
CmdsHelp(Commands);
}
return 0; return 0;
} }
@ -75,58 +75,56 @@ int CmdsParse(const command_t Commands[], const char *Cmd)
char pparent[512] = {0}; char pparent[512] = {0};
char *parent = pparent; char *parent = pparent;
void dumpCommandsRecursive(const command_t cmds[], int markdown) void dumpCommandsRecursive(const command_t cmds[], int markdown) {
{ if (cmds[0].Name == NULL)
if (cmds[0].Name == NULL) return;
return;
int i = 0; int i = 0;
int w_cmd=25; int w_cmd = 25;
int w_off=8; int w_off = 8;
// First, dump all single commands, which are not a container for // First, dump all single commands, which are not a container for
// other commands // other commands
if (markdown) { if (markdown) {
printf("|%-*s|%-*s|%s\n",w_cmd,"command",w_off,"offline","description"); printf("|%-*s|%-*s|%s\n",w_cmd,"command",w_off,"offline","description");
printf("|%-*s|%-*s|%s\n",w_cmd,"-------",w_off,"-------","-----------"); printf("|%-*s|%-*s|%s\n",w_cmd,"-------",w_off,"-------","-----------");
} else { } else {
printf("%-*s|%-*s|%s\n",w_cmd,"command",w_off,"offline","description"); printf("%-*s|%-*s|%s\n",w_cmd,"command",w_off,"offline","description");
printf("%-*s|%-*s|%s\n",w_cmd,"-------",w_off,"-------","-----------"); printf("%-*s|%-*s|%s\n",w_cmd,"-------",w_off,"-------","-----------");
} }
while (cmds[i].Name) while (cmds[i].Name) {
{ char* cmd_offline = "N";
char* cmd_offline = "N"; if (cmds[i].Help[0] == '{' && ++i) continue;
if(cmds[i].Help[0] == '{' && ++i) continue;
if ( cmds[i].Offline) cmd_offline = "Y"; if ( cmds[i].Offline)
if (markdown) cmd_offline = "Y";
printf("|`%s%-*s`|%-*s|`%s`\n", parent, w_cmd-(int)strlen(parent)-2, cmds[i].Name, w_off, cmd_offline, cmds[i].Help); if (markdown)
else printf("|`%s%-*s`|%-*s|`%s`\n", parent, w_cmd-(int)strlen(parent)-2, cmds[i].Name, w_off, cmd_offline, cmds[i].Help);
printf("%s%-*s|%-*s|%s\n", parent, w_cmd-(int)strlen(parent), cmds[i].Name, w_off, cmd_offline, cmds[i].Help); else
++i; printf("%s%-*s|%-*s|%s\n", parent, w_cmd-(int)strlen(parent), cmds[i].Name, w_off, cmd_offline, cmds[i].Help);
} ++i;
printf("\n\n"); }
i=0; printf("\n\n");
// Then, print the categories. These will go into subsections with their own tables i = 0;
// Then, print the categories. These will go into subsections with their own tables
while (cmds[i].Name) {
if(cmds[i].Help[0] != '{' && ++i) continue;
while (cmds[i].Name) printf("### %s%s\n\n %s\n\n", parent, cmds[i].Name, cmds[i].Help);
{
if(cmds[i].Help[0] != '{' && ++i) continue;
printf("### %s%s\n\n %s\n\n", parent, cmds[i].Name, cmds[i].Help); char currentparent[512] = {0};
snprintf(currentparent, sizeof currentparent, "%s%s ", parent, cmds[i].Name);
char currentparent[512] = {0}; char *old_parent = parent;
snprintf(currentparent, sizeof currentparent, "%s%s ", parent, cmds[i].Name); parent = currentparent;
char *old_parent = parent; // This is what causes the recursion, since commands Parse-implementation
parent = currentparent; // in turn calls the CmdsParse above.
// This is what causes the recursion, since commands Parse-implementation if (markdown)
// in turn calls the CmdsParse above. cmds[i].Parse("XX_internal_command_dump_markdown_XX");
if (markdown) else
cmds[i].Parse("XX_internal_command_dump_markdown_XX"); cmds[i].Parse("XX_internal_command_dump_XX");
else
cmds[i].Parse("XX_internal_command_dump_XX");
parent = old_parent;
++i;
}
parent = old_parent;
++i;
}
} }

8
client/util.c
View file

@ -664,8 +664,7 @@ uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor) {
} }
// determine number of logical CPU cores (use for multithreaded functions) // determine number of logical CPU cores (use for multithreaded functions)
extern int num_CPUs(void) extern int num_CPUs(void) {
{
#if defined(_WIN32) #if defined(_WIN32)
#include <sysinfoapi.h> #include <sysinfoapi.h>
SYSTEM_INFO sysinfo; SYSTEM_INFO sysinfo;
@ -677,4 +676,9 @@ extern int num_CPUs(void)
#else #else
return 1; return 1;
#endif #endif
}
extern void str_lower(char *s ){
for(int i=0; i < strlen(s); i++)
s[i] = tolower( s[i] );
} }

2
client/util.h
View file

@ -142,4 +142,6 @@ extern uint32_t reflect(uint32_t v, int b);
extern uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor); extern uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor);
extern int num_CPUs(void); // number of logical CPUs extern int num_CPUs(void); // number of logical CPUs
extern void str_lower(char* s); // converts string to lower case
#endif #endif