0023852: OSD_Path interprets unc paths incorrectly

checking for unc path on Windows was added
change deprecated macro WNT to _WIN32
Adding test case for this fix

diff --git a/src/OSD/OSD_Path.cxx b/src/OSD/OSD_Path.cxx
index 889173e01e96f7d167b04f3f090c5658ad6339c5..98842cbe26fbcc3e17177d7dce373780dc1dbed6 100755 (executable)
--- a/src/OSD/OSD_Path.cxx
+++ b/src/OSD/OSD_Path.cxx
@@ -1582,10 +1582,14 @@ static void __fastcall _remove_dup ( TCollection_AsciiString& str ) {
 
 static Standard_Integer RemoveExtraSeparator(TCollection_AsciiString& aString) {
 
-  Standard_Integer i, j, len ;
+  Standard_Integer i, j, len,start = 1 ;
 
   len = aString.Length() ;
-  for (i = j = 1 ; j <= len ; i++,j++) {
+#ifdef _WIN32
+  if (len > 1 && aString.Value(1) == '/' && aString.Value(2) == '/')
+    start = 2;
+#endif  
+  for (i = j = start ; j <= len ; i++,j++) {
       Standard_Character c = aString.Value(j) ;
       aString.SetValue(i,c) ;
       if (c == '/')

diff --git a/tests/bugs/fclasses/bug23852 b/tests/bugs/fclasses/bug23852
new file mode 100755 (executable)
index 0000000..e01538d
--- /dev/null
+++ b/tests/bugs/fclasses/bug23852
@@ -0,0 +1,74 @@
+puts "============"
+puts "OCC23852"
+puts "============"
+puts ""
+#######################################################################
+# OSD_Path interprets unc paths incorrectly
+#######################################################################
+
+pload DCAF
+
+set BugNumber OCC23852
+
+set OS_platform $tcl_platform(platform)
+puts "OS = ${OS_platform}"
+
+if { [string compare ${OS_platform} "windows"] == 0 } {
+
+   # Windows, #1
+   set OSD_Path "\\\\Server\\Shared\\Folder\\File.Extension"
+   puts "OSD_Path = ${OSD_Path}"
+
+   set Log [OSDPath ${OSD_Path}]
+   #
+   if { [regexp "Trek +: +\\|\\|Server\\|Shared\\|Folder" ${Log}] != 1 } {
+      puts "${BugNumber}, Trek, #1: Error"
+   }
+   #
+   if { [regexp "Name +: +File" ${Log}] != 1 } {
+      puts "${BugNumber}, Name, #1: Error"
+   }
+   #
+   if { [regexp "Extension +: +.Extension" ${Log}] != 1 } {
+      puts "${BugNumber}, Extension, #1: Error"
+   }
+
+   # Windows, #2
+   set OSD_Path "//Server/Shared/Folder/File.Extension"
+   puts "OSD_Path = ${OSD_Path}"
+
+   set Log [OSDPath ${OSD_Path}]
+   #
+   if { [regexp "Trek +: +||Server|Shared|Folder" ${Log}] != 1 } {
+      puts "${BugNumber}, Trek, #2: Error"
+   }
+   #
+   if { [regexp "Name +: +File" ${Log}] != 1 } {
+      puts "${BugNumber}, Name, #2: Error"
+   }
+   #
+   if { [regexp "Extension +: +.Extension" ${Log}] != 1 } {
+      puts "${BugNumber}, Extension, #2: Error"
+   }
+
+}
+
+if { [string compare ${OS_platform} "unix"] == 0 } {
+   # Linux
+   set OSD_Path "//Server/Shared/Folder/File.Extension"
+   puts "OSD_Path = ${OSD_Path}"
+
+   set Log [OSDPath ${OSD_Path}]
+   #
+   if { [regexp "Trek +: +||Server|Shared|Folder" ${Log}] != 1 } {
+      puts "${BugNumber}, Trek: Error"
+   }
+   #
+   if { [regexp "Name +: +File" ${Log}] != 1 } {
+      puts "${BugNumber}, Name: Error"
+   }
+   #
+   if { [regexp "Extension +: +.Extension" ${Log}] != 1 } {
+      puts "${BugNumber}, Extension: Error"
+   }
+}