From 345d4758dfce735dd7f6a299a4db02d2d99ae6f8 Mon Sep 17 00:00:00 2001
From: chrfranke <chrfranke@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Wed, 27 Jan 2010 19:47:09 +0000
Subject: [PATCH] Windows: Fix parsing of 'tw_cli' output for 3ware 9.5.x
 release (ticket #43).

git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@3049 4ea69e1a-61f1-4043-bf83-b5c94c648137
---
 smartmontools/CHANGELOG    | 3 +++
 smartmontools/os_win32.cpp | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/smartmontools/CHANGELOG b/smartmontools/CHANGELOG
index c9f50242f..de4561070 100644
--- a/smartmontools/CHANGELOG
+++ b/smartmontools/CHANGELOG
@@ -43,6 +43,9 @@ NOTES FOR FUTURE RELEASES: see TODO file.
 
 <DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE>
 
+  [CF] Windows: Fix parsing of 'tw_cli' output for 3ware 9.5.x release
+       (ticket #43.)
+
   [CF] Add USB IDs of Seagate FreeAgent Go, Seagate Expansion Portable
        and WD My Passport (IDE).
 
diff --git a/smartmontools/os_win32.cpp b/smartmontools/os_win32.cpp
index 02ef0ed67..c78011273 100644
--- a/smartmontools/os_win32.cpp
+++ b/smartmontools/os_win32.cpp
@@ -1641,6 +1641,8 @@ bool win_tw_cli_device::open()
 
   // Parse smart data hex dump
   const char * s = findstr(buffer, "Drive Smart Data:");
+  if (!*s)
+    s = findstr(buffer, "Drive SMART Data:"); // tw_cli from 9.5.x
   if (!*s) {
     s = findstr(buffer, "S.M.A.R.T. (Controller"); // from 3DM browser window
     if (*s) {
-- 
GitLab