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

loadFile*: accept when suffix is already provided

Browse source
This commit is contained in:
Philippe Teuwen 2019-04-28 19:21:04 +02:00
commit 405f24522e
8 changed files with 61 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

28
client/util.c
View file

@ -891,10 +891,23 @@ void str_lower(char *s) {
for (size_t i = 0; i < strlen(s); i++)
s[i] = tolower(s[i]);
}
// check for prefix in string
bool str_startswith(const char *s, const char *pre) {
return strncmp(pre, s, strlen(pre)) == 0;
}
// check for suffix in string
bool str_endswith(const char *s, const char *suffix) {
size_t ls = strlen(s);
size_t lsuffix = strlen(suffix);
if (ls >= lsuffix)
{
return strncmp(suffix, s + (ls - lsuffix), lsuffix) == 0;
}
return false;
}
// Replace unprintable characters with a dot in char buffer
void clean_ascii(unsigned char *buf, size_t len) {
for (size_t i = 0; i < len; i++) {
@ -917,7 +930,7 @@ void strcreplace(char *buf, size_t len, char from, char to) {
}
}
char *strmcopy(char *buf) {
char *strmcopy(const char *buf) {
char *str = (char *) calloc(strlen(buf) + 1, sizeof(uint8_t));
if (str != NULL) {
memset(str, 0, strlen(buf) + 1);
@ -925,3 +938,16 @@ char *strmcopy(char *buf) {
}
return str;
}
char *filenamemcopy(const char *preferredName, const char *suffix) {
if (preferredName == NULL) return NULL;
if (suffix == NULL) return NULL;
char *fileName = (char *) calloc(strlen(preferredName) + strlen(suffix) + 1, sizeof(uint8_t));
if (fileName == NULL)
return NULL;
strcpy(fileName, preferredName);
if (str_endswith(fileName, suffix))
return fileName;
strcat(fileName, suffix);
return fileName;
}