Relay-Version: version B 2.10 5/3/83; site utzoo.UUCP
Posting-Version: version B 2.10.2 9/18/84 SMI; site sun.uucp
Path: utzoo!watmath!clyde!burl!ulysses!allegra!mit-eddie!genrad!decvax!decwrl!sun!guy
From: guy@sun.uucp (Guy Harris)
Newsgroups: net.bugs.usg
Subject: "tabs" and "tput" assume TERM is set
Message-ID: <2484@sun.uucp>
Date: Tue, 23-Jul-85 21:42:45 EDT
Article-I.D.: sun.2484
Posted: Tue Jul 23 21:42:45 1985
Date-Received: Thu, 25-Jul-85 21:49:34 EDT
Distribution: net
Organization: Sun Microsystems, Inc.
Lines: 134

Both of them assume, at some point, that getenv("TERM") will never return a
NULL.  Regardless of whether the S5 Interface Definition says it'll always
be set or not, it's really dumb to assume it'll never happen...  (Also,
"tput" didn't declare "getenv".)

*** tabs.c.BAK	Thu May  2 10:22:04 1985
--- tabs.c	Tue Jul 23 17:15:30 1985
***************
*** 126,133
  		else
  			tabspec = scan;		/* save tab specification */
  	}
! 	if (*terminal == '\0')
! 		terminal = getenv("TERM");
  #ifdef pdp11
  	if(*terminal == '\0') err = -1;	/*setupterm (libcurses/terminfo) problem on pdp11*/
  	else		/*doesn't detect error if terminal is null*/

--- 126,137 -----
  		else
  			tabspec = scan;		/* save tab specification */
  	}
! 	if (*terminal == '\0') {
! 		if ((terminal = getenv("TERM")) == NULL) {
! 			fprintf(stderr, "tabs: No terminal type variable TERM in the environment\n");
! 			exit(1);
! 		}
! 	}
  #ifdef pdp11
  	if(*terminal == '\0') err = -1;	/*setupterm (libcurses/terminfo) problem on pdp11*/
  	else		/*doesn't detect error if terminal is null*/

*** tput.c.BAK	Wed Jan 30 20:04:51 1985
--- tput.c	Tue Jul 23 18:36:19 1985
***************
*** 22,27
  	int err;
  	int xcode;
  	char cap[40];
  	
  	if (!((argc == 2 && argv[1][0] != '-') ||
  	 (argc == 3 && strncmp(argv[1],"-T",2) == 0 && strlen(argv[1]) > 2))) {

--- 22,29 -----
  	int err;
  	int xcode;
  	char cap[40];
+ 	register char *termp;
+ 	extern char *getenv();
  	
  	if (!((argc == 2 && argv[1][0] != '-') ||
  	 (argc == 3 && strncmp(argv[1],"-T",2) == 0 && strlen(argv[1]) > 2))) {
***************
*** 30,36
  	}
  	if (argc == 3) {
  		strcpy(cap,argv[2]);
! 		setupterm(&argv[1][2],1,&err);
  	}
  	else {
  		strcpy(cap,argv[1]);

--- 32,38 -----
  	}
  	if (argc == 3) {
  		strcpy(cap,argv[2]);
! 		termtype = &argv[1][2];
  	}
  	else {
  		strcpy(cap,argv[1]);
***************
*** 34,40
  	}
  	else {
  		strcpy(cap,argv[1]);
! 		setupterm(0,1,&err);
  	}
  	if (err <= 0)
  	{

--- 36,45 -----
  	}
  	else {
  		strcpy(cap,argv[1]);
! 		if ((termtype = getenv("TERM")) == 0) {
! 			fprintf(stderr, "tput: No terminal type variable TERM in the environment\n");
! 			exit(-2);
! 		}
  	}
  	setupterm(termtype,1,&err);
  	if (err <= 0)
***************
*** 36,41
  		strcpy(cap,argv[1]);
  		setupterm(0,1,&err);
  	}
  	if (err <= 0)
  	{
  	    if (argc == 3) {

--- 41,47 -----
  			exit(-2);
  		}
  	}
+ 	setupterm(termtype,1,&err);
  	if (err <= 0)
  	{
  	    fprintf(stderr,"tput: unknown terminal \"%s\"\n",termtype);
***************
*** 38,51
  	}
  	if (err <= 0)
  	{
! 	    if (argc == 3) {
! 		fprintf(stderr,"tput: unknown terminal \"%s\"\n",&argv[1][2]);
! 		exit(-2);
! 	    }
! 	    else {
! 		fprintf(stderr,"tput: unknown terminal \"%s\"\n",getenv("TERM"));
! 		exit(-2);
! 	    }
  	}
  	xcode = capindex(cap);
  	resetterm();

--- 44,51 -----
  	setupterm(termtype,1,&err);
  	if (err <= 0)
  	{
! 	    fprintf(stderr,"tput: unknown terminal \"%s\"\n",termtype);
! 	    exit(-2);
  	}
  	xcode = capindex(cap);
  	resetterm();