root
/
xz
mirror of https://git.tukaani.org/xz.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Tested using COLUMNS environment variable to avoid broken 

progress indicator but since COLUMNS isn't usually available,
the code was left commented out.
This commit is contained in:
Lasse Collin 2008-11-28 12:00:48 +02:00
parent ae65dcfde2
commit c7007ddf06
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/xz/message.c
View File

@ -147,6 +147,9 @@ message_init(const char *given_argv0)
// updating. // updating.
progress_automatic = isatty(STDERR_FILENO); progress_automatic = isatty(STDERR_FILENO);
// Commented out because COLUMNS is rarely exported to environment.
// Most users have at least 80 columns anyway, let's think something
// fancy here if enough people complain.
/* /*
if (progress_automatic) { if (progress_automatic) {
// stderr is a terminal. Check the COLUMNS environment // stderr is a terminal. Check the COLUMNS environment
@ -154,12 +157,13 @@ message_init(const char *given_argv0)
// doesn't exist or it has some unparseable value, we assume // doesn't exist or it has some unparseable value, we assume
// that the terminal is wide enough. // that the terminal is wide enough.
const char *columns_str = getenv("COLUMNS"); const char *columns_str = getenv("COLUMNS");
uint64_t columns; if (columns_str != NULL) {
if (columns_str != NULL char *endptr;
&& !str_to_uint64_raw(&columns, columns_str) const long columns = strtol(columns_str, &endptr, 10);
&& columns < 80) if (*endptr != '\0' || columns < 80)
progress_automatic = false; progress_automatic = false;
} }
}
*/ */
#ifdef SIGALRM #ifdef SIGALRM