1. fixed (it seems) readline behavior. Now there is no proxmark3 prompts on the data.

2. emulator goes into beta stage.
works:
- work with 4BUID and 7BUID dumps
- load/save/grab dumps
- emulate select
- emulate authentication (with nested)
- emulate read/write blocks
- emulate NACK-ACK ping-pong
This commit is contained in:
Merlokbr@gmail.com 2011-06-23 16:49:39 +00:00
commit 51969283ec
4 changed files with 111 additions and 77 deletions

View file

@ -10,8 +10,10 @@
//-----------------------------------------------------------------------------
#include <stdarg.h>
#include <stdlib.h>
#include <stdio.h>
#include <time.h>
#include <readline/readline.h>
#include "ui.h"
@ -23,6 +25,8 @@ static char *logfilename = "proxmark3.log";
void PrintAndLog(char *fmt, ...)
{
char *saved_line;
int saved_point;
va_list argptr, argptr2;
static FILE *logfile = NULL;
static int logging=1;
@ -34,12 +38,32 @@ void PrintAndLog(char *fmt, ...)
logging=0;
}
}
int need_hack = (rl_readline_state & RL_STATE_READCMD) > 0;
if (need_hack) {
saved_point = rl_point;
saved_line = rl_copy_text(0, rl_end);
rl_save_prompt();
rl_replace_line("", 0);
rl_redisplay();
}
va_start(argptr, fmt);
va_copy(argptr2, argptr);
vprintf(fmt, argptr);
vprintf(" ", 0); // cleaning prompt
va_end(argptr);
printf("\n");
if (need_hack) {
rl_restore_prompt();
rl_replace_line(saved_line, 0);
rl_point = saved_point;
rl_redisplay();
free(saved_line);
}
if (logging && logfile) {
vfprintf(logfile, fmt, argptr2);
fprintf(logfile,"\n");