check if we are outputing to a tty

diff --git a/ChangeLog b/ChangeLog
index 6c230ed1af7a0a91a1d2bdd295fc7020113bd0d6..3f2cdd884a8c7d3d4bc11091e18fa848941263df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 30 14:24:53 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
+
+  * main/enquiry.c: modify listformatstring() to check if output is
+    being sent to a tty. If not and no COLUMNS is set use a width of 80
+
 Mon Aug 21 12:58:15 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
 
   * lib/lock.c, main/filesdb.c, main/archives.c, main/configure.c,

diff --git a/main/enquiry.c b/main/enquiry.c
index 0e614d31c7317c7c54400a4caa228958abc04115..679f6505de5664b310e1e93e613f7e48ac3ad4de 100644 (file)
--- a/main/enquiry.c
+++ b/main/enquiry.c
@@ -73,6 +73,8 @@ static const char* listformatstring() {
 
   if ((columns=getenv("COLUMNS")) && ((res=atoi(columns))>0))
     ws.ws_col=res;
+  else if (!isatty(fd))
+    ws.ws_col=80;
   else {
     if ((fd=open("/dev/tty",O_RDONLY))!=-1) {
       if (ioctl(fd, TIOCGWINSZ, &ws)==-1)