summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAndreas Scherer <andreas_tex@freenet.de>2020-04-30 15:47:57 +0000
committerAndreas Scherer <andreas_tex@freenet.de>2020-04-30 15:47:57 +0000
commit8076675ac84f26f196666418749f968526563ae2 (patch)
tree401825402e22e0c760fdf5cdb33f6e455aab668e /Build
parent4b8537a30e35def9effd108cbf2f25b0df124cfb (diff)
[CTIE] Editorial modifications.
git-svn-id: svn://tug.org/texlive/trunk@54947 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/ctiedir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/ctiedir/ctie-k.ch27
2 files changed, 22 insertions, 9 deletions
diff --git a/Build/source/texk/web2c/ctiedir/ChangeLog b/Build/source/texk/web2c/ctiedir/ChangeLog
index 90d6054b00f..7d9136b167e 100644
--- a/Build/source/texk/web2c/ctiedir/ChangeLog
+++ b/Build/source/texk/web2c/ctiedir/ChangeLog
@@ -1,3 +1,7 @@
+2020-04-30 Andreas Scherer <https://ascherer.github.io>
+
+ * ctie-k.ch: More editorial modifications for ctie.w.
+
2020-04-27 Andreas Scherer <https://ascherer.github.io>
* ctie-k.ch: Editorial modifications for ctie.w.
diff --git a/Build/source/texk/web2c/ctiedir/ctie-k.ch b/Build/source/texk/web2c/ctiedir/ctie-k.ch
index 50a95d178d1..4a38a0319e7 100644
--- a/Build/source/texk/web2c/ctiedir/ctie-k.ch
+++ b/Build/source/texk/web2c/ctiedir/ctie-k.ch
@@ -65,8 +65,8 @@ the original \.{WEB} system) with the standard \.{CWEB} behaviour, and
so uses the |char| type for input and output.
The \.{kpathsea} library (version 3.4.5 and higher) defines the |true|,
-|false|, |boolean| and |string| types in \.{kpathsea/types.h}, so we do not
-actually need to define them here.
+|false|, |boolean| and |string| types in \.{<kpathsea/simpletypes.h>},
+so we do not actually need to define them here.
@s boolean int
@s string int
@@ -87,7 +87,8 @@ extern char* strncpy(); /* copy up to $n$ string characters */
extern char *strerror();
@y
@ We don't need to predeclare any string handling functions here, as
-the \.{kpathsea} headers do the right thing.
+the \.{kpathsea} headers do the right thing by including \.{<string.h>}
+behind the scenes.
@z
@x l.149
@@ -108,7 +109,7 @@ predefined as we include the \.{stdio.h} definitions.
@<Global \&{\#include}s@>=
#include <stdio.h>
@y
-predefined as we include the \.{stdio.h} definitions
+predefined as we include the \.{<stdio.h>} definitions
through the \.{kpathsea} interface.
@<Global \&{\#include}s@>=
@@ -329,6 +330,16 @@ char *s, *t;
void pfatal_error (const char *s, const char *t)
@z
+@x l.713
+@ We need an include file for the above.
+
+@<Global \&{\#include}s@>=
+#include <errno.h>
+@y
+@ The \.{<errno.h>} include file for the above comes via the \.{kpathsea}
+interface.
+@z
+
@x l.731 Use binary mode for output files
out_file=fopen(out_name, "w");
@y
@@ -482,9 +493,7 @@ usage_error (void)
@x l.1119 Add Web2C version to banner string
printf("%s\n", banner); /* print a ``banner line'' */
@y
-{
- printf("%s (%s)\n", banner, kpathsea_version_string); /* print a ``banner line'' */
-}
+printf("%s (%s)\n", banner, kpathsea_version_string); /* print a ``banner line'' */
@z
Section 63: use 'none' more than once.
@@ -556,8 +565,8 @@ print_version_and_exit (const_string name, const_string version)
puts ("both the CTIE copyright and the GNU General Public Licence.");
puts ("For more information about these matters, see the files");
puts ("named COPYING and the CTIE source.");
- puts ("Primary authors of CTIE: Julian Gilbey.");
- puts ("Kpathsea written by Karl Berry and others.\n");
+ puts ("Primary author of CTIE: Julian Gilbey.");
+ puts ("Kpathsea written by Karl Berry and others.");
exit (0);
}