tests/Makefile.am: remove needless comment

[babeltrace.git] / src / common / common.c

diff --git a/src/common/common.c b/src/common/common.c
index aef36b2802a5580df0afab1982e3337a8501eef4..d092768a147cf9a18bcabd001229d5966ff5fdfa 100644 (file)
--- a/src/common/common.c
+++ b/src/common/common.c
@@ -46,9 +46,10 @@
 
 #ifndef __MINGW32__
 #include <pwd.h>
+#include <sys/ioctl.h>
 #endif
 
-#define SYSTEM_PLUGIN_PATH     INSTALL_LIBDIR "/babeltrace2/plugins"
+#define SYSTEM_PLUGIN_PATH     BABELTRACE_PLUGINS_DIR
 #define HOME_ENV_VAR           "HOME"
 #define HOME_PLUGIN_SUBPATH    "/.local/lib/babeltrace2/plugins"
 
@@ -1114,9 +1115,7 @@ error:
                norm_path = NULL;
        }
 end:
-       if (tmp) {
-               free(tmp);
-       }
+       free(tmp);
        return norm_path;
 }
 #else
@@ -1791,3 +1790,35 @@ end:
 
        return folded;
 }
+
+#ifdef __MINGW32__
+BT_HIDDEN
+int bt_common_get_term_size(unsigned int *width, unsigned int *height)
+{
+       /* Not supported on Windows yet */
+       return -1;
+}
+#else /* __MINGW32__ */
+BT_HIDDEN
+int bt_common_get_term_size(unsigned int *width, unsigned int *height)
+{
+       int ret = 0;
+       struct winsize winsize;
+
+       if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &winsize) < 0) {
+               ret = -1;
+               goto end;
+       }
+
+       if (width) {
+               *width = (unsigned int) winsize.ws_col;
+       }
+
+       if (height) {
+               *height = (unsigned int) winsize.ws_row;
+       }
+
+end:
+       return ret;
+}
+#endif /* __MINGW32__ */