Merge pull request #638 from grauerfuchs/master

[proxmark3-svn] / client / comms.c

diff --git a/client/comms.c b/client/comms.c
index eeaff79cda8857082a16d4e261c442f347018e8f..2030f8f3ea6010946bbc990aa1dcbc805c9bbbfd 100644 (file)
--- a/client/comms.c
+++ b/client/comms.c
@@ -12,7 +12,7 @@
 #include "comms.h"
 
 #include <pthread.h>
-#ifdef __linux__
+#if defined(__linux__) && !defined(NO_UNLINK)
 #include <unistd.h>            // for unlink()
 #endif
 #include "uart.h"
@@ -334,13 +334,23 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode)
 void CloseProxmark(void) {
        conn.run = false;
        pthread_join(USB_communication_thread, NULL);
-       uart_close(sp);
-#ifdef __linux__
+
+       if (sp) {
+               uart_close(sp);
+       }
+
+#if defined(__linux__) && !defined(NO_UNLINK)
        // 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) {
                unlink(serial_port_name);
        }
 #endif
+
+       // Clean up our state
+       sp = NULL;
+       serial_port_name = NULL;
 }