X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=progs%2Ftput.c;h=91b23857524c31fb3580bf50de33298cb4be9b99;hp=63c6d1a5be5b4e532ac6f87da5cad78e8726f68e;hb=26522e4669dbf45cba32138b5d81c6c292e88e60;hpb=b1f61d9f3aa244512045a6b02e759825d7049d34 diff --git a/progs/tput.c b/progs/tput.c index 63c6d1a5..91b23857 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-2008,2009 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 * @@ -38,18 +38,30 @@ * Ross Ridge's mytinfo package. */ +#define USE_LIBTINFO #include -#ifndef PURE_TERMINFO + +#if !PURE_TERMINFO +#include #include #endif +#include -MODULE_ID("$Id: tput.c,v 1.16 2000/03/19 01:08:08 tom Exp $") +MODULE_ID("$Id: tput.c,v 1.43 2009/03/14 18:45:55 tom Exp $") #define PUTS(s) fputs(s, stdout) #define PUTCHAR(c) putchar(c) #define FLUSH fflush(stdout) +typedef enum { + Numbers = 0 + ,Num_Str + ,Num_Str_Str +} TParams; + static char *prg_name; +static bool is_init = FALSE; +static bool is_reset = FALSE; static void quit(int status, const char *fmt,...) @@ -57,17 +69,80 @@ 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 void +check_aliases(const char *name) +{ + is_init = same_program(name, PROG_INIT); + is_reset = same_program(name, PROG_RESET); +} + +/* + * Lookup the type of call we should make to tparm(). This ignores the actual + * terminfo capability (bad, because it is not extensible), but makes this + * code portable to platforms where sizeof(int) != sizeof(char *). + * + * FIXME: If we want extensibility, analyze the capability string as we do + * in tparm() to decide how to parse the varargs list. + */ +static TParams +tparm_type(const char *name) +{ +#define TD(code, longname, ti, tc) {code,longname},{code,ti},{code,tc} + TParams result = Numbers; + /* *INDENT-OFF* */ + static const struct { + TParams code; + const char *name; + } table[] = { + TD(Num_Str, "pkey_key", "pfkey", "pk"), + TD(Num_Str, "pkey_local", "pfloc", "pl"), + TD(Num_Str, "pkey_xmit", "pfx", "px"), + TD(Num_Str, "plab_norm", "pln", "pn"), + TD(Num_Str_Str, "pkey_plab", "pfxl", "xl"), + }; + /* *INDENT-ON* */ + + unsigned n; + for (n = 0; n < SIZEOF(table); n++) { + if (!strcmp(name, table[n].name)) { + result = table[n].code; + break; + } + } + 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 @@ -76,43 +151,47 @@ tput(int argc, char *argv[]) NCURSES_CONST char *name; char *s; int i, j, c; - int reset, status; + int status; FILE *f; - reset = 0; - name = argv[0]; - if (strcmp(name, "reset") == 0) { - reset = 1; - } - if (reset || strcmp(name, "init") == 0) { + if ((name = argv[0]) == 0) + name = ""; + check_aliases(name); + if (is_reset || is_init) { if (init_prog != 0) { system(init_prog); } FLUSH; - if (reset && reset_1string != 0) { + if (is_reset && reset_1string != 0) { PUTS(reset_1string); } else if (init_1string != 0) { PUTS(init_1string); } FLUSH; - if (reset && reset_2string != 0) { + if (is_reset && reset_2string != 0) { PUTS(reset_2string); } else if (init_2string != 0) { PUTS(init_2string); } FLUSH; +#ifdef set_lr_margin 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(TPARM_2(set_lr_margin, 0, columns - 1)); + } else +#endif +#ifdef set_left_margin_parm + if (set_left_margin_parm != 0 + && set_right_margin_parm != 0) { + PUTS(TPARM_1(set_left_margin_parm, 0)); + PUTS(TPARM_1(set_right_margin_parm, columns - 1)); + } else +#endif + if (clear_margins != 0 + && set_left_margin != 0 + && set_right_margin != 0) { PUTS(clear_margins); if (carriage_return != 0) { PUTS(carriage_return); @@ -121,7 +200,7 @@ tput(int argc, char *argv[]) } PUTS(set_left_margin); if (parm_right_cursor) { - PUTS(tparm(parm_right_cursor, columns - 1)); + PUTS(TPARM_1(parm_right_cursor, columns - 1)); } else { for (i = 0; i < columns - 1; i++) { PUTCHAR(' '); @@ -140,7 +219,7 @@ tput(int argc, char *argv[]) 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)); + PUTS(TPARM_1(parm_right_cursor, 8)); } else { for (j = 0; j < 8; j++) PUTCHAR(' '); @@ -151,10 +230,10 @@ tput(int argc, char *argv[]) } } - if (reset && reset_file != 0) { + if (is_reset && reset_file != 0) { f = fopen(reset_file, "r"); if (f == 0) { - quit(errno, "Can't open reset_file: '%s'", reset_file); + quit(4 + errno, "Can't open reset_file: '%s'", reset_file); } while ((c = fgetc(f)) != EOF) { PUTCHAR(c); @@ -163,7 +242,7 @@ tput(int argc, char *argv[]) } else if (init_file != 0) { f = fopen(init_file, "r"); if (f == 0) { - quit(errno, "Can't open init_file: '%s'", init_file); + quit(4 + errno, "Can't open init_file: '%s'", init_file); } while ((c = fgetc(f)) != EOF) { PUTCHAR(c); @@ -172,10 +251,10 @@ tput(int argc, char *argv[]) } FLUSH; - if (reset && reset_3string != 0) { + if (is_reset && reset_3string != 0) { PUTS(reset_3string); - } else if (init_2string != 0) { - PUTS(init_2string); + } else if (init_3string != 0) { + PUTS(init_3string); } FLUSH; return 0; @@ -185,7 +264,7 @@ tput(int argc, char *argv[]) PUTS(longname()); return 0; } -#ifndef PURE_TERMINFO +#if !PURE_TERMINFO { const struct name_table_entry *np; @@ -210,16 +289,19 @@ tput(int argc, char *argv[]) #endif if ((status = tigetflag(name)) != -1) { - return (status != 0); + 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) { + quit(4, "unknown terminfo capability '%s'", name); + } else if (s != ABSENT_STRING) { if (argc > 1) { int k; - char * params[10]; + int popcount; + 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,64 +309,93 @@ 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, &popcount); +#define myParam(n) (p_is_s[n - 1] != 0 ? ((long) 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; - prg_name = argv[0]; - s = strrchr(prg_name, '/'); - if (s != 0 && *++s != '\0') - prg_name = s; + check_aliases(prg_name = _nc_rootname(argv[0])); 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_reset || is_init) { + if (optind-- < argc) { + argc -= optind; + argv += optind; + } + argv[0] = prg_name; + } else { + argc -= optind; + argv += optind; } if (term == 0 || *term == '\0') @@ -293,8 +404,11 @@ main(int argc, char **argv) if (setupterm(term, STDOUT_FILENO, &errret) != OK && errret <= 0) quit(3, "unknown terminal \"%s\"", term); - if (cmdline) - return tput(argc, argv); + if (cmdline) { + if ((argc <= 0) && !is_reset && !is_init) + usage(); + ExitProgram(tput(argc, argv)); + } while (fgets(buf, sizeof(buf), stdin) != 0) { char *argvec[16]; /* command, 9 parms, null, & slop */ @@ -303,16 +417,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(argnum, argvec) != 0) { + if (result == 0) + result = 4; /* will return value >4 */ + ++result; + } } - return errors > 0; + ExitProgram(result); }