Heavily modified to support both terminfo and termcap attributes.

Now links with -lcurses (ncurses), not -locurses.
TODO: set tabs/margins for init/reset pseudo-attributes.

3 files changed, 310 insertions, 162 deletions

diff --git a/usr.bin/tput/Makefile b/usr.bin/tput/Makefile
index 836899278a7..dc5b6e9fe19 100644
--- a/usr.bin/tput/Makefile
+++ b/usr.bin/tput/Makefile
@@ -1,9 +1,8 @@
-#	$OpenBSD: Makefile,v 1.10 1999/03/06 20:27:42 millert Exp $
+#	$OpenBSD: Makefile,v 1.11 1999/06/29 19:39:39 millert Exp $
 
 PROG=	tput
-CFLAGS+= -D_USE_OLD_CURSES_
-DPADD=	${LIBOLDCURSES}
-LDADD=	-locurses
+DPADD=	${LIBCURSES}
+LDADD=	-lcurses
 MLINKS=	tput.1 clear.1
 LINKS= ${BINDIR}/tput ${BINDIR}/clear
 
diff --git a/usr.bin/tput/tput.1 b/usr.bin/tput/tput.1
index b9476a52da0..0a04e4b4627 100644
--- a/usr.bin/tput/tput.1
+++ b/usr.bin/tput/tput.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tput.1,v 1.6 1999/06/05 01:21:44 aaron Exp $
+.\"	$OpenBSD: tput.1,v 1.7 1999/06/29 19:39:40 millert Exp $
 .\"	$NetBSD: tput.1,v 1.4 1994/12/07 08:49:10 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
@@ -34,7 +34,7 @@
 .\"
 .\"     @(#)tput.1	8.2 (Berkeley) 3/19/94
 .\"
-.Dd March 19, 1994
+.Dd June 29, 1999
 .Dt TPUT 1
 .Os
 .Sh NAME
@@ -46,6 +46,9 @@
 .Ar attribute
 .Op Ar attribute-args
 .Ar ...
+.Nm tput
+.Op Fl T Ar term
+.Fl S
 .Sh DESCRIPTION
 .Nm tput
 makes terminal-dependent information available to users or shell
@@ -54,29 +57,41 @@ The options are as follows:
 .Bl -tag -width Ds
 .It Fl T
 The terminal name as specified in the
-.Xr termcap
+.Xr terminfo
 database, for example, ``vt100'' or ``xterm''.
 If not specified,
 .Nm tput
 retrieves the
 .Dq Ev TERM
 variable from the environment.
+.It Fl S
+The
+.Ar attributes
+are read from stdin instead of from the command line.
 .El
 .Pp
 .Nm tput
 outputs a string if the
 .Ar attribute
 is of type string; a number if it is of type integer.
-Otherwise,
+If the
+.Ar attribute
+is of type boolean,
 .Nm tput
-exits 0 if the terminal has the capability and 1 if it does not,
-without further action.
+exits 0 if the terminal has the capability and 1 if it
+does not.  Each
+.Ar attribute
+should be a string defined in either
+.Xr terminfo 5
+or
+.Xr termcap 5 .
 .Pp
 If the
 .Ar attribute
 is of type string, and takes arguments (e.g. cursor movement,
-the termcap
-.Dq cm
+the
+.Xr terminfo
+.Dq cup
 sequence) the arguments are taken from the command line immediately
 following the attribute.
 .Pp
@@ -84,41 +99,51 @@ The following special attributes are available:
 .Bl -tag -width Ar
 .It clear
 Clear the screen (the
-.Xr termcap
-``cl'' sequence).
+.Xr terminfo
+``clear'' sequence).
 .It init
-Initialize the terminal (the
-.Xr termcap
-``is'' sequence).
+Print the
+.Xr terminfo
+initialization strings for the specified terminal.
 .It longname
 Print the descriptive name of the user's terminal type.
 .It reset
-Reset the terminal (the
-.Xr termcap
-``rs'' sequence).
+Reset the terminal (using the
+.Xr terminfo
+reset sequences).
 .Sh DIAGNOSTICS
 The exit value of
 .Nm tput
 is based on the last attribute specified.
-If the attribute is of type string or of type integer,
-.Nm tput
-exits 0 if the attribute is defined for this terminal type and 1
-if it is not.
+If the attribute is of type string or of type integer the exit
+value is as follows:
+.Bl -tag -offset indent -width Ds -compact
+.It 0
+The requested string was written successfully.
+.It 2
+Usage error.
+.It 3
+Unknown terminal type.
+.It 4
+Unknown attribute name.
+.It >4
+An error occurred.
+.El
+.Pp
 If the attribute is of type boolean,
 .Nm tput
