apk: improve indented printing

 * fixup the help messages to align up properly
 * refresh screen width on SIGWINCH

1 files changed, 22 insertions, 3 deletions

diff --git a/src/print.c b/src/print.c
index 260809e0ff..e673f1293a 100644
--- a/src/print.c
+++ b/src/print.c
@@ -14,15 +14,34 @@
 #include <unistd.h>
 #include <malloc.h>
 #include <errno.h>
+#include <sys/ioctl.h>
 
 #include "apk_defines.h"
 #include "apk_print.h"
 
-int apk_print_indented(struct apk_indent *i, apk_blob_t blob)
+static int apk_screen_width = 0;
+
+void apk_reset_screen_width(void)
+{
+	apk_screen_width = 0;
+}
+
+int apk_get_screen_width(void)
 {
-	static const int wrap_length = 80;
+	struct winsize w;
 
-	if (i->x + blob.len + 1 >= wrap_length) {
+	if (apk_screen_width == 0) {
+		apk_screen_width = 70;
+		if (ioctl(STDERR_FILENO,TIOCGWINSZ, &w) == 0)
+			apk_screen_width = w.ws_col;
+	}
+
+	return apk_screen_width;
+}
+
+int apk_print_indented(struct apk_indent *i, apk_blob_t blob)
+{
+	if (i->x + blob.len + 1 >= apk_get_screen_width()) {
 		i->x = i->indent;
 		printf("\n%*s", i->indent - 1, "");
 	}