github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-22 22:23:38 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

check spme errors + small refactoring

Browse source
This commit is contained in:
merlokk 2017-10-13 15:21:55 +03:00
commit 850f41650d
1 changed files with 52 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

75
client/proxmark3.c
View file

@ -230,6 +230,30 @@ static void set_my_executable_path(void)
} }
} }
static void show_help(bool showFullHelp, char *command_line){
printf("syntax: %s <port> [-h|-help|-m|-f|-flush|-w|-wait|-c|-command] [cmd_script_file_name] []\n", command_line);
printf("\tLinux example:'%s /dev/ttyACM0'\n", command_line);
printf("\tWindows example:'%s com3'\n\n", command_line);
if (showFullHelp){
printf("help: Dump all interactive command's help at once.\n");
printf("\t%s -h\n", command_line);
printf("\t%s -help\n\n", command_line);
printf("markdown: Dump all interactive help at once in markdown syntax\n");
printf("\t%s -m\n\n", command_line);
printf("flush: Output will be flushed after every print.\n");
printf("\t%s -f\n", command_line);
printf("\t%s -flush\n\n", command_line);
printf("wait: 20sec waiting the serial port to appear in the OS\n");
printf("\t%s "SERIAL_PORT_H" -w\n", command_line);
printf("\t%s "SERIAL_PORT_H" -wait\n\n", command_line);
printf("script: A script file with one proxmark3 command per line.\n\n");
printf("command: One proxmark3 command.\n");
printf("\t%s "SERIAL_PORT_H" -c \"hf mf chk 1* ?\"\n", command_line);
printf("\t%s "SERIAL_PORT_H" -command \"hf mf nested 1 *\"\n\n", command_line);
}
}
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
srand(time(0)); srand(time(0));
@ -240,31 +264,13 @@ int main(int argc, char* argv[]) {
char *script_cmd = NULL; char *script_cmd = NULL;
if (argc < 2) { if (argc < 2) {
printf("syntax: %s <port> [-h|-help|-m|-f|-flush|-w|-wait] [cmd_script_file_name]\n",argv[0]); show_help(true, argv[0]);
printf("\tLinux example:'%s /dev/ttyACM0'\n", argv[0]);
printf("\tWindows example:'%s com3'\n\n", argv[0]);
printf("help: Dump all interactive command's help at once.\n");
printf("\t%s -h\n", argv[0]);
printf("\t%s -help\n\n", argv[0]);
printf("markdown: Dump all interactive help at once in markdown syntax\n");
printf("\t%s -m\n\n", argv[0]);
printf("flush: Output will be flushed after every print.\n");
printf("\t%s -f\n", argv[0]);
printf("\t%s -flush\n\n", argv[0]);
printf("wait: 20sec waiting the serial port to appear in the OS\n");
printf("\t%s "SERIAL_PORT_H" -w\n", argv[0]);
printf("\t%s "SERIAL_PORT_H" -wait\n\n", argv[0]);
printf("script: A script file with one proxmark3 command per line.\n\n");
printf("command: One proxmark3 command.\n");
printf("\t%s "SERIAL_PORT_H" -c \"hf mf chk 1* ?\"\n\n", argv[0]);
return 1; return 1;
} }
for (int i = 1; i < argc; i++) { for (int i = 1; i < argc; i++) {
if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i],"-help") == 0) { if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i],"-help") == 0) {
printf("syntax: %s <port> [-h|-help|-m|-f|-flush|-w|-wait] [cmd_script_file_name]\n",argv[0]); show_help(false, argv[0]);
printf("\tWindows example:'%s com3'\n", argv[0]);
printf("\tLinux example:'%s /dev/ttyACM0'\n\n", argv[0]);
dumpAllHelp(0); dumpAllHelp(0);
return 0; return 0;
} }
@ -279,25 +285,40 @@ int main(int argc, char* argv[]) {
flushAfterWrite = 1; flushAfterWrite = 1;
} }
if(strcmp(argv[i],"-c") == 0 || strcmp(argv[i],"-command") == 0){
executeCommand = true;
}
if(strcmp(argv[i],"-w") == 0 || strcmp(argv[i],"-wait") == 0){ if(strcmp(argv[i],"-w") == 0 || strcmp(argv[i],"-wait") == 0){
waitCOMPort = true; waitCOMPort = true;
} }
if(strcmp(argv[i],"-c") == 0 || strcmp(argv[i],"-command") == 0){
executeCommand = true;
}
} }
// If the user passed the filename of the 'script' to execute, get it from last parameter // If the user passed the filename of the 'script' to execute, get it from last parameter
if (argc > 2 && argv[argc - 1] && argv[argc - 1][0] != '-') { if (argc > 2 && argv[argc - 1] && argv[argc - 1][0] != '-') {
if (executeCommand){ if (executeCommand){
script_cmd = argv[argc - 1]; script_cmd = argv[argc - 1];
while(script_cmd[strlen(script_cmd) - 1] == ' ')
script_cmd[strlen(script_cmd) - 1] = 0x00;
if (strlen(script_cmd) == 0) {
script_cmd = NULL;
} else {
printf("Execute command from commandline: %s\n", script_cmd); printf("Execute command from commandline: %s\n", script_cmd);
}
} else { } else {
script_cmds_file = argv[argc - 1]; script_cmds_file = argv[argc - 1];
} }
} }
// check command
if (executeCommand && (!script_cmd || strlen(script_cmd) == 0)){
printf("ERROR: execute command: command not found.\n");
return 2;
}
// set global variables
set_my_executable_path(); set_my_executable_path();
// open uart // open uart
@ -328,6 +349,12 @@ int main(int argc, char* argv[]) {
offline = 0; offline = 0;
} }
// dont execute comamnds in offline mode
if (offline && (executeCommand || script_cmds_file)) {
printf("ERROR: can't execute in offline mode.\n");
return 2;
}
// create a mutex to avoid interlacing print commands from our different threads // create a mutex to avoid interlacing print commands from our different threads
pthread_mutex_init(&print_lock, NULL); pthread_mutex_init(&print_lock, NULL);