-exits 0 if the terminal has this attribute, and 1 if it does not.
-.Nm tput
-exits 2 if any error occurred.
+exits with a value of 0 if the terminal has this attribute, and
+1 if it does not.
 .Sh EXAMPLES
-.Bl -tag -width "tput cm 6 11 DC 6" -compact
-.It Li "tput cl cm 5 10"
+.Bl -tag -width "tput cup 6 11 dch 6" -compact
+.It Li "tput clear cup 5 10"
 clear the screen and goto line 5 column 10
 .Pp
-.It Li "tput cm 6 11 DC 6"
+.It Li "tput cup 6 11 dch 6"
 goto line 6 column 11 and delete 6 characters
 .Sh SEE ALSO
-.Xr termcap 3 ,
-.Xr termcap 5
+.Xr terminfo 3 ,
+.Xr terminfo 5
 .Sh BUGS
 .Nm tput
 can't really distinguish between different types of attributes.
diff --git a/usr.bin/tput/tput.c b/usr.bin/tput/tput.c
index 0b961ac0001..d24518c28ee 100644
--- a/usr.bin/tput/tput.c
+++ b/usr.bin/tput/tput.c
@@ -1,6 +1,31 @@
-/*	$OpenBSD: tput.c,v 1.7 1999/03/06 20:27:42 millert Exp $	*/
-/*	$NetBSD: tput.c,v 1.8 1995/08/31 22:11:37 jtc Exp $	*/
+/*	$OpenBSD: tput.c,v 1.8 1999/06/29 19:39:40 millert Exp $	*/
 
+/*
+ * Copyright (c) 1999 Todd C. Miller <Todd.Miller@courtesan.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 /*-
  * Copyright (c) 1980, 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -44,206 +69,305 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)tput.c	8.3 (Berkeley) 4/28/95";
 #endif
-static char rcsid[] = "$OpenBSD: tput.c,v 1.7 1999/03/06 20:27:42 millert Exp $";
+static char rcsid[] = "$OpenBSD: tput.c,v 1.8 1999/06/29 19:39:40 millert Exp $";
 #endif /* not lint */
 
-#include <termios.h>
+#include <sys/param.h>
 
+#include <ctype.h>
 #include <err.h>
 #include <curses.h>
+#include <term.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <termios.h>
 #include <unistd.h>
 #include <string.h>
 
-static void   prlongname __P((char *));
-static void   setospeed __P((void));
-static void   outc __P((int));
-static void   usage __P((void));
+#include <sys/wait.h>
+
+static void   init __P((void));
 static char **process __P((char *, char *, char **));
+static void   reset __P((void));
+static void   usage __P((void));
+
+extern char  *__progname;
 
 int
 main(argc, argv)
 	int argc;
 	char **argv;
 {
-	extern char *optarg;
-	extern int optind;
-	int ch, exitval, n;
-	char *argv0, *cptr, *p, *term, buf[1024], tbuf[1024];
+	int ch, exitval, n, Sflag;
+	size_t len;
+	char *p, *term, *str;
+	char **oargv;
 
+	oargv = argv;
 	term = NULL;
-	while ((ch = getopt(argc, argv, "T:")) != -1)
+	Sflag = exitval = 0;
+	while ((ch = getopt(argc, argv, "ST:")) != -1)
 		switch(ch) {
 		case 'T':
 			term = optarg;
 			break;
+		case 'S':
+			Sflag = 1;
+			break;
 		case '?':
 		default:
 			usage();
 		}
-	if ((argv0 = (char *)strrchr(argv[0], '/')) != NULL)
-		argv0++;
-	else
-		argv0 = argv[0];
 	argc -= optind;
 	argv += optind;
 
+	if (Sflag && argc > 0)
+		usage();
 
 	if (!term && !(term = getenv("TERM")))
-errx(2, "no terminal type specified and no TERM environmental variable.");
-	if (tgetent(tbuf, term) != 1)
-		err(2, "tgetent failure");
-	setospeed();
-	if (strcmp(argv0, "clear") == 0) {
-		*argv = "clear";
+		errx(2, "No value for $TERM and no -T specified");
+
+	/*
+	 * NOTE: tgetent() will call setupterm() and set ospeed for us
+	 * (this is ncurses-specific behavior)
+	 */
+	if (tgetent(NULL, term) != 1)
+		errx(3, "Unknown terminal type `%s'", term);
+
+	if (strcmp(__progname, "clear") == 0) {
+		if (Sflag)
+			usage();
+		argv = oargv;
+		*argv = __progname;
 		*(argv+1) = NULL;
 	}
-	for (exitval = 0; (p = *argv) != NULL; ++argv) {
+	if (Sflag) {
+		char **av;
+
+		/* Build new argv based on stdin */
+		argc = n = 0;
+		av = NULL;
+		while ((str = fgetln(stdin, &len)) != NULL) {
+			if (str[len-1] != '\n')
+				errx(1, "premature EOF");
+			str[len-1] = '\0';
+			/* grow av as needed */
+			if (argc + 1 >= n) {
+				n += 64;
+				av = (char **)realloc(av, sizeof(char *) * n);
+				if (av == NULL)
+					errx(1, "out of memory");
+			}
+			while ((p = strsep(&str, " \t")) != NULL) {
+				if (*p != '\0' &&
+				    (av[argc++] = strdup(p)) == NULL)
+					errx(1, "out of memory");
+			}
+		}
+		if (argc > 0) {
+			av[argc] = NULL;
+			argv = av;
+		}
+	}
+	while ((p = *argv++)) {
 		switch (*p) {
-		case 'c':
-			if (!strcmp(p, "clear"))
-				p = "cl";
-			break;
 		case 'i':
-			if (!strcmp(p, "init"))
-				p = "is";
+			if (!strcmp(p, "init")) {
+				init();
+				continue;
+			}
 			break;
 		case 'l':
 			if (!strcmp(p, "longname")) {
-				prlongname(tbuf);
+				puts(longname());
 				continue;
 			}
 			break;
 		case 'r':
-			if (!strcmp(p, "reset"))
-				p = "rs";
+			if (!strcmp(p, "reset")) {
+				reset();
+				continue;
+			}
 			break;
 		}
-		cptr = buf;
-		if (tgetstr(p, &cptr))
-			argv = process(p, buf, argv);
+
+		/* First try as terminfo */
+		if ((str = tigetstr(p)) && str != (char *)-1)
+			argv = process(p, str, argv);
+		else if ((n = tigetnum(p)) != -2)
+			(void)printf("%d\n", n);
+		else if ((n = tigetflag(p)) != -1)
+			exitval = !n;
+		/* Then fall back on termcap */
+		else if ((str = tgetstr(p, NULL)))
+			argv = process(p, str, argv);
 		else if ((n = tgetnum(p)) != -1)
 			(void)printf("%d\n", n);
-		else
-			exitval = !tgetflag(p);
+		else if ((exitval = tgetflag(p)) != 0)
+			exitval = !exitval;
+		else {
+			warnx("Unknown terminfo capability `%s'", p);
+			exitval = 4;
+		}
 
-		if (argv == NULL)
+		if (*argv == NULL)
 			break;
 	}
-	exit(argv ? exitval : 2);
-}
-
-static void
-prlongname(buf)
-	char *buf;
-{
-	int savech;
-	char *p, *savep;
-
-	for (p = buf; *p && *p != ':'; ++p)
-		continue;
-	savech = *(savep = p);
-	for (*p = '\0'; p >= buf && *p != '|'; --p)
-		continue;
-	(void)printf("%s\n", p + 1);
-	*savep = savech;
+	exit(*argv ? exitval : 2);
 }
 
 static char **
 process(cap, str, argv)
 	char *cap, *str, **argv;
 {
-	static char errfew[] =
-	    "not enough arguments (%d) for capability `%s'";
-	static char errmany[] =
-	    "too many arguments (%d) for capability `%s'";
-	static char erresc[] =
-	    "unknown %% escape `%c' for capability `%s'";
-	char *cp;
-	int arg_need, arg_rows, arg_cols;
+	char *cp, *s, *nargv[9];
+	int arg_need, popcount, i;
 
 	/* Count how many values we need for this capability. */
-	for (cp = str, arg_need = 0; *cp != '\0'; cp++)
-		if (*cp == '%')
-			    switch (*++cp) {
-			    case 'd':
-			    case '2':
-			    case '3':
-			    case '.':
-			    case '+':
-				    arg_need++;
-				    break;
-			    case '%':
-			    case '>':
-			    case 'i':
-			    case 'r':
-			    case 'n':
-			    case 'B':
-			    case 'D':
-				    break;
-			    default:
-				/*
-				 * hpux has lot's of them, but we complain
-				 */
-				 errx(2, erresc, *cp, cap);
-			    }
-
-	/* And print them. */
-	switch (arg_need) {
-	case 0:
-		(void)tputs(str, 1, outc);
-		break;
-	case 1:
-		arg_cols = 0;
-
-		if (*++argv == NULL || *argv[0] == '\0')
-			errx(2, errfew, 1, cap);
-		arg_rows = atoi(*argv);
-
-		(void)tputs(tgoto(str, arg_cols, arg_rows), 1, outc);
-		break;
-	case 2:
-		if (*++argv == NULL || *argv[0] == '\0')
-			errx(2, errfew, 2, cap);
-		arg_rows = atoi(*argv);
-
-		if (*++argv == NULL || *argv[0] == '\0')
-			errx(2, errfew, 2, cap);
-		arg_cols = atoi(*argv);
-
-		(void) tputs(tgoto(str, arg_cols, arg_rows), arg_rows, outc);
-		break;
-
-	default:
-		errx(2, errmany, arg_need, cap);
+	for (cp = str, arg_need = popcount = 0; *cp != '\0'; cp++) {
+		if (*cp == '%') {
+			switch (*++cp) {
+			case '%':
+			   	cp++;
+				break;
+			case 'i':
+				if (popcount < 2)
+					popcount = 2;
+				break;
+			case 'p':
+				cp++;
+				if (isdigit(cp[1]) && popcount < cp[1] - '0')
+					popcount = cp[1] - '0';
+				break;
+			case 'd':
+			case 's':
+			case '0':
+			case '1':
+			case '2':
+			case '3':
+			case '4':
+			case '5':
+			case '6':
+			case '7':
+			case '8':
+			case '9':
+			case '.':
+			case '+':
+				arg_need++;
+				break;
+			default:
+				break;
+			}
+		}
+	}
+	arg_need = MAX(arg_need, popcount);
+	if (arg_need > 9)
+		errx(2, "too many arguments (%d) for capability `%s'",
+		    arg_need, cap);
+	
+	for (i = 0; i < arg_need; i++) {
+		long l;
+
+		if (argv[i] == NULL)
+			errx(2, "not enough arguments (%d) for capability `%s'",
+			    arg_need, cap);
+
+		/* convert ascii representation of numbers to longs */
+		if (isdigit(argv[i][0]) && (l = strtol(argv[i], &cp, 10)) >= 0
+		    && l < LONG_MAX && *cp == '\0')
+			nargv[i] = (char *)l;
+		else
+			nargv[i] = argv[i];
 	}
-	return (argv);
+
+	s = tparm(str, nargv[0], nargv[1], nargv[2], nargv[3],
+	    nargv[4], nargv[5], nargv[6], nargv[7], nargv[8]);
+	putp(s);
+	fflush(stdout);
+
+	return (argv + arg_need);
 }
 
 static void
-setospeed()
+init()
 {
-#undef ospeed
-	extern short ospeed;
-	struct termios t;
+	FILE *ifile;
+	size_t len;
+	char *buf;
+	int waitinfo;
 
-	if (tcgetattr(STDOUT_FILENO, &t) != -1)
-		ospeed = 0;
-	else
-		ospeed = cfgetospeed(&t);
+	/* XXX - should we check for existence before exec()'ing? */
+	if (init_prog && !issetugid()) {
+		switch (vfork()) {
+		case -1:
+			err(4, "vfork");
+			break;
+		case 0:
+			/* child */
+			execl(init_prog, init_prog, NULL);
+			_exit(127);
+			break;
+		default:
+			wait(&waitinfo);
+			/* XXX - interpret waitinfo? */
+			break;
+		}
+	}
+	if (init_1string)
+		putp(init_1string);
+	if (init_2string)
+		putp(init_2string);
+	if (init_file && !issetugid() && (ifile = fopen(init_file, "r"))) {
+		while ((buf = fgetln(ifile, &len)) != NULL) {
+			if (buf[len-1] != '\n')
+				errx(1, "premature EOF reading %s", init_file);
+			buf[len-1] = '\0';
+			putp(buf);
+		}
+		fclose(ifile);
+	}
+	if (init_3string)
+		putp(init_3string);
+	/* XXX - do tabs and margins */
+	fflush(stdout);
 }
 
 static void
-outc(c)
-	int c;
+reset()
 {
-	(void)putchar(c);
+	FILE *rfile;
+	size_t len;
+	char *buf;
+
+	if (reset_1string)
+		putp(reset_1string);
+	if (reset_2string)
+		putp(reset_2string);
+	/* XXX - cat reset_file */
+	if (reset_file && !issetugid() && (rfile = fopen(reset_file, "r"))) {
+		while ((buf = fgetln(rfile, &len)) != NULL) {
+			if (buf[len-1] != '\n')
+				errx(1, "premature EOF reading %s", reset_file);
+			buf[len-1] = '\0';
+			putp(buf);
+		}
+		fclose(rfile);
+	}
+	if (reset_3string)
+		putp(reset_3string);
+	/* XXX - do tabs and margins */
+	fflush(stdout);
 }
 
 static void
 usage()
 {
-	(void)fprintf(stderr, "usage: tput [-T term] attribute ...\n");
+
+	if (strcmp(__progname, "clear") == 0)
+		(void)fprintf(stderr, "usage: %s [-T term]\n", __progname);
+	else
+		(void)fprintf(stderr,
+		    "usage: %s [-T term] attribute [attribute-args] ...\n"
+		    "       %s [-T term] -S\n", __progname, __progname);
 	exit(1);
 }