X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=progs%2Ftput.c;h=481ae6356d16efe48c1caa8a28f945479a06e909;hp=63c6d1a5be5b4e532ac6f87da5cad78e8726f68e;hb=62ca6190a9a8ddccb2c4d5ca7b2ef9f88432da65;hpb=b1f61d9f3aa244512045a6b02e759825d7049d34 diff --git a/progs/tput.c b/progs/tput.c index 63c6d1a5..481ae635 100644 --- a/progs/tput.c +++ b/progs/tput.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc. * + * Copyright (c) 1998-2015,2016 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 * @@ -29,6 +29,7 @@ /**************************************************************************** * Author: Zeyd M. Ben-Halim 1992,1995 * * and: Eric S. Raymond * + * and: Thomas E. Dickey 1996-on * ****************************************************************************/ /* @@ -38,18 +39,27 @@ * Ross Ridge's mytinfo package. */ -#include -#ifndef PURE_TERMINFO +#include +#include +#include + +#if !PURE_TERMINFO +#include #include #endif +#include +#include -MODULE_ID("$Id: tput.c,v 1.16 2000/03/19 01:08:08 tom Exp $") +MODULE_ID("$Id: tput.c,v 1.65 2016/12/24 18:44:32 tom Exp $") #define PUTS(s) fputs(s, stdout) -#define PUTCHAR(c) putchar(c) -#define FLUSH fflush(stdout) + +const char *_nc_progname = "tput"; static char *prg_name; +static bool is_init = FALSE; +static bool is_reset = FALSE; +static bool is_clear = FALSE; static void quit(int status, const char *fmt,...) @@ -57,127 +67,89 @@ quit(int status, const char *fmt,...) va_list argp; va_start(argp, fmt); + fprintf(stderr, "%s: ", prg_name); vfprintf(stderr, fmt, argp); fprintf(stderr, "\n"); va_end(argp); - exit(status); + ExitProgram(status); } static void usage(void) { - fprintf(stderr, "usage: %s [-S] [-T term] capname\n", prg_name); - exit(EXIT_FAILURE); + fprintf(stderr, "usage: %s [-V] [-S] [-T term] capname\n", prg_name); + ExitProgram(EXIT_FAILURE); +} + +static char * +check_aliases(char *name, bool program) +{ + static char my_init[] = "init"; + static char my_reset[] = "reset"; + static char my_clear[] = "clear"; + + char *result = name; + if ((is_init = same_program(name, program ? PROG_INIT : my_init))) + result = my_init; + if ((is_reset = same_program(name, program ? PROG_RESET : my_reset))) + result = my_reset; + if ((is_clear = same_program(name, program ? PROG_CLEAR : my_clear))) + result = my_clear; + return result; +} + +static int +exit_code(int token, int value) +{ + int result = 99; + + switch (token) { + case BOOLEAN: + result = !value; /* TRUE=0, FALSE=1 */ + break; + case NUMBER: + result = 0; /* always zero */ + break; + case STRING: + result = value; /* 0=normal, 1=missing */ + break; + } + return result; } static int -tput(int argc, char *argv[]) +tput_cmd(int fd, TTY * saved_settings, int argc, char *argv[]) { 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); - } - FLUSH; + int status; +#if !PURE_TERMINFO + bool termcap = FALSE; +#endif - if (reset && reset_1string != 0) { - PUTS(reset_1string); - } else if (init_1string != 0) { - PUTS(init_1string); - } - FLUSH; + name = check_aliases(argv[0], FALSE); + if (is_reset || is_init) { + TTY oldmode; - 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(' '); - } - } - 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; - } - } + int terasechar = -1; /* new erase character */ + int intrchar = -1; /* new interrupt character */ + int tkillchar = -1; /* new kill character */ - 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; + reset_start(stdout, is_reset, is_init); + reset_tty_settings(fd, saved_settings); - if (reset && reset_3string != 0) { - PUTS(reset_3string); - } else if (init_2string != 0) { - PUTS(init_2string); +#if HAVE_SIZECHANGE + set_window_size(fd, &lines, &columns); +#else + (void) fd; +#endif + set_control_chars(saved_settings, terasechar, intrchar, tkillchar); + set_conversions(saved_settings); + if (send_init_strings(fd, &oldmode)) { + reset_flush(); } - FLUSH; + + update_tty_settings(&oldmode, saved_settings); return 0; } @@ -185,41 +157,51 @@ tput(int argc, char *argv[]) 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; - } - } +#if !PURE_TERMINFO + retry: #endif - - if ((status = tigetflag(name)) != -1) { - return (status != 0); + if (strcmp(name, "clear") == 0) { + return clear_cmd(); + } else if ((status = tigetflag(name)) != -1) { + return exit_code(BOOLEAN, status); } else if ((status = tigetnum(name)) != CANCELLED_NUMERIC) { (void) printf("%d\n", status); - return (0); + return exit_code(NUMBER, 0); } else if ((s = tigetstr(name)) == CANCELLED_STRING) { - quit(4, "%s: unknown terminfo capability '%s'", prg_name, name); - } else if (s != 0) { +#if !PURE_TERMINFO + if (!termcap) { + const struct name_table_entry *np; + + termcap = TRUE; + if ((np = _nc_find_entry(name, _nc_get_hash_table(termcap))) != 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; + } + goto retry; + } + } +#endif + quit(4, "unknown terminfo capability '%s'", name); + } else if (s != ABSENT_STRING) { if (argc > 1) { int k; - char * params[10]; + int ignored; + long numbers[1 + NUM_PARM]; + char *strings[1 + NUM_PARM]; + char *p_is_s[NUM_PARM]; /* Nasty hack time. The tparm function needs to see numeric * parameters as numbers, not as pointers to their string @@ -227,74 +209,110 @@ tput(int argc, char *argv[]) */ 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]; - } + char *tmp = 0; + strings[k] = argv[k]; + numbers[k] = strtol(argv[k], &tmp, 0); + if (tmp == 0 || *tmp != 0) + numbers[k] = 0; + } + for (k = argc; k <= NUM_PARM; k++) { + numbers[k] = 0; + strings[k] = 0; } - for (k = argc; k <= 9; k++) - params[k] = 0; - s = tparm(s, - params[1], params[2], params[3], - params[4], params[5], params[6], - params[7], params[8], params[9]); + switch (tparm_type(name)) { + case Num_Str: + s = TPARM_2(s, numbers[1], strings[2]); + break; + case Num_Str_Str: + s = TPARM_3(s, numbers[1], strings[2], strings[3]); + break; + case Numbers: + default: + (void) _nc_tparm_analyze(s, p_is_s, &ignored); +#define myParam(n) (p_is_s[n - 1] != 0 ? ((TPARM_ARG) strings[n]) : numbers[n]) + s = TPARM_9(s, + myParam(1), + myParam(2), + myParam(3), + myParam(4), + myParam(5), + myParam(6), + myParam(7), + myParam(8), + myParam(9)); + break; + } } /* use putp() in order to perform padding */ putp(s); - return (0); + return exit_code(STRING, 0); } - return (0); + return exit_code(STRING, 1); } int main(int argc, char **argv) { - char *s, *term; - int errret, cmdline = 1; + char *term; + int errret; + bool cmdline = TRUE; int c; char buf[BUFSIZ]; - int errors = 0; + int result = 0; + int fd; + TTY tty_settings; - prg_name = argv[0]; - s = strrchr(prg_name, '/'); - if (s != 0 && *++s != '\0') - prg_name = s; + prg_name = check_aliases(_nc_rootname(argv[0]), TRUE); term = getenv("TERM"); - while ((c = getopt(argc, argv, "ST:")) != EOF) + while ((c = getopt(argc, argv, "ST:V")) != -1) { switch (c) { case 'S': - cmdline = 0; + cmdline = FALSE; break; case 'T': use_env(FALSE); term = optarg; break; + case 'V': + puts(curses_version()); + ExitProgram(EXIT_SUCCESS); default: usage(); /* NOTREACHED */ } - argc -= optind; - argv += optind; + } - if (cmdline && argc == 0) { - usage(); - /* NOTREACHED */ + /* + * Modify the argument list to omit the options we processed. + */ + if (is_clear || is_reset || is_init) { + if (optind-- < argc) { + argc -= optind; + argv += optind; + } + argv[0] = prg_name; + } else { + argc -= optind; + argv += optind; } if (term == 0 || *term == '\0') quit(2, "No value for $TERM and no -T specified"); - if (setupterm(term, STDOUT_FILENO, &errret) != OK && errret <= 0) + fd = save_tty_settings(&tty_settings); + + if (setupterm(term, fd, &errret) != OK && errret <= 0) quit(3, "unknown terminal \"%s\"", term); - if (cmdline) - return tput(argc, argv); + if (cmdline) { + if ((argc <= 0) && !(is_clear || is_reset || is_init)) + usage(); + ExitProgram(tput_cmd(fd, &tty_settings, argc, argv)); + } while (fgets(buf, sizeof(buf), stdin) != 0) { char *argvec[16]; /* command, 9 parms, null, & slop */ @@ -303,16 +321,23 @@ main(int argc, char **argv) /* crack the argument list into a dope vector */ for (cp = buf; *cp; cp++) { - if (isspace(*cp)) + if (isspace(UChar(*cp))) { *cp = '\0'; - else if (cp == buf || cp[-1] == 0) + } else if (cp == buf || cp[-1] == 0) { argvec[argnum++] = cp; + if (argnum >= (int) SIZEOF(argvec) - 1) + break; + } } argvec[argnum] = 0; - if (tput(argnum, argvec) != 0) - errors++; + if (argnum != 0 + && tput_cmd(fd, &tty_settings, argnum, argvec) != 0) { + if (result == 0) + result = 4; /* will return value >4 */ + ++result; + } } - return errors > 0; + ExitProgram(result); }