6353321 libtecla consumers (such as zonecfg) exit on unknown TERM type

6574007 pca_path_completions() should be exposed as a public interface

2 files changed, 32 insertions, 28 deletions

diff --git a/usr/src/lib/libtecla/common/getline.c b/usr/src/lib/libtecla/common/getline.c
index 00f8b56a3d..9d91e97089 100644
--- a/usr/src/lib/libtecla/common/getline.c
+++ b/usr/src/lib/libtecla/common/getline.c
@@ -3539,31 +3539,34 @@ static int gl_control_strings(GetLine *gl, const char *term)
  * database.
  */
 #ifdef USE_TERMINFO
-  if(!term || setupterm((char *)term, gl->input_fd, NULL) == ERR) {
-    bad_term = 1;
-  } else {
-    _clr_StringGroup(gl->capmem);
-    gl->left = gl_tigetstr(gl, "cub1");
-    gl->right = gl_tigetstr(gl, "cuf1");
-    gl->up = gl_tigetstr(gl, "cuu1");
-    gl->down = gl_tigetstr(gl, "cud1");
-    gl->home = gl_tigetstr(gl, "home");
-    gl->clear_eol = gl_tigetstr(gl, "el");
-    gl->clear_eod = gl_tigetstr(gl, "ed");
-    gl->u_arrow = gl_tigetstr(gl, "kcuu1");
-    gl->d_arrow = gl_tigetstr(gl, "kcud1");
-    gl->l_arrow = gl_tigetstr(gl, "kcub1");
-    gl->r_arrow = gl_tigetstr(gl, "kcuf1");
-    gl->left_n = gl_tigetstr(gl, "cub");
-    gl->right_n = gl_tigetstr(gl, "cuf");
-    gl->sound_bell = gl_tigetstr(gl, "bel");
-    gl->bold = gl_tigetstr(gl, "bold");
-    gl->underline = gl_tigetstr(gl, "smul");
-    gl->standout = gl_tigetstr(gl, "smso");
-    gl->dim = gl_tigetstr(gl, "dim");
-    gl->reverse = gl_tigetstr(gl, "rev");
-    gl->blink = gl_tigetstr(gl, "blink");
-    gl->text_attr_off = gl_tigetstr(gl, "sgr0");
+  {
+    int errret;
+    if(!term || setupterm((char *)term, gl->input_fd, &errret) == ERR) {
+      bad_term = 1;
+    } else {
+      _clr_StringGroup(gl->capmem);
+      gl->left = gl_tigetstr(gl, "cub1");
+      gl->right = gl_tigetstr(gl, "cuf1");
+      gl->up = gl_tigetstr(gl, "cuu1");
+      gl->down = gl_tigetstr(gl, "cud1");
+      gl->home = gl_tigetstr(gl, "home");
+      gl->clear_eol = gl_tigetstr(gl, "el");
+      gl->clear_eod = gl_tigetstr(gl, "ed");
+      gl->u_arrow = gl_tigetstr(gl, "kcuu1");
+      gl->d_arrow = gl_tigetstr(gl, "kcud1");
+      gl->l_arrow = gl_tigetstr(gl, "kcub1");
+      gl->r_arrow = gl_tigetstr(gl, "kcuf1");
+      gl->left_n = gl_tigetstr(gl, "cub");
+      gl->right_n = gl_tigetstr(gl, "cuf");
+      gl->sound_bell = gl_tigetstr(gl, "bel");
+      gl->bold = gl_tigetstr(gl, "bold");
+      gl->underline = gl_tigetstr(gl, "smul");
+      gl->standout = gl_tigetstr(gl, "smso");
+      gl->dim = gl_tigetstr(gl, "dim");
+      gl->reverse = gl_tigetstr(gl, "rev");
+      gl->blink = gl_tigetstr(gl, "blink");
+      gl->text_attr_off = gl_tigetstr(gl, "sgr0");
+    };
   };
 #elif defined(USE_TERMCAP)
   if(!term || tgetent(gl->tgetent_buf, (char *)term) < 0) {
diff --git a/usr/src/lib/libtecla/common/mapfile-vers b/usr/src/lib/libtecla/common/mapfile-vers
index dd298250c8..3ff609e639 100644
--- a/usr/src/lib/libtecla/common/mapfile-vers
+++ b/usr/src/lib/libtecla/common/mapfile-vers
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -49,6 +49,7 @@ tecla_l.5 {
 	gl_abandon_line;
 	gl_bind_keyseq;
 	gl_catch_blocked;
+	gl_completion_action;
 	gl_display_text;
 	gl_erase_terminal;
 	gl_error_message;
@@ -61,6 +62,7 @@ tecla_l.5 {
 	gl_raw_io;
 	gl_register_action;
 	gl_return_status;
+	gl_set_term_size;
 	gl_tty_signals;
 } tecla_1.4;
 
@@ -80,7 +82,6 @@ tecla_1.4 {
 	gl_replace_prompt;
 	gl_resize_history;
 	gl_save_history;
-	gl_set_term_size;
 	gl_show_history;
 	gl_size_of_history;
 	gl_state_of_history;
@@ -118,7 +119,6 @@ tecla_1.2 {
 	ef_expand_file;
 	ef_last_error;
 	gl_change_terminal;
-	gl_completion_action;
 	gl_customize_completion;
 	gl_get_line;
 	new_CplFileConf;
@@ -129,6 +129,7 @@ tecla_1.2 {
 	new_WordCompletion;
 	pca_last_error;
 	pca_lookup_file;
+	pca_path_completions;
 	pca_scan_path;
 	pca_set_check_fn;
 	ppc_file_start;