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

main_loop() string create refactoring

Browse source
This commit is contained in:
merlokk 2017-10-18 15:21:30 +03:00
commit 4af40c00d4
3 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
client/proxmark3.c
View file

@ -117,7 +117,7 @@ void main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
if (script_cmds_file) {
script_file = fopen(script_cmds_file, "r");
if (script_file) {
printf("using 'scripting' commands file %s\n", script_cmds_file);
printf("executing commands from file: %s\n", script_cmds_file);
}
}
@ -133,18 +133,14 @@ void main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
} else {
strcleanrn(script_cmd_buf, sizeof(script_cmd_buf));
if ((cmd = (char*) malloc(strlen(script_cmd_buf) + 1)) != NULL) {
memset(cmd, 0, strlen(script_cmd_buf) + 1);
strcpy(cmd, script_cmd_buf);
if ((cmd = strmcopy(script_cmd_buf)) != NULL) {
printf(PROXPROMPT"%s\n", cmd);
}
}
} else {
// If there is a script command
if (execCommand){
if ((cmd = (char*) malloc(strlen(script_cmd) + 1)) != NULL) {
memset(cmd, 0, strlen(script_cmd) + 1);
strcpy(cmd, script_cmd);
if ((cmd = strmcopy(script_cmd)) != NULL) {
printf(PROXPROMPT"%s\n", cmd);
}
@ -154,6 +150,7 @@ void main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
if (script_cmd)
break;
// if there is a pipe from stdin
if (stdinOnPipe) {
memset(script_cmd_buf, 0, sizeof(script_cmd_buf));
if (!fgets(script_cmd_buf, sizeof(script_cmd_buf), stdin)) {
@ -162,9 +159,7 @@ void main_loop(char *script_cmds_file, char *script_cmd, bool usb_present) {
}
strcleanrn(script_cmd_buf, sizeof(script_cmd_buf));
if ((cmd = (char*) malloc(strlen(script_cmd_buf) + 1)) != NULL) {
memset(cmd, 0, strlen(script_cmd_buf) + 1);
strcpy(cmd, script_cmd_buf);
if ((cmd = strmcopy(script_cmd_buf)) != NULL) {
printf(PROXPROMPT"%s\n", cmd);
}

9
client/util.c
View file

@ -637,6 +637,15 @@ void strcreplace(char *buf, size_t len, char from, char to) {
}
}
char *strmcopy(char *buf) {
char * str = NULL;
if ((str = (char*) malloc(strlen(buf) + 1)) != NULL) {
memset(str, 0, strlen(buf) + 1);
strcpy(str, buf);
}
return str;
}
// determine number of logical CPU cores (use for multithreaded functions)
extern int num_CPUs(void)

1
client/util.h
View file

@ -79,6 +79,7 @@ extern void rol(uint8_t *data, const size_t len);
extern void clean_ascii(unsigned char *buf, size_t len);
void strcleanrn(char *buf, size_t len);
void strcreplace(char *buf, size_t len, char from, char to);
char *strmcopy(char *buf);
extern int num_CPUs(void); // number of logical CPUs