From ee631d3b4e69e05997231f89e1300778bbd9f813 Mon Sep 17 00:00:00 2001
From: chrfranke <chrfranke@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Wed, 27 Jan 2010 19:58:38 +0000
Subject: [PATCH] Merge r3049 into 5.39.1.
git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/branches/RELEASE_5_39_BRANCH@3050 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 80973a818..b9e641bca 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] Linux: Allow smartd 'DEVICESCAN -d sat' (ticket #13).
Detects (S)ATA devices behind a standard SAT layer
(Vendor ID: "ATA "), but not USB bridges with SAT support.
diff --git a/smartmontools/os_win32.cpp b/smartmontools/os_win32.cpp
index 26c60308a..1ed2d62e8 100644
--- a/smartmontools/os_win32.cpp
+++ b/smartmontools/os_win32.cpp
@@ -1605,6 +1605,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