From 96b0c2eb571498749c9e8b926c02559f6956e273 Mon Sep 17 00:00:00 2001
From: Nikias Bassen
Date: Tue, 11 Sep 2018 00:15:41 +0200
Subject: win32: REALLY Fix parsing of usb device path so it works again with
 older drivers

---
 src/libirecovery.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/libirecovery.c b/src/libirecovery.c
index 5fc07ba..df9fde6 100644
--- a/src/libirecovery.c
+++ b/src/libirecovery.c
@@ -569,9 +569,14 @@ irecv_error_t mobiledevice_connect(irecv_client_t* client, unsigned long long ec
 			}
 
 			char serial_str[256];
-			char *p = strrchr(result, '\\');
+			char *p = result + strlen(result) - 1;
+			while (p-- && p > result) {
+				if (*p == '\\' && (strncmp(p, "\\usb", 4) == 0)) {
+					break;
+				}
+			}
 			serial_str[0] = '\0';
-			if (!p && (sscanf(p, "\\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;
 			}
@@ -646,7 +651,12 @@ irecv_error_t mobiledevice_connect(irecv_client_t* client, unsigned long long ec
 			}
 
 			char serial_str[256];
-			char *p = strrchr(result, '\\');
+			char *p = result + strlen(result) - 1;
+			while (p-- && p > result) {
+				if (*p == '\\' && (strncmp(p, "\\usb", 4) == 0)) {
+					break;
+				}
+			}
 			serial_str[0] = '\0';
 			if (!p || (sscanf(p, "\\usb#vid_%*04x&pid_%*04x#%s", serial_str) != 1) || (serial_str[0] == '\0')) {
 				mobiledevice_closepipes(_client);
-- 
cgit v1.1-32-gdbae