aboutsummaryrefslogtreecommitdiff
path: root/coreutils/ls.c
diff options
context:
space:
mode:
authorandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2004-03-23 23:15:36 +0000
committerandersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277>2004-03-23 23:15:36 +0000
commit13b9522e731f023a34c232c6857d488d983de1e3 (patch)
treebe9b3406b9b0598d0bc42d6912a7855f7ee11819 /coreutils/ls.c
parente8673e9ded6d118d96bec43c7376d26f90857cae (diff)
downloadbusybox-w32-13b9522e731f023a34c232c6857d488d983de1e3.tar.gz
busybox-w32-13b9522e731f023a34c232c6857d488d983de1e3.tar.bz2
busybox-w32-13b9522e731f023a34c232c6857d488d983de1e3.zip
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 git-svn-id: svn://busybox.net/trunk/busybox@8656 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'coreutils/ls.c')
-rw-r--r--coreutils/ls.c2
1 files changed, 1 insertions, 1 deletions
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)
982 982
983#ifdef CONFIG_FEATURE_AUTOWIDTH 983#ifdef CONFIG_FEATURE_AUTOWIDTH
984 /* Obtain the terminal width. */ 984 /* Obtain the terminal width. */
985 get_terminal_width_height(0, &terminal_width, NULL); 985 get_terminal_width_height(fileno(stdout), &terminal_width, NULL);
986 /* Go one less... */ 986 /* Go one less... */
987 terminal_width--; 987 terminal_width--;
988#endif 988#endif