# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1602166059 -7200
# Node ID f45b113966621e08c7f982c39e3c81c13a68b86c
# Parent  914b2a694824fd297aafb357f8b2727dca1e6d5e# Parent  ed029f40be1596a8fcec93fd814bd32241e7a613
maint: merge stable to default.

diff -r 914b2a694824 -r f45b11396662 liboctave/system/file-stat.cc
--- a/liboctave/system/file-stat.cc	Thu Oct 08 11:50:05 2020 +0200
+++ b/liboctave/system/file-stat.cc	Thu Oct 08 16:07:39 2020 +0200
@@ -194,7 +194,12 @@
           std::string full_file_name = sys::file_ops::tilde_expand (file_name);
 
 #if defined (OCTAVE_USE_WINDOWS_API)
-          full_file_name = sys::canonicalize_file_name (full_file_name);
+          std::string canon_file_name
+            = sys::canonicalize_file_name (full_file_name);
+
+          // Might have failed for files with non-ASCII characters in name
+          if (! canon_file_name.empty ())
+            full_file_name = canon_file_name;
 
           // Remove trailing slashes
           while (full_file_name.length () > 1