diff options
| author | Karel Zak | 2016-06-09 11:39:24 +0200 |
|---|---|---|
| committer | Karel Zak | 2016-06-09 11:39:24 +0200 |
| commit | 58149472adcbd8f307e2ed9ff3892bd47fbe4658 (patch) | |
| tree | dd2795927d3faa2e986e89da66b1401445767824 /misc-utils/cal.c | |
| parent | build-sys: workaround for autoconf "present but cannot be compiled" (diff) | |
| download | kernel-qcow2-util-linux-58149472adcbd8f307e2ed9ff3892bd47fbe4658.tar.gz kernel-qcow2-util-linux-58149472adcbd8f307e2ed9ff3892bd47fbe4658.tar.xz kernel-qcow2-util-linux-58149472adcbd8f307e2ed9ff3892bd47fbe4658.zip | |
cal: cleanup non-ncurses build
Diffstat (limited to 'misc-utils/cal.c')
| -rw-r--r-- | misc-utils/cal.c | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/misc-utils/cal.c b/misc-utils/cal.c index 8405cd15f..280879382 100644 --- a/misc-utils/cal.c +++ b/misc-utils/cal.c @@ -88,7 +88,11 @@ static const char *Senter = "", *Sexit = ""; /* enter and exit standout mode */ # include <term.h> #endif -static int setup_terminal(char *term) +static int setup_terminal(char *term +#if !defined(HAVE_LIBNCURSES) && !defined(HAVE_LIBNCURSESW) + __attribute__((__unused__)) +#endif + ) { #if defined(HAVE_LIBNCURSES) || defined(HAVE_LIBNCURSESW) int ret; @@ -109,7 +113,11 @@ static void my_putstring(char *s) fputs(s, stdout); } -static const char *my_tgetstr(char *ss) +static const char *my_tgetstr(char *ss + #if !defined(HAVE_LIBNCURSES) && !defined(HAVE_LIBNCURSESW) + __attribute__((__unused__)) +#endif + ) { const char *ret = NULL; @@ -238,6 +246,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out); int main(int argc, char **argv) { struct tm *local_time; + char *term; time_t now; int ch = 0, yflag = 0, Yflag = 0; static struct cal_control ctl = { @@ -284,18 +293,14 @@ int main(int argc, char **argv) textdomain(PACKAGE); atexit(close_stdout); -#if defined(HAVE_LIBNCURSES) || defined(HAVE_LIBNCURSESW) - { - char *term = getenv("TERM"); - if (term) { - has_term = setup_terminal(term) == 0; - if (has_term) { - Senter = my_tgetstr("smso"); - Sexit = my_tgetstr("rmso"); - } + term = getenv("TERM"); + if (term) { + has_term = setup_terminal(term) == 0; + if (has_term) { + Senter = my_tgetstr("smso"); + Sexit = my_tgetstr("rmso"); } } -#endif /* * The traditional Unix cal utility starts the week at Sunday, |