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

chg: 'hf mf csave'

Browse source 
chg: 'mem save'
chg: 'hf 15 dump' - no extra newline after last block in emlfile
This commit is contained in:
iceman1001 2018-05-03 11:02:50 +02:00
commit 0e7d8faf59
3 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/cmdhfmf.c
View file

@ -2950,6 +2950,8 @@ int CmdHF14AMfCSave(const char *Cmd) {
// eml // eml
for (j = 0; j < 16; j++) for (j = 0; j < 16; j++)
fprintf(feml, "%02x", buf[j]); fprintf(feml, "%02x", buf[j]);
if (i != numBlocks -1)
fprintf(feml,"\n"); fprintf(feml,"\n");
// bin // bin

15
client/loclass/fileutils.c
View file

@ -57,9 +57,7 @@ int fileExists(const char *filename) {
int saveFile(const char *preferredName, const char *suffix, const void* data, size_t datalen) { int saveFile(const char *preferredName, const char *suffix, const void* data, size_t datalen) {
int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10); int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
char * fileName = malloc(size); char * fileName = calloc(size,sizeof(char));
memset(fileName, 0, size);
int num = 1; int num = 1;
sprintf(fileName,"%s.%s", preferredName, suffix); sprintf(fileName,"%s.%s", preferredName, suffix);
while (fileExists(fileName)) { while (fileExists(fileName)) {
@ -91,11 +89,10 @@ int saveFileEML(const char *preferredName, const char *suffix, uint8_t* data, si
int retval = 0; int retval = 0;
int blocks = datalen/blocksize; int blocks = datalen/blocksize;
uint16_t currblock = 1;
int i,j; int i,j;
int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10); int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
char * fileName = malloc(size); char * fileName = calloc(size, sizeof(char));
memset(fileName, 0, size);
int num = 1; int num = 1;
sprintf(fileName,"%s.%s", preferredName, suffix); sprintf(fileName,"%s.%s", preferredName, suffix);
while (fileExists(fileName)) { while (fileExists(fileName)) {
@ -115,8 +112,12 @@ int saveFileEML(const char *preferredName, const char *suffix, uint8_t* data, si
for (i = 0; i < datalen; i++) { for (i = 0; i < datalen; i++) {
fprintf(f, "%02X", data[i] ); fprintf(f, "%02X", data[i] );
if ( (i+1) % blocksize == 0)
// no extra line in the end
if ( (i+1) % blocksize == 0 && currblock != blocks ) {
fprintf(f, "\n"); fprintf(f, "\n");
currblock++;
}
} }
// left overs // left overs
if ( datalen % blocksize != 0) { if ( datalen % blocksize != 0) {

2
client/mifarehost.c
View file

@ -620,7 +620,7 @@ int saveTraceCard(void) {
// no extra line in the end // no extra line in the end
if ( i < 255 ) if ( i < 255 )
fprintf(f,"\n"); fprintf(f, "\n");
} }
fflush(f); fflush(f);
fclose(f); fclose(f);