# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1251018557 -7200
# Node ID 9b9aaacf194d3d9f53dddcc8f3472ee685a1a3cb
# Parent  aff7a8e7d8b9139188494ae9a0c152b1df98c02a
dlmread: perform tilde expansion to filename argument

diff -r aff7a8e7d8b9 -r 9b9aaacf194d src/ChangeLog
--- a/src/ChangeLog	Thu Aug 13 07:56:00 2009 +0200
+++ b/src/ChangeLog	Sun Aug 23 11:09:17 2009 +0200
@@ -1,3 +1,8 @@
+2009-08-10  John W. Eaton  <jwe@octave.org>
+
+	* DLD-FUNCTIONS/dlmread.cc (Fdlmread): Perform tilde expansion on
+	filename argument.
+
 2009-06-11  John W. Eaton  <jwe@octave.org>
 
 	* display.h (display_info::no_window_system): New static function.
diff -r aff7a8e7d8b9 -r 9b9aaacf194d src/DLD-FUNCTIONS/dlmread.cc
--- a/src/DLD-FUNCTIONS/dlmread.cc	Thu Aug 13 07:56:00 2009 +0200
+++ b/src/DLD-FUNCTIONS/dlmread.cc	Sun Aug 23 11:09:17 2009 +0200
@@ -30,6 +30,7 @@
 #include <cctype>
 #include <fstream>
 
+#include "file-ops.h"
 #include "lo-ieee.h"
 
 #include "defun-dld.h"
@@ -187,7 +188,9 @@
   if (error_state)
     return retval;
 
-  std::ifstream file (fname.c_str ());
+  std::string tname = file_ops::tilde_expand (fname);
+
+  std::ifstream file (tname.c_str ());
   if (!file)
     {
       error ("dlmread: unable to open file `%s'", fname.c_str ());