Change call `tparam' so that it does not depend on a feature only

available in GNU `tparam'.  This is important on GNU/Linux because it
allows us to statically link "ncurses".

This has the added benefit that it allows the "ncurses" stuff to work
correctly.  Previously, when using "ncurses", the screen was scrambled
so badly that it couldn't be used.  This appears to be a consequence
of the combination of GNU `tparam' with "ncurses".

diff --git a/v7/src/microcode/tterm.c b/v7/src/microcode/tterm.c
index 29f4986b91277527333ac51d3e4caa5889a94bff..c7901a054d461b8dd038ada1f692d05330ae753b 100644 (file)
--- a/v7/src/microcode/tterm.c
+++ b/v7/src/microcode/tterm.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: tterm.c,v 1.4 1993/10/14 21:50:25 gjr Exp $
+$Id: tterm.c,v 1.5 1998/01/20 00:58:43 cph Exp $
 
-Copyright (c) 1990-1993 Massachusetts Institute of Technology
+Copyright (c) 1990-98 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -106,15 +106,14 @@ DEFINE_PRIMITIVE ("TERMCAP-PARAM-STRING", Prim_termcap_param_string, 5, 5, 0)
 {
   PRIMITIVE_HEADER (5);
   {
-    char * s =
-      (tparam ((STRING_ARG (1)), 0, 0,
-              (arg_nonnegative_integer (2)),
-              (arg_nonnegative_integer (3)),
-              (arg_nonnegative_integer (4)),
-              (arg_nonnegative_integer (5))));
-    SCHEME_OBJECT result = (char_pointer_to_string ((unsigned char *) s));
-    free (s);
-    PRIMITIVE_RETURN (result);
+    char s [4096];
+    (void) tparam
+      ((STRING_ARG (1)), s, (sizeof (s)),
+       (arg_nonnegative_integer (2)),
+       (arg_nonnegative_integer (3)),
+       (arg_nonnegative_integer (4)),
+       (arg_nonnegative_integer (5)));
+    PRIMITIVE_RETURN (char_pointer_to_string ((unsigned char *) s));
   }
 }