summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorPetr Uzel2012-05-15 10:49:03 +0200
committerKarel Zak2012-05-15 11:32:53 +0200
commite872e32064b9ade685417f6a36af08dc2baa8694 (patch)
tree1057c8638d5b6d9a94363c73aed5bbc7550b6641 /lib
parentlibuuid: move read_all to include/all-io.h (diff)
downloadkernel-qcow2-util-linux-e872e32064b9ade685417f6a36af08dc2baa8694.tar.gz
kernel-qcow2-util-linux-e872e32064b9ade685417f6a36af08dc2baa8694.tar.xz
kernel-qcow2-util-linux-e872e32064b9ade685417f6a36af08dc2baa8694.zip
include: move get_terminal_width() to ttyutils.h
Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
Diffstat (limited to 'lib')
-rw-r--r--lib/tt.c28
1 files changed, 1 insertions, 27 deletions
diff --git a/lib/tt.c b/lib/tt.c
index 1b5fbacea..fe471d064 100644
--- a/lib/tt.c
+++ b/lib/tt.c
@@ -16,15 +16,13 @@
#include <string.h>
#include <termios.h>
#include <ctype.h>
-#ifdef HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
-#endif
#include "c.h"
#include "nls.h"
#include "widechar.h"
#include "tt.h"
#include "mbsalign.h"
+#include "ttyutils.h"
struct tt_symbols {
const char *branch;
@@ -253,30 +251,6 @@ int tt_line_set_data(struct tt_line *ln, int colnum, const char *data)
return 0;
}
-static int get_terminal_width(void)
-{
-#ifdef TIOCGSIZE
- struct ttysize t_win;
-#endif
-#ifdef TIOCGWINSZ
- struct winsize w_win;
-#endif
- const char *cp;
-
-#ifdef TIOCGSIZE
- if (ioctl (0, TIOCGSIZE, &t_win) == 0)
- return t_win.ts_cols;
-#endif
-#ifdef TIOCGWINSZ
- if (ioctl (0, TIOCGWINSZ, &w_win) == 0)
- return w_win.ws_col;
-#endif
- cp = getenv("COLUMNS");
- if (cp)
- return strtol(cp, NULL, 10);
- return 0;
-}
-
int tt_line_set_userdata(struct tt_line *ln, void *data)
{
if (!ln)