/****************************************************************************
- * Copyright (c) 2015-2016,2017 Free Software Foundation, Inc. *
+ * Copyright 2019-2020,2021 Thomas E. Dickey *
+ * Copyright 2015-2016,2017 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 *
/*
* Author: Thomas E. Dickey
*
- * $Id: test_sgr.c,v 1.10 2017/04/09 00:27:42 tom Exp $
+ * $Id: test_sgr.c,v 1.17 2021/03/27 22:43:36 tom Exp $
*
* A simple demo of the sgr/sgr0 terminal capabilities.
*/
#include <test.priv.h>
#if !HAVE_TIGETSTR
-static void failed(const char *) GCC_NORETURN;
+static GCC_NORETURN void failed(const char *);
static void
failed(const char *msg)
#if HAVE_TIGETSTR
+static bool no_init = FALSE;
static bool q_opt = FALSE;
static char *d_opt;
db_item++;
}
}
- printf("** %s\n", result);
+ printf("** %s\n", result ? result : "<null>");
return result;
}
static char params[] = "SURBDBIPA";
unsigned n;
- printf("%4d ", bits);
+ printf("%4u ", bits);
bits &= ~ignore;
for (n = 0; n < MAXPAR; ++n) {
putchar((int) ((bits & (unsigned) (1 << n)) ? params[n] : '-'));
char *my_bold;
char *my_revs;
char *my_smso;
+ char *my_name = strdup(name);
if (db_list) {
putenv(next_dbitem());
}
+
if (!q_opt)
- printf("Terminal type \"%s\"\n", name);
- setupterm((NCURSES_CONST char *) name, 1, (int *) 0);
+ printf("Terminal type \"%s\"\n", my_name);
+
+ if (no_init) {
+ START_TRACE();
+ } else {
+ setupterm((NCURSES_CONST char *) my_name, 1, (int *) 0);
+ }
+
if (!q_opt) {
- if (strcmp(name, ttytype))
+ if (strcmp(my_name, ttytype))
printf("... actual \"%s\"\n", ttytype);
}
free(values[count]);
}
}
+ free(my_name);
del_curterm(cur_term);
}
"Options:",
" -d LIST colon-separated list of databases to use",
" -e NAME environment variable to set with -d option",
+ " -n do not initialize terminal, to test error-checking",
" -q quiet (prints only counts)",
};
unsigned n;
int n;
char *name;
- while ((n = getopt(argc, argv, "d:e:q")) != -1) {
+ while ((n = getopt(argc, argv, "d:e:nq")) != -1) {
switch (n) {
case 'd':
d_opt = optarg;
case 'e':
e_opt = optarg;
break;
+ case 'n':
+ no_init = TRUE;
+ break;
case 'q':
q_opt = TRUE;
break;