summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/ctiedir
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-02-12 08:50:58 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-02-12 08:50:58 +0000
commit50f43a1ab6f142722d1a8f0ec5cecd1c1eeb5d93 (patch)
tree40842fa2c7b02f7d6f18a9d35a90a94cb9f4d72f /Build/source/texk/web2c/ctiedir
parent3b2979a19f230a6c8c99afcadea7163dcec712a0 (diff)
web2c: ctangle, ctie, and tie: Handle input files with CRLF
git-svn-id: svn://tug.org/texlive/trunk@32948 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/ctiedir')
-rw-r--r--Build/source/texk/web2c/ctiedir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/ctiedir/ctie-k.ch14
2 files changed, 18 insertions, 0 deletions
diff --git a/Build/source/texk/web2c/ctiedir/ChangeLog b/Build/source/texk/web2c/ctiedir/ChangeLog
index 4c5001aafe5..9e16d1d1e91 100644
--- a/Build/source/texk/web2c/ctiedir/ChangeLog
+++ b/Build/source/texk/web2c/ctiedir/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * ctie-k.ch: Handle input lines with CRLF.
+
2013-06-28 Peter Breitenlohner <peb@mppmu.mpg.de>
* ctie-k.ch: Include <stdio.h> after <kpathsea/kpathsea.h>.
diff --git a/Build/source/texk/web2c/ctiedir/ctie-k.ch b/Build/source/texk/web2c/ctiedir/ctie-k.ch
index b527aa373ea..ebb0fa0d910 100644
--- a/Build/source/texk/web2c/ctiedir/ctie-k.ch
+++ b/Build/source/texk/web2c/ctiedir/ctie-k.ch
@@ -151,6 +151,20 @@ static boolean
get_line (file_index i, boolean do_includes)
@z
+Handle input lines with CRLF
+
+@x l.376
+ if ((*(k++) = c) != ' ') inp_desc->limit = k;
+@y
+ if ((*(k++) = c) != ' ' && c != '\r') inp_desc->limit = k;
+@z
+
+@x l.436
+ if ((*(k++) = c) != ' ') inp_desc->limit = k;
+@y
+ if ((*(k++) = c) != ' ' && c != '\r') inp_desc->limit = k;
+@z
+
The next piece is simplified using the kpathsea kpse_find_file
function.