Fixed buffer corruption in iso1443a_select_card, affecting several operations, e...

[proxmark3-svn] / client / flasher.c

diff --git a/client/flasher.c b/client/flasher.c
index d1efec5eebdba4f1f77fa060812ad1e136adf76e..3ed438452038a8c31197bc87f5664d989197b0fd 100644 (file)
--- a/client/flasher.c
+++ b/client/flasher.c
@@ -72,9 +72,8 @@ void CloseProxmark() {
 
 int OpenProxmark(size_t i) {
   sp = uart_open(serial_port_name);
 
 int OpenProxmark(size_t i) {
   sp = uart_open(serial_port_name);

-  if (sp == INVALID_SERIAL_PORT) {
+  if (sp == INVALID_SERIAL_PORT || sp == CLAIMED_SERIAL_PORT) {

     //poll once a second
     //poll once a second

-    msleep(100);

     return 0;
   }
   return 1;
     return 0;
   }
   return 1;


@@ -123,11 +122,13 @@ int main(int argc, char **argv)
        }
 
   serial_port_name = argv[1];
        }
 
   serial_port_name = argv[1];

-       fprintf(stderr, "Waiting for Proxmark to appear on USB...");
-       while (!OpenProxmark(0)) {
-               fprintf(stderr, ".");
-       }
-       fprintf(stderr, " Found.\n");
+  
+  fprintf(stderr,"Waiting for Proxmark to appear on USB...");
+  do {
+    sleep(1);
+    fprintf(stderr, ".");
+  } while (!OpenProxmark(0));
+  fprintf(stderr," Found.\n");

 
        res = flash_start_flashing(can_write_bl);
        if (res < 0)
 
        res = flash_start_flashing(can_write_bl);
        if (res < 0)