github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-14 02:27:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

text
Some checks are pending
CodeQL / Analyze (push) Waiting to run
Details
MacOS Build and Test / macos-make (push) Waiting to run
Details
MacOS Build and Test / macos-make-btaddon (push) Waiting to run
Details
MacOS Build and Test / macos-cmake (push) Waiting to run
Details
Ubuntu Build and Test / ubuntu-make (push) Waiting to run
Details
Ubuntu Build and Test / ubuntu-make-btaddon (push) Waiting to run
Details
Ubuntu Build and Test / ubuntu-cmake (push) Waiting to run
Details
Windows Build and Test / proxspace (push) Waiting to run
Details
Windows Build and Test / wsl (push) Waiting to run
Details

Browse source
This commit is contained in:
iceman1001 2025-06-19 20:26:07 +02:00
commit 47648c541c
4 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/luascripts/hf_mf_keycheck.lua
View file

@ -216,7 +216,7 @@ local function perform_check(uid, numsectors)
for sector = 0, #keys do for sector = 0, #keys do
-- Check if user aborted -- Check if user aborted
if core.kbd_enter_pressed() then if core.kbd_enter_pressed() then
print('Aborted by user') print('Aborted via keyboard!')
break break
end end

2
client/luascripts/lf_electra.lua
View file

@ -299,7 +299,7 @@ local function main(args)
if answer == 'n' then if answer == 'n' then
core.console('clear') core.console('clear')
print( string.rep('--',39) ) print( string.rep('--',39) )
print(ac.red..' USER ABORTED'..ac.reset) print(ac.red..' Aborted via keyboard!'..ac.reset)
print( string.rep('--',39) ) print( string.rep('--',39) )
break break
end end

2
client/luascripts/lf_em4100_bulk.lua
View file

@ -198,7 +198,7 @@ local function main(args)
core.console('lf em 410x reader') core.console('lf em 410x reader')
end end
else else
print(ac.red..'User aborted'..ac.reset) print(ac.red..'aborted via keyboard!'..ac.reset)
low = i low = i
break break
end end

3
client/src/cmdparser.c
View file

@ -27,7 +27,7 @@
#include "util_posix.h" // msleep #include "util_posix.h" // msleep
#if defined(__MACH__) && defined(__APPLE__) #if defined(__MACH__) && defined(__APPLE__)
# include "pthread_spin_lock_shim.h" # include "pthread_spin_lock_shim.h" // spinlock shim for OSX ..
#endif #endif
#define MAX_PM3_INPUT_ARGS_LENGTH 4096 #define MAX_PM3_INPUT_ARGS_LENGTH 4096
@ -229,7 +229,6 @@ static int execute_system_command(const char *command) {
pthread_spin_init(&sycmd_spinlock, 0); pthread_spin_init(&sycmd_spinlock, 0);
pthread_spin_lock(&sycmd_spinlock); pthread_spin_lock(&sycmd_spinlock);
int ret; int ret;
#if defined(_WIN32) #if defined(_WIN32)