Changeset 62 for Include/Classes/System/IO

Timestamp:

Jan 16, 2007, 6:56:18 PM (18 years ago)

Author:

OverTaker

Message:

GetFullPathのバグを修正

File:

• Include/Classes/System/IO/Path.ab (modified) (2 diffs)

Include/Classes/System/IO/Path.ab

@@ -69 +69 @@
     Static Function GetFullPath(path As String) As String
         Dim cd As String
+        Dim dirSepChar As String(Chr$(DirectorySeparatorChar))
+        If IsPathRooted(path) Then Return path
+
         cd.ReSize = GetCurrentDirectory(0, 0) - 1
         GetCurrentDirectory(cd.Length + 1, cd)
-
-        Dim dirSepChar As String(Chr$(DirectorySeparatorChar))
         Return cd + dirSepChar + path
     End Function
@@ -128 +129 @@
 
     Static Function getLastSeparatorPosision(ByRef path As String) As Long
+        Dim lastSepPos As Long
         Dim dirSepChar As String(Chr$(DirectorySeparatorChar))
-        Dim lastSepPos As Long
+        Dim altDirSepChar As String(Chr$(AltDirectorySeparatorChar))
+        Dim volSepChar As String(Chr$(VolumeSeparatorChar))
         lastSepPos = path.LastIndexOf(dirSepChar)
+        If lastSepPos <> -1 Then Return lastSepPos
 
-        If lastSepPos = -1 Then
-            Dim volSepChar As String(Chr$(VolumeSeparatorChar))
-            lastSepPos = path.LastIndexOf(volSepChar)
-        End If
+        lastSepPos = path.LastIndexOf(dirSepChar)
+        If lastSepPos <> -1 Then Return lastSepPos
+
+        lastSepPos = path.LastIndexOf(volSepChar)
         Return lastSepPos
     End Function