diff options
| author | Petr Uzel | 2012-05-15 10:49:04 +0200 |
|---|---|---|
| committer | Karel Zak | 2012-05-15 11:32:56 +0200 |
| commit | 597cfec51f117f47387c614ecfe478865ae38a1d (patch) | |
| tree | f689e6c9d96c79ae1eb60edecd7a350a367584ff /misc-utils/blkid.c | |
| parent | include: move get_terminal_width() to ttyutils.h (diff) | |
| download | kernel-qcow2-util-linux-597cfec51f117f47387c614ecfe478865ae38a1d.tar.gz kernel-qcow2-util-linux-597cfec51f117f47387c614ecfe478865ae38a1d.tar.xz kernel-qcow2-util-linux-597cfec51f117f47387c614ecfe478865ae38a1d.zip | |
blkid: use get_terminal_width() from ttyutils.h
Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
Diffstat (limited to 'misc-utils/blkid.c')
| -rw-r--r-- | misc-utils/blkid.c | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c index 6a7991f87..aec3528b4 100644 --- a/misc-utils/blkid.c +++ b/misc-utils/blkid.c @@ -16,11 +16,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <termios.h> #include <errno.h> -#ifdef HAVE_SYS_IOCTL_H -#include <sys/ioctl.h> -#endif #ifdef HAVE_GETOPT_H #include <getopt.h> #else @@ -45,6 +41,7 @@ extern int optind; #define STRTOXX_EXIT_CODE 4 /* strtoxx_or_err() */ #include "strutils.h" #include "closestream.h" +#include "ttyutils.h" const char *progname = "blkid"; @@ -124,30 +121,6 @@ static void safe_print(const char *cp, int len) } } -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 80; -} - static int pretty_print_word(const char *str, int max_len, int left_len, int overflow_nl) { |