Mercurial > hg > octave-nkf

diff scripts/io/textread.m @ 16311:9c4ac8f25a8c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
textscan.m, textread.m: fix wrong code assessing EOL char(s), remove duplicate code
author Philip Nienhuis <prnienhuis@users.sf.net>
date Fri, 15 Mar 2013 09:54:53 +0100
parents 2175c41b12d1
children 0cbe330f39a2
line wrap: on
line diff
--- a/scripts/io/textread.m
+++ b/scripts/io/textread.m
@@ -116,12 +116,12 @@
     ## Determine EOL from file.  Search for EOL candidates in first BUFLENGTH chars
     eol_srch_len = min (length (str), BUFLENGTH);
     ## First try DOS (CRLF)
-    if (! isempty (strfind ("\r\n", str(1 : eol_srch_len))))
+    if (! isempty (strfind (str(1 : eol_srch_len), "\r\n")))
       eol_char = "\r\n";
     ## Perhaps old Macintosh? (CR)
-    elseif (! isempty (strfind ("\r", str(1 : eol_srch_len))))
+    elseif (! isempty (strfind (str(1 : eol_srch_len), "\r")))
       eol_char = "\r";
-    ## Otherwise, use plain UNIX (LF)
+    ## Otherwise, use plain *nix (LF)
     else
       eol_char = "\n";
     endif