Mercurial > flash_v2
changeset 1678:446d9e7e1db7
* interp.cxx (locate_subdirs): Avoid use of a trailing period in the file
path. This causes problems for Cygwin 1.5.10. [ Bugzilla 1000095 ]
| author | jld |
|---|---|
| date | Wed, 23 Jun 2004 13:27:57 +0000 |
| parents | 6e03b0d71309 |
| children | b548ac5af76c |
| files | host/libcdl/ChangeLog host/libcdl/interp.cxx |
| diffstat | 2 files changed, 14 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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. //
--- 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\