From 6283d78b037c8198a1f61a675960bf40fe88be40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= <peri4ko@yandex.ru>
Date: Wed, 6 May 2015 08:28:50 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@127
 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

---
 src/io/piconnection.cpp | 2 --
 src/io/piiodevice.cpp   | 7 ++++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/io/piconnection.cpp b/src/io/piconnection.cpp
index 655b55d7..93021d5e 100755
--- a/src/io/piconnection.cpp
+++ b/src/io/piconnection.cpp
@@ -1035,7 +1035,6 @@ void PIConnection::DevicePool::deviceReaded(PIConnection::DevicePool::DeviceData
 
 void PIConnection::splitFullPathWithMode(PIString fpwm, PIString * full_path, PIIODevice::DeviceMode * mode) {
 	PIIODevice::DeviceMode dm = PIIODevice::ReadWrite;
-	piCout << "SPLIT" << fpwm;
 	if (fpwm.find("(") > 0 && fpwm.find(")") > 0) {
 		PIString dms(fpwm.right(fpwm.length() - fpwm.find("(")).takeRange("(", ")").trim().toLowerCase().removeAll(" "));
 		//piCout << dms;
@@ -1045,7 +1044,6 @@ void PIConnection::splitFullPathWithMode(PIString fpwm, PIString * full_path, PI
 			dm = PIIODevice::WriteOnly;
 		fpwm.cutRight(fpwm.length() - fpwm.find("(")).trim();
 	}
-	piCout << "SPLIT" << fpwm;
 	if (full_path) *full_path = fpwm;
 	if (mode) *mode = dm;
 }
diff --git a/src/io/piiodevice.cpp b/src/io/piiodevice.cpp
index 0041d45d..a04b661b 100755
--- a/src/io/piiodevice.cpp
+++ b/src/io/piiodevice.cpp
@@ -19,6 +19,7 @@
 
 #include "piiodevice.h"
 #include "piconfig.h"
+#include "piconnection.h"
 
 
 /*! \class PIIODevice
@@ -306,10 +307,14 @@ PIString PIIODevice::normalizeFullPath(const PIString & full_path) {
 	if (!ret.isEmpty())
 		return ret;
 	//piCout << "normalizeFullPath" << full_path;
-	PIIODevice * d = createFromFullPath(full_path);
+	PIString fp; PIIODevice::DeviceMode md;
+	PIConnection::splitFullPathWithMode(full_path, &fp, &md);
+	PIIODevice * d = createFromFullPath(fp);
 	//piCout << "normalizeFullPath" << d;
 	if (d == 0) return PIString();
 	ret = d->constructFullPath();
+	if (md == PIIODevice::ReadOnly) ret += " (ro)";
+	if (md == PIIODevice::WriteOnly) ret += " (wo)";
 	delete d;
 	nfp_cache[full_path] = ret;
 	return ret;