dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use PrintAndLogEx() instead of PrintAndLog()

Browse Source
This commit is contained in:
Brian Pow
2018-02-21 20:06:02 +08:00
parent ee3da288e3
commit 6d6f5f422d
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
client/cmdparser.c
View File

@@ -21,7 +21,7 @@ void CmdsHelp(const command_t Commands[]) {
int i = 0; int i = 0;
while (Commands[i].Name) { while (Commands[i].Name) {
if (!offline || Commands[i].Offline) if (!offline || Commands[i].Offline)
PrintAndLog("%-16s %s", Commands[i].Name, Commands[i].Help); PrintAndLogEx(NORMAL, "%-16s %s", Commands[i].Name, Commands[i].Help);
++i; ++i;
} }
} }
@@ -84,11 +84,11 @@ void dumpCommandsRecursive(const command_t cmds[], int markdown) {
// 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"); PrintAndLogEx(NORMAL, "|%-*s|%-*s|%s\n",w_cmd,"command",w_off,"offline","description");
printf("|%-*s|%-*s|%s\n",w_cmd,"-------",w_off,"-------","-----------"); PrintAndLogEx(NORMAL, "|%-*s|%-*s|%s\n",w_cmd,"-------",w_off,"-------","-----------");
} else { } else {
printf("%-*s|%-*s|%s\n",w_cmd,"command",w_off,"offline","description"); PrintAndLogEx(NORMAL, "%-*s|%-*s|%s\n",w_cmd,"command",w_off,"offline","description");
printf("%-*s|%-*s|%s\n",w_cmd,"-------",w_off,"-------","-----------"); PrintAndLogEx(NORMAL, "%-*s|%-*s|%s\n",w_cmd,"-------",w_off,"-------","-----------");
} }
while (cmds[i].Name) { while (cmds[i].Name) {
@@ -98,19 +98,19 @@ void dumpCommandsRecursive(const command_t cmds[], int markdown) {
if ( cmds[i].Offline) if ( cmds[i].Offline)
cmd_offline = "Y"; cmd_offline = "Y";
if (markdown) if (markdown)
printf("|`%s%-*s`|%-*s|`%s`\n", parent, w_cmd-(int)strlen(parent)-2, cmds[i].Name, w_off, cmd_offline, cmds[i].Help); PrintAndLogEx(NORMAL, "|`%s%-*s`|%-*s|`%s`\n", parent, w_cmd-(int)strlen(parent)-2, cmds[i].Name, w_off, cmd_offline, cmds[i].Help);
else else
printf("%s%-*s|%-*s|%s\n", parent, w_cmd-(int)strlen(parent), cmds[i].Name, w_off, cmd_offline, cmds[i].Help); PrintAndLogEx(NORMAL, "%s%-*s|%-*s|%s\n", parent, w_cmd-(int)strlen(parent), cmds[i].Name, w_off, cmd_offline, cmds[i].Help);
++i; ++i;
} }
printf("\n\n"); PrintAndLogEx(NORMAL, "\n\n");
i = 0; i = 0;
// Then, print the categories. These will go into subsections with their own tables // Then, print the categories. These will go into subsections with their own tables
while (cmds[i].Name) { while (cmds[i].Name) {
if(cmds[i].Help[0] != '{' && ++i) continue; if(cmds[i].Help[0] != '{' && ++i) continue;
printf("### %s%s\n\n %s\n\n", parent, cmds[i].Name, cmds[i].Help); PrintAndLogEx(NORMAL, "### %s%s\n\n %s\n\n", parent, cmds[i].Name, cmds[i].Help);
char currentparent[512] = {0}; char currentparent[512] = {0};
snprintf(currentparent, sizeof currentparent, "%s%s ", parent, cmds[i].Name); snprintf(currentparent, sizeof currentparent, "%s%s ", parent, cmds[i].Name);