From 97310d025390e96f34140cff13034fcd2b5da18f Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Tue, 23 Mar 2004 23:15:36 +0000 Subject: Brian Pomerantz writes: I've noticed a bug in the "autowidth" feature more, and is probably in others. The call to the function get_terminal_width_height() passes in a file descriptor but that file descriptor is never used, instead the ioctl() is called with 0. In more_main() the call to get_terminal_width_height() passes 0 as the file descriptor instead of fileno(cin). This isn't a problem when you more a file (e.g. "more /etc/passwd") but when you pipe a file to it (e.g. "cat /etc/passwd | more") the size of the terminal cannot be determined because file descriptor 0 is not a terminal. The fix is simple, I've attached a patch for more.c and get_terminal_width_height.c. BAPper --- coreutils/ls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coreutils/ls.c') diff --git a/coreutils/ls.c b/coreutils/ls.c index f7fa9a110..8b5065ac6 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c @@ -982,7 +982,7 @@ extern int ls_main(int argc, char **argv) #ifdef CONFIG_FEATURE_AUTOWIDTH /* Obtain the terminal width. */ - get_terminal_width_height(0, &terminal_width, NULL); + get_terminal_width_height(fileno(stdout), &terminal_width, NULL); /* Go one less... */ terminal_width--; #endif -- cgit v1.2.3