From f1d7ac2ba8f598fce0135af4894b2f7cf3c03a9d Mon Sep 17 00:00:00 2001
From: Nikias Bassen
Date: Mon, 3 Sep 2018 13:55:59 +0200
Subject: win32: Fix parsing of usb device path since it changed with newer
 drivers

---
 src/libirecovery.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/libirecovery.c b/src/libirecovery.c
index 4084205..5fc07ba 100644
--- a/src/libirecovery.c
+++ b/src/libirecovery.c
@@ -569,13 +569,14 @@ irecv_error_t mobiledevice_connect(irecv_client_t* client, unsigned long long ec
 			}
 
 			char serial_str[256];
+			char *p = strrchr(result, '\\');
 			serial_str[0] = '\0';
-			if ((sscanf(result, "\\\\?\\usb#vid_%*04x&pid_%*04x#%s#", serial_str) != 1) || (serial_str[0] == '\0')) {
+			if (!p && (sscanf(p, "\\usb#vid_%*04x&pid_%*04x#%s", serial_str) != 1) || (serial_str[0] == '\0')) {
 				mobiledevice_closepipes(_client);
 				continue;
 			}
 
-			char* p = strchr(serial_str, '#');
+			p = strchr(serial_str, '#');
 			if (p) {
 				*p = '\0';
 			}
@@ -645,13 +646,14 @@ irecv_error_t mobiledevice_connect(irecv_client_t* client, unsigned long long ec
 			}
 
 			char serial_str[256];
+			char *p = strrchr(result, '\\');
 			serial_str[0] = '\0';
-			if ((sscanf(result, "\\\\?\\usb#vid_%*04x&pid_%*04x#%s#", serial_str) != 1) || (serial_str[0] == '\0')) {
+			if (!p || (sscanf(p, "\\usb#vid_%*04x&pid_%*04x#%s", serial_str) != 1) || (serial_str[0] == '\0')) {
 				mobiledevice_closepipes(_client);
 				continue;
 			}
 
-			char* p = strchr(serial_str, '#');
+			p = strchr(serial_str, '#');
 			if (p) {
 				*p = '\0';
 			}
-- 
cgit v1.1-32-gdbae