From 52a1eeedba4fa981ef9695e1d9e0fed981b8903e Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 2 May 2006 11:32:54 +0000 Subject: [PATCH] (is_dir): canonicalize file name before stat'ing. --- ChangeLog | 2 ++ flower/file-path.cc | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7db4d13f91..3aec3a8be6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2006-05-02 Han-Wen Nienhuys + * flower/file-path.cc (is_dir): canonicalize file name before stat'ing. + * lily/relocate.cc (framework_relocation): remove old relocation stuff. 2006-05-01 Mats Bengtsson diff --git a/flower/file-path.cc b/flower/file-path.cc index 3fc8500072..63ecdb833a 100644 --- a/flower/file-path.cc +++ b/flower/file-path.cc @@ -66,6 +66,11 @@ is_file (string file_name) bool is_dir (string file_name) { + /* + canonicalize; in particular, trailing slashes should disappear. + */ + file_name = File_name (file_name).to_string (); + #if !STAT_MACROS_BROKEN struct stat sbuf; if (stat (file_name.c_str (), &sbuf) != 0) -- 2.39.5