# HG changeset patch
# User jld
# Date 1087997277 0
# Node ID 446d9e7e1db7218b71c83ed055cf7ef5ca5c599e
# Parent  6e03b0d7130982fe2c68ec23cab129e381938272
* interp.cxx (locate_subdirs): Avoid use of a trailing period in the file
path. This causes problems for Cygwin 1.5.10. [ Bugzilla 1000095 ]

diff --git a/host/libcdl/ChangeLog b/host/libcdl/ChangeLog
--- a/host/libcdl/ChangeLog
+++ b/host/libcdl/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-23  John Dallaway  <jld@ecoscentric.com>
+
+	* interp.cxx (locate_subdirs): Avoid use of a trailing period in
+	the file path. This causes problems for Cygwin 1.5.10.
+	[ Bugzilla 1000095 ]
+
 2003-08-19  Bart Veer  <bartv@ecoscentric.com>
 
 	* config.cxx (savefile_package_command):
@@ -962,6 +968,7 @@ 1999-01-21  Bart Veer  <bartv@cygnus.co.
 //                                                                          
 // ----------------------------------------------------------------------------
 // Copyright (C) 1999, 2000, 2001 Red Hat, Inc.
+// Copyright (C) 2004 eCosCentric Limited
 //
 // This file is part of the eCos host tools.
 //
diff --git a/host/libcdl/interp.cxx b/host/libcdl/interp.cxx
--- a/host/libcdl/interp.cxx
+++ b/host/libcdl/interp.cxx
@@ -10,6 +10,7 @@
 //####COPYRIGHTBEGIN####
 //                                                                          
 // ----------------------------------------------------------------------------
+// Copyright (C) 2004 eCosCentric Limited
 // Copyright (C) 2002 Bart Veer
 // Copyright (C) 1999, 2000, 2001 Red Hat, Inc.
 //
@@ -1173,12 +1174,14 @@ CdlInterpreterBody::locate_subdirs(std::
     CYG_PRECONDITION_THISC();
     
     static char locate_subdirs_script[] = "\
-set pattern [file join \"$::cdl_locate_subdirs_path\" * .]  \n\
+set pattern [file join \"$::cdl_locate_subdirs_path\" *]    \n\
 set result {}                                               \n\
 foreach entry [glob -nocomplain -- $pattern] {              \n\
-    set entry [file tail [file dirname $entry]]             \n\
-    if {($entry != \"CVS\") && ($entry != \"cvs\")} {       \n\
-        lappend result $entry                               \n\
+    if ([file isdirectory $entry]) {                        \n\
+        set entry [file tail $entry]                        \n\
+        if {($entry != \"CVS\") && ($entry != \"cvs\")} {   \n\
+            lappend result $entry                           \n\
+        }                                                   \n\
     }                                                       \n\
 }                                                           \n\
 return $result                                              \n\