1 files changed, 234 insertions, 228 deletions

diff --git a/contrib/ncurses/progs/tput.c b/contrib/ncurses/progs/tput.c
index 7a859f1..63c6d1a 100644
--- a/contrib/ncurses/progs/tput.c
+++ b/contrib/ncurses/progs/tput.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc.                        *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -31,7 +31,6 @@
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  ****************************************************************************/
 
-
 /*
  * tput.c -- shellscript access to terminal capabilities
  *
@@ -44,7 +43,7 @@
 #include <termsort.c>
 #endif
 
-MODULE_ID("$Id: tput.c,v 1.14 1999/07/31 21:18:29 Goran.Uddeborg Exp $")
+MODULE_ID("$Id: tput.c,v 1.16 2000/03/19 01:08:08 tom Exp $")
 
 #define PUTS(s)		fputs(s, stdout)
 #define PUTCHAR(c)	putchar(c)
@@ -52,261 +51,268 @@ MODULE_ID("$Id: tput.c,v 1.14 1999/07/31 21:18:29 Goran.Uddeborg Exp $")
 
 static char *prg_name;
 
-static void quit(int status, const char *fmt, ...)
+static void
+quit(int status, const char *fmt,...)
 {
-va_list argp;
+    va_list argp;
 
-	va_start(argp,fmt);
-	vfprintf (stderr, fmt, argp);
-	fprintf(stderr, "\n");
-	va_end(argp);
-	exit(status);
+    va_start(argp, fmt);
+    vfprintf(stderr, fmt, argp);
+    fprintf(stderr, "\n");
+    va_end(argp);
+    exit(status);
 }
 
-static void usage(void)
+static void
+usage(void)
 {
-	fprintf(stderr, "usage: %s [-S] [-T term] capname\n", prg_name);
-	exit(EXIT_FAILURE);
+    fprintf(stderr, "usage: %s [-S] [-T term] capname\n", prg_name);
+    exit(EXIT_FAILURE);
 }
 
-static int tput(int argc, char *argv[])
+static int
+tput(int argc, char *argv[])
 {
-char *name;
-char *s;
-int i, j, c;
-int reset, status;
-FILE *f;
-
-	reset = 0;
-	name = argv[0];
-	if (strcmp(name, "reset") == 0) {
-		reset = 1;
+    NCURSES_CONST char *name;
+    char *s;
+    int i, j, c;
+    int reset, status;
+    FILE *f;
+
+    reset = 0;
+    name = argv[0];
+    if (strcmp(name, "reset") == 0) {
+	reset = 1;
+    }
+    if (reset || strcmp(name, "init") == 0) {
+	if (init_prog != 0) {
+	    system(init_prog);
 	}
-	if (reset || strcmp(name, "init") == 0) {
-		if (init_prog != NULL) {
-			system(init_prog);
-		}
-		FLUSH;
+	FLUSH;
 
-		if (reset && reset_1string != NULL) {
-			PUTS(reset_1string);
-		} else if (init_1string != NULL) {
-			PUTS(init_1string);
-		}
-		FLUSH;
-
-		if (reset && reset_2string != NULL) {
-			PUTS(reset_2string);
-		} else if (init_2string != NULL) {
-			PUTS(init_2string);
-		}
-		FLUSH;
-
-		if (set_lr_margin != NULL) {
-			PUTS(tparm(set_lr_margin, 0, columns - 1));
-		} else if (set_left_margin_parm != NULL
-			   && set_right_margin_parm != NULL) {
-			PUTS(tparm(set_left_margin_parm, 0));
-			PUTS(tparm(set_right_margin_parm, columns - 1));
-		} else if (clear_margins != NULL && set_left_margin != NULL
-			   && set_right_margin != NULL) {
-			PUTS(clear_margins);
-			if (carriage_return != NULL) {
-				PUTS(carriage_return);
-			} else {
-				PUTCHAR('\r');
-			}
-			PUTS(set_left_margin);
-			if (parm_right_cursor) {
-				PUTS(tparm(parm_right_cursor, columns - 1));
-			} else {
-				for(i = 0; i < columns - 1; i++) {
-					PUTCHAR(' ');
-				}
-			}
-			PUTS(set_right_margin);
-			if (carriage_return != NULL) {
-				PUTS(carriage_return);
-			} else {
-				PUTCHAR('\r');
-			}
-		}
-		FLUSH;
-
-		if (init_tabs != 8) {
-			if (clear_all_tabs != NULL && set_tab != NULL) {
-				for(i = 0; i < columns - 1; i += 8) {
-					if (parm_right_cursor) {
-						PUTS(tparm(parm_right_cursor, 8));
-					} else {
-						for(j = 0; j < 8; j++)
-							PUTCHAR(' ');
-					}
-					PUTS(set_tab);
-				}
-				FLUSH;
-			}
-		}
+	if (reset && reset_1string != 0) {
+	    PUTS(reset_1string);
+	} else if (init_1string != 0) {
+	    PUTS(init_1string);
+	}
+	FLUSH;
 
-		if (reset && reset_file != NULL) {
-			f = fopen(reset_file, "r");
-			if (f == NULL) {
-				quit(errno, "Can't open reset_file: '%s'", reset_file);
-			}
-			while((c = fgetc(f)) != EOF) {
-				PUTCHAR(c);
-			}
-			fclose(f);
-		} else if (init_file != NULL) {
-			f = fopen(init_file, "r");
-			if (f == NULL) {
-				quit(errno, "Can't open init_file: '%s'", init_file);
-			}
-			while((c = fgetc(f)) != EOF) {
-				PUTCHAR(c);
-			}
-			fclose(f);
+	if (reset && reset_2string != 0) {
+	    PUTS(reset_2string);
+	} else if (init_2string != 0) {
+	    PUTS(init_2string);
+	}
+	FLUSH;
+
+	if (set_lr_margin != 0) {
+	    PUTS(tparm(set_lr_margin, 0, columns - 1));
+	} else if (set_left_margin_parm != 0
+	    && set_right_margin_parm != 0) {
+	    PUTS(tparm(set_left_margin_parm, 0));
+	    PUTS(tparm(set_right_margin_parm, columns - 1));
+	} else if (clear_margins != 0
+	    && set_left_margin != 0
+	    && set_right_margin != 0) {
+	    PUTS(clear_margins);
+	    if (carriage_return != 0) {
+		PUTS(carriage_return);
+	    } else {
+		PUTCHAR('\r');
+	    }
+	    PUTS(set_left_margin);
+	    if (parm_right_cursor) {
+		PUTS(tparm(parm_right_cursor, columns - 1));
+	    } else {
+		for (i = 0; i < columns - 1; i++) {
+		    PUTCHAR(' ');
 		}
-		FLUSH;
-
-		if (reset && reset_3string != NULL) {
-			PUTS(reset_3string);
-		} else if (init_2string != NULL) {
-			PUTS(init_2string);
+	    }
+	    PUTS(set_right_margin);
+	    if (carriage_return != 0) {
+		PUTS(carriage_return);
+	    } else {
+		PUTCHAR('\r');
+	    }
+	}
+	FLUSH;
+
+	if (init_tabs != 8) {
+	    if (clear_all_tabs != 0 && set_tab != 0) {
+		for (i = 0; i < columns - 1; i += 8) {
+		    if (parm_right_cursor) {
+			PUTS(tparm(parm_right_cursor, 8));
+		    } else {
+			for (j = 0; j < 8; j++)
+			    PUTCHAR(' ');
+		    }
+		    PUTS(set_tab);
 		}
 		FLUSH;
-		return 0;
+	    }
 	}
 
-	if (strcmp(name, "longname") == 0) {
-		PUTS(longname());
-		return 0;
+	if (reset && reset_file != 0) {
+	    f = fopen(reset_file, "r");
+	    if (f == 0) {
+		quit(errno, "Can't open reset_file: '%s'", reset_file);
+	    }
+	    while ((c = fgetc(f)) != EOF) {
+		PUTCHAR(c);
+	    }
+	    fclose(f);
+	} else if (init_file != 0) {
+	    f = fopen(init_file, "r");
+	    if (f == 0) {
+		quit(errno, "Can't open init_file: '%s'", init_file);
+	    }
+	    while ((c = fgetc(f)) != EOF) {
+		PUTCHAR(c);
+	    }
+	    fclose(f);
 	}
+	FLUSH;
 
-#ifndef	PURE_TERMINFO
-	{
-		const struct name_table_entry 	*np;
-
-		if ((np = _nc_find_entry(name, _nc_get_hash_table(1))) != 0)
-			switch(np->nte_type)
-			{
-			case BOOLEAN:
-				if (bool_from_termcap[np->nte_index])
-					name = boolnames[np->nte_index];
-				break;
-
-			case NUMBER:
-				if (num_from_termcap[np->nte_index])
-					name = numnames[np->nte_index];
-				break;
-
-			case STRING:
-				if (str_from_termcap[np->nte_index])
-					name = strnames[np->nte_index];
-				break;
-			}
+	if (reset && reset_3string != 0) {
+	    PUTS(reset_3string);
+	} else if (init_2string != 0) {
+	    PUTS(init_2string);
 	}
+	FLUSH;
+	return 0;
+    }
+
+    if (strcmp(name, "longname") == 0) {
+	PUTS(longname());
+	return 0;
+    }
+#ifndef	PURE_TERMINFO
+    {
+	const struct name_table_entry *np;
+
+	if ((np = _nc_find_entry(name, _nc_get_hash_table(1))) != 0)
+	    switch (np->nte_type) {
+	    case BOOLEAN:
+		if (bool_from_termcap[np->nte_index])
+		    name = boolnames[np->nte_index];
+		break;
+
+	    case NUMBER:
+		if (num_from_termcap[np->nte_index])
+		    name = numnames[np->nte_index];
+		break;
+
+	    case STRING:
+		if (str_from_termcap[np->nte_index])
+		    name = strnames[np->nte_index];
+		break;
+	    }
+    }
 #endif
 
-	if ((status = tigetflag(name)) != -1)
-		return(status != 0);
-	else if ((status = tigetnum(name)) != CANCELLED_NUMERIC) {
-		(void) printf("%d\n", status);
-		return(0);
-	}
-	else if ((s = tigetstr(name)) == CANCELLED_STRING)
-		quit(4, "%s: unknown terminfo capability '%s'", prg_name, name);
-	else if (s != (char *)NULL) {
-		if (argc > 1) {
-		int k;
-
-			/* Nasty hack time. The tparm function needs to see numeric
-			 * parameters as numbers, not as pointers to their string
-			 * representations
-			 */
-
-			 for (k = 1; k < argc; k++)
-			 	if (isdigit(argv[k][0])) {
-			 		long val = atol(argv[k]);
-			 		argv[k] = (char *)val;
-				}
-
-				s = tparm(s,argv[1],argv[2],argv[3],argv[4],
-					    argv[5],argv[6],argv[7],argv[8],
-					    argv[9]);
+    if ((status = tigetflag(name)) != -1) {
+	return (status != 0);
+    } else if ((status = tigetnum(name)) != CANCELLED_NUMERIC) {
+	(void) printf("%d\n", status);
+	return (0);
+    } else if ((s = tigetstr(name)) == CANCELLED_STRING) {
+	quit(4, "%s: unknown terminfo capability '%s'", prg_name, name);
+    } else if (s != 0) {
+	if (argc > 1) {
+	    int k;
+	    char * params[10];
+
+	    /* Nasty hack time. The tparm function needs to see numeric
+	     * parameters as numbers, not as pointers to their string
+	     * representations
+	     */
+
+	    for (k = 1; k < argc; k++) {
+		if (isdigit(argv[k][0])) {
+		    long val = atol(argv[k]);
+		    params[k] = (char *)val;
+		} else {
+		    params[k] = argv[k];
 		}
+	    }
+	    for (k = argc; k <= 9; k++)
+		params[k] = 0;
 
-		/* use putp() in order to perform padding */
-		putp(s);
-		return(0);
+	    s = tparm(s,
+	    	params[1], params[2], params[3],
+		params[4], params[5], params[6],
+		params[7], params[8], params[9]);
 	}
-	return(0);
+
+	/* use putp() in order to perform padding */
+	putp(s);
+	return (0);
+    }
+    return (0);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
-char *s, *term;
-int errret, cmdline = 1;
-int c;
-char	buf[BUFSIZ];
-int errors = 0;
-
-	prg_name = argv[0];
-	s = strrchr(prg_name, '/');
-	if (s != NULL && *++s != '\0')
+    char *s, *term;
+    int errret, cmdline = 1;
+    int c;
+    char buf[BUFSIZ];
+    int errors = 0;
+
+    prg_name = argv[0];
+    s = strrchr(prg_name, '/');
+    if (s != 0 && *++s != '\0')
 	prg_name = s;
 
-	term = getenv("TERM");
-
-	while ((c = getopt (argc, argv, "ST:")) != EOF)
-	    switch (c)
-	    {
-	    case 'S':
-		cmdline = 0;
-		break;
-	    case 'T':
-		use_env(FALSE);
-		term = optarg;
-		break;
-	    default:
-		usage();
-		/* NOTREACHED */
-	    }
-	argc -= optind;
-	argv += optind;
-
-	if (cmdline && argc == 0) {
-		usage();
-		/* NOTREACHED */
+    term = getenv("TERM");
+
+    while ((c = getopt(argc, argv, "ST:")) != EOF)
+	switch (c) {
+	case 'S':
+	    cmdline = 0;
+	    break;
+	case 'T':
+	    use_env(FALSE);
+	    term = optarg;
+	    break;
+	default:
+	    usage();
+	    /* NOTREACHED */
 	}
-
-	if (term == NULL || *term == '\0')
-		quit(2, "No value for $TERM and no -T specified");
-
-	if (setupterm(term, STDOUT_FILENO, &errret) != OK && errret <= 0) 
-		quit(3, "unknown terminal \"%s\"", term);
-
-	if (cmdline)
-		return tput(argc, argv);
-
-	while (fgets(buf, sizeof(buf), stdin) != (char *)NULL) {
-		char	*argvec[16];	/* command, 9 parms, null, & slop */
-		int	 argnum = 0;
-		char    *cp;
-
-		/* crack the argument list into a dope vector */
-		for (cp = buf; *cp; cp++) {
-			if (isspace(*cp))
-				*cp = '\0';
-			else if (cp == buf || cp[-1] == 0)
-				argvec[argnum++] = cp;
-		}
-		argvec[argnum] = (char *)NULL;
-
-		if (tput(argnum, argvec) != 0)
-			errors++;
+    argc -= optind;
+    argv += optind;
+
+    if (cmdline && argc == 0) {
+	usage();
+	/* NOTREACHED */
+    }
+
+    if (term == 0 || *term == '\0')
+	quit(2, "No value for $TERM and no -T specified");
+
+    if (setupterm(term, STDOUT_FILENO, &errret) != OK && errret <= 0)
+	quit(3, "unknown terminal \"%s\"", term);
+
+    if (cmdline)
+	return tput(argc, argv);
+
+    while (fgets(buf, sizeof(buf), stdin) != 0) {
+	char *argvec[16];	/* command, 9 parms, null, & slop */
+	int argnum = 0;
+	char *cp;
+
+	/* crack the argument list into a dope vector */
+	for (cp = buf; *cp; cp++) {
+	    if (isspace(*cp))
+		*cp = '\0';
+	    else if (cp == buf || cp[-1] == 0)
+		argvec[argnum++] = cp;
 	}
+	argvec[argnum] = 0;
 
-	return errors > 0;
-}
+	if (tput(argnum, argvec) != 0)
+	    errors++;
+    }
 
+    return errors > 0;
+}