diff libinterp/corefcn/urlwrite.cc @ 25548:d6050ba12c0c

Call get_ASCII_filename for std::ifstream (bug #49118). * debug.cc, dlmread.cc, help.cc, load-save.cc, urlwrite.cc, ov-java.cc, fileinfo.cc, url-transfer.cc: Call get_ASCII_filename for filename argument of std::ifstream to circumvent the wide char WinAPI.
author Markus Mützel <markus.muetzel@gmx.de>
date Tue, 03 Jul 2018 21:06:00 +0200
parents cb1606f78f6b
children ca413f326224
line wrap: on
line diff
--- a/libinterp/corefcn/urlwrite.cc	Tue Jul 03 08:49:28 2018 -0700
+++ b/libinterp/corefcn/urlwrite.cc	Tue Jul 03 21:06:00 2018 +0200
@@ -35,6 +35,7 @@
 #include "dir-ops.h"
 #include "file-ops.h"
 #include "file-stat.h"
+#include "lo-sysdep.h"
 #include "oct-env.h"
 #include "oct-handle.h"
 #include "glob-match.h"
@@ -637,7 +638,8 @@
       else
         {
           // FIXME: Does ascii mode need to be flagged here?
-          std::ifstream ifile (file.c_str (), std::ios::in | std::ios::binary);
+          std::ifstream ifile (octave::sys::get_ASCII_filename (file).c_str (),
+                               std::ios::in | std::ios::binary);
 
           if (! ifile.is_open ())
             error ("__ftp_mput__: unable to open file");