aboutsummaryrefslogtreecommitdiff
path: root/src/libutil
diff options
context:
space:
mode:
authorHarald van Dijk <harald@gigawatt.nl>2019-11-03 21:46:59 +0000
committerHarald van Dijk <harald@gigawatt.nl>2019-11-03 21:46:59 +0000
commitc935ad3f025d5c3d8026711a1eb50b2917b61d59 (patch)
tree9c86acc0c9b6ed56cf7d6f5d3b35c75ed4540d2f /src/libutil
parent06f9364e5ff3f32e23a82cc9aa166fb47fa9d43c (diff)
Fix progress bar when nix-prefetch-url is piped.
The intent of the code was that if the window size cannot be determined, it would be treated as having the maximum possible size. Because of a missing assignment, it was actually treated as having a width of 0. The reason the width could not be determined was because it was obtained from stdout, not stderr, even though the printing was done to stderr. This commit addresses both issues.
Diffstat (limited to 'src/libutil')
-rw-r--r--src/libutil/util.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libutil/util.cc b/src/libutil/util.cc
index 2a1272885..d29802bcd 100644
--- a/src/libutil/util.cc
+++ b/src/libutil/util.cc
@@ -1467,7 +1467,7 @@ static Sync<std::pair<unsigned short, unsigned short>> windowSize{{0, 0}};
static void updateWindowSize()
{
struct winsize ws;
- if (ioctl(1, TIOCGWINSZ, &ws) == 0) {
+ if (ioctl(2, TIOCGWINSZ, &ws) == 0) {
auto windowSize_(windowSize.lock());
windowSize_->first = ws.ws_row;
windowSize_->second = ws.ws_col;