summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-03-23 23:39:58 +0000
committerKarl Berry <karl@freefriends.org>2008-03-23 23:39:58 +0000
commit346f174c635d39f3b92ea9dcfc72412420fb0b2d (patch)
tree0bfd7d92c1b4830e920a13b071be2229f4911e56
parentfa218d57052492e2c5d06aa29a6d8926cefc5041 (diff)
use new routine printcstring rather than fputs, so the new help message ends up in the log
git-svn-id: svn://tug.org/texlive/trunk@7111 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/ChangeLog7
-rw-r--r--Build/source/texk/web2c/cpascal.h8
-rw-r--r--Build/source/texk/web2c/tex.ch2
-rw-r--r--Build/source/texk/web2c/web2c/ChangeLog5
-rw-r--r--Build/source/texk/web2c/web2c/common.defines1
5 files changed, 21 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index e586059fd76..169c224bb47 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-24 Karl Berry <karl@tug.org>
+
+ * tex.ch: use print_c_string to print the new prompt_file_name
+ help message, so it ends up in the log.
+ * cpascal.h (printcstring): #define it.
+
2008-03-23 Karl Berry <karl@tug.org>
* tex.web,
@@ -5,7 +11,6 @@
* tex.ch (prompt_file_name): output prompt_file_name_help_msg
instead of a string pool string.
- * web2c/common.defines (promptfilenamehelpmsg): new var.
* cpascal.h: define it (conditionally for Windows).
2008-03-22 Karl Berry <karl@tug.org>
diff --git a/Build/source/texk/web2c/cpascal.h b/Build/source/texk/web2c/cpascal.h
index 1a830596730..4ee02aac7fc 100644
--- a/Build/source/texk/web2c/cpascal.h
+++ b/Build/source/texk/web2c/cpascal.h
@@ -198,6 +198,14 @@ typedef unsigned char *pointertobyte;
#define promptfilenamehelpmsg "(Press Enter to retry, or Control-D to exit"
#endif
+/* We use this rather than a simple fputs so that the string will end up
+ in the .log file, too. */
+#define printcstring(STR) \
+ do { \
+ char *ch_ptr = (STR); \
+ while (*ch_ptr) \
+ printchar(*(ch_ptr++)); \
+ } while (0)
/* Tangle removes underscores from names. Put them back for things that
diff --git a/Build/source/texk/web2c/tex.ch b/Build/source/texk/web2c/tex.ch
index e68ab00c60c..be8ff7b6e0c 100644
--- a/Build/source/texk/web2c/tex.ch
+++ b/Build/source/texk/web2c/tex.ch
@@ -2283,7 +2283,7 @@ var k:0..buf_size; {index into |buffer|}
if e=".tex" then show_context;
@y
if (e=".tex") or (e="") then show_context;
-print_ln; fputs(prompt_file_name_help_msg, stdout);
+print_ln; print_c_string(prompt_file_name_help_msg);
if (e<>"") then
begin
print("; default file extension is `"); print(e); print("'");
diff --git a/Build/source/texk/web2c/web2c/ChangeLog b/Build/source/texk/web2c/web2c/ChangeLog
index 3a80eafcf71..d6ce382b243 100644
--- a/Build/source/texk/web2c/web2c/ChangeLog
+++ b/Build/source/texk/web2c/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-24 Karl Berry <karl@tug.org>
+
+ * common.defines (printcstring): new procedure.
+ (promptfilenamehelpmsg): new var.
+
2008-03-09 Karl Berry <karl@tug.org>
* coerce.h [MP]: #include <mpdir/mplib.h> to get declarations,
diff --git a/Build/source/texk/web2c/web2c/common.defines b/Build/source/texk/web2c/web2c/common.defines
index a6169996609..8184325e48b 100644
--- a/Build/source/texk/web2c/web2c/common.defines
+++ b/Build/source/texk/web2c/web2c/common.defines
@@ -164,6 +164,7 @@
@define procedure kpseresetprogramname ();
@define procedure kpsesetprogramenabled ();
@define procedure libcfree ();
+@define procedure printcstring ();
@define procedure printreal ();
@define procedure printversionandexit ();
@define procedure putbyte ();