Changeset 321 for trunk/Include/Classes/System/IO

Timestamp:

Sep 2, 2007, 9:27:58 AM (17 years ago)

Author:

OverTaker

Message:

FindClose()し忘れていたの修整

File:

• trunk/Include/Classes/System/IO/DirectoryInfo.ab (modified) (3 diffs)

trunk/Include/Classes/System/IO/DirectoryInfo.ab

@@ -95 +95 @@
         If searchOption = SearchOption.TopDirectoryOnly Then
             Return GetDirectories(searchPattern)
-        Else
+        ElseIf searchOption = SearchOption.AllDirectories Then
             Dim dirs As List<DirectoryInfo>
             dirs = GetDirectories(searchPattern)
-            Dim i As Long
 
+            Dim subdirs As List<DirectoryInfo>
+            Dim i As Long, j As Long
+            For i = 0 To ELM(dirs.Count)
+                subdirs = dirs[i].GetDirectories(searchPattern)
+                For j = 0 To ELM(subdirs.Count)
+                    dirs.Add(subdirs[i])
+                Next
+            Next
+            Return dirs
         End If
     End Function*/
@@ -153 +161 @@
                 lastError = GetLastError()
                 If lastError <> ERROR_NO_MORE_FILES Then
+                    FindClose(find)
                     debug 'Exception
                     Return Nothing
@@ -159 +168 @@
             i++
         Wend
+        FindClose(find)
         Return files
     End Function