X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/ad939de5017f3451376d6f559858a30bae675964..8ff31e935d19bc53dd8f27877b7450cafba4a942:/client/comms.c

diff --git a/client/comms.c b/client/comms.c
index eeaff79c..2030f8f3 100644
--- 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;
 }