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

Merge branch 'master' of git://github.com/Proxmark/proxmark3

Browse source
This commit is contained in:
Fl0-0 2018-07-26 11:01:10 +02:00
commit 386a5ca2c3
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/comms.c
View file

@ -12,7 +12,7 @@
#include "comms.h" #include "comms.h"
#include <pthread.h> #include <pthread.h>
#ifdef __linux__ #if defined(__linux__) && !defined(NO_UNLINK)
#include <unistd.h> // for unlink() #include <unistd.h> // for unlink()
#endif #endif
#include "uart.h" #include "uart.h"
@ -339,8 +339,10 @@ void CloseProxmark(void) {
uart_close(sp); uart_close(sp);
} }
#ifdef __linux__ #if defined(__linux__) && !defined(NO_UNLINK)
// Fix for linux, it seems that it is extremely slow to release the serial port file descriptor /dev/* // Fix for linux, it seems that it is extremely slow to release the serial port file descriptor /dev/*
//
// This may be disabled at compile-time with -DNO_UNLINK (used for a JNI-based serial port on Android).
if (serial_port_name) { if (serial_port_name) {
unlink(serial_port_name); unlink(serial_port_name);
} }

2
client/scripts/mfkeys.lua
View file

@ -68,7 +68,7 @@ function checkBlock(blockNo, keys, keyType)
data = data} data = data}
local status = checkCommand(command) local status = checkCommand(command)
if status then return status, blockNo end if status then return status, blockNo end
start = start+n+1 start = start + n
remaining = remaining - n remaining = remaining - n
end end
return nil return nil