From 2f261b38487b5e7e0112af60739de2d49e1ace48 Mon Sep 17 00:00:00 2001 From: Jonas 'Sortie' Termansen Date: Sat, 19 Oct 2013 21:12:12 +0200 Subject: [PATCH] Port column(1) to GNU and POSIX systems. --- utils/column.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/utils/column.cpp b/utils/column.cpp index 830d708b..58ef2614 100644 --- a/utils/column.cpp +++ b/utils/column.cpp @@ -21,6 +21,9 @@ *******************************************************************************/ #define _SORTIX_SOURCE + +#include + #include #include #include @@ -143,9 +146,18 @@ void version(const char* argv0) int main(int argc, char* argv[]) { +#if defined(__sortix__) struct winsize ws; if ( tcgetwinsize(1, &ws) == 0 ) termwidth = ws.ws_col; +#elif defined(TIOCGWINSZ) + struct winsize ws; + if ( ioctl(1, TIOCGWINSZ, &ws) == 0 ) + termwidth = ws.ws_col; +#else + if ( getenv("COLUMNS") ) + termwidth = atoi(getenv("COLUMNS")); +#endif const char* argv0 = argv[0];