This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
Fix for bugzilla 1000095
- From: John Dallaway <jld at ecoscentric dot com>
- To: ecos-patches at ecos dot sourceware dot org
- Date: Wed, 23 Jun 2004 14:31:37 +0100
- Subject: Fix for bugzilla 1000095
- Organization: eCosCentric Limited
This patch is a fix for bugzilla 1000095. Checked in.
John Dallaway
eCosCentric Limited
--cut here--
Index: ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/host/libcdl/ChangeLog,v
retrieving revision 1.29
diff -u -5 -r1.29 ChangeLog
--- ChangeLog 19 Aug 2003 22:34:40 -0000 1.29
+++ ChangeLog 23 Jun 2004 13:21:42 -0000
@@ -1,5 +1,11 @@
+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):
If no version is specified, silently default to the most recent.
That can avoid problems with templates specifying particular versions
@@ -960,10 +966,11 @@
//===========================================================================
//####COPYRIGHTBEGIN####
//
// ----------------------------------------------------------------------------
// Copyright (C) 1999, 2000, 2001 Red Hat, Inc.
+// Copyright (C) 2004 eCosCentric Limited
//
// This file is part of the eCos host tools.
//
// This program is free software; you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by the Free
Index: interp.cxx
===================================================================
RCS file: /cvs/ecos/ecos/host/libcdl/interp.cxx,v
retrieving revision 1.7
diff -u -5 -r1.7 interp.cxx
--- interp.cxx 21 Sep 2002 22:05:09 -0000 1.7
+++ interp.cxx 23 Jun 2004 13:21:43 -0000
@@ -8,10 +8,11 @@
//
//============================================================================
//####COPYRIGHTBEGIN####
//
// ----------------------------------------------------------------------------
+// Copyright (C) 2004 eCosCentric Limited
// Copyright (C) 2002 Bart Veer
// Copyright (C) 1999, 2000, 2001 Red Hat, Inc.
//
// This file is part of the eCos host tools.
//
@@ -1171,16 +1172,18 @@
CYG_REPORT_FUNCNAME("CdlInterpreter::locate_subdirs");
CYG_REPORT_FUNCARG2XV(this, &result);
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\
";