RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-22 15:16:19 +08:00
Code Issues Projects Releases Packages Wiki Activity

strndup fixes for mingw

Browse source
This commit is contained in:
iceman1001 2021-12-13 18:44:46 +01:00
parent bad5b92ec9
commit 712ee2b10e
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
client/pyscripts/pm3_help2list.py
View file

@ -12,8 +12,8 @@ This version
- Iceman - Iceman
Note: Note:
This file is used as a helper script to generate the rl_vocabulory.h file need. This script is used as a helper script to generate the rl_vocabulory.h file.
It also needs a working proxmark3 client to extract the help text. It need a working proxmark3 client to extract the help text.
Ie: this script can't be used inside the normal build sequence. Ie: this script can't be used inside the normal build sequence.
""" """
@ -69,6 +69,7 @@ extern "C" {
#include <string.h> #include <string.h>
#include <readline/readline.h> #include <readline/readline.h>
#include "ui.h" // g_session #include "ui.h" // g_session
#include "util.h" // str_ndup
char* rl_command_generator(const char *text, int state); char* rl_command_generator(const char *text, int state);
char **rl_command_completion(const char *text, int start, int end); char **rl_command_completion(const char *text, int start, int end);
@ -124,9 +125,9 @@ char* rl_command_generator(const char *text, int state) {
const char *next = command + (rlen - len); const char *next = command + (rlen - len);
const char *space = strstr(next, " "); const char *space = strstr(next, " ");
if (space != NULL) { if (space != NULL) {
return strndup(next, space - next); return str_ndup(next, space - next);
} }
return strdup(next); return str_dup(next);
} }
} }

6
client/src/rl_vocabulory.h
View file

@ -20,6 +20,7 @@ extern "C" {
#include <string.h> #include <string.h>
#include <readline/readline.h> #include <readline/readline.h>
#include "ui.h" // g_session #include "ui.h" // g_session
#include "util.h" // str_ndup
char* rl_command_generator(const char *text, int state); char* rl_command_generator(const char *text, int state);
char **rl_command_completion(const char *text, int start, int end); char **rl_command_completion(const char *text, int start, int end);
@ -76,6 +77,7 @@ const static vocabulory_t vocabulory[] = {
{ 1, "data fsktonrz" }, { 1, "data fsktonrz" },
{ 1, "data manrawdecode" }, { 1, "data manrawdecode" },
{ 1, "data modulation" }, { 1, "data modulation" },
{ 1, "data pwmdemod" },
{ 1, "data rawdemod" }, { 1, "data rawdemod" },
{ 1, "data askedgedetect" }, { 1, "data askedgedetect" },
{ 1, "data autocorr" }, { 1, "data autocorr" },
@ -734,9 +736,9 @@ char* rl_command_generator(const char *text, int state) {
const char *next = command + (rlen - len); const char *next = command + (rlen - len);
const char *space = strstr(next, " "); const char *space = strstr(next, " ");
if (space != NULL) { if (space != NULL) {
return strndup(next, space - next); return str_ndup(next, space - next);
} }
return strdup(next); return str_dup(next);
} }
} }