Bump version for v1.9.3 release

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>

ChangeLog.md

@@ -4,6 +4,29 @@ Change Log
 All notable changes to the project are documented in this file.
 
 
+[v1.9.3][] - 2017-10-24
+-----------------------
+
+### Changes
+- `initscr()`, use stdout, not stderr, like the rest of the
+  `conio.h` macros.  Also, stderr may be redirected by user
+- `tree()`, update unit test, use standard directries
+
+### Fixes
+- `initscr()`, verify that both stdin and stdout are real TTYs
+  before messing up output or blocking on input for the user
+- `tree()`, increase internal buffer slightly, output may be
+  truncated otherwise.  Found by GCC 7.2
+
+
+[v1.9.2][] - 2017-07-09
+-----------------------
+
+### Changes
+- Add `initscr()` function to query screen size
+- Convert `printheader()` to a static inline function
+
+
 [v1.9.1][] - 2017-07-03
 -----------------------
 
@@ -252,7 +275,8 @@ problems this may cause!
 Initial extraction of frog DNA from [Finit][].  See [README][] for API details.
 
 
-[UNRELEASED]: https://github.com/troglobit/libite/compare/v1.9.1...HEAD
+[UNRELEASED]: https://github.com/troglobit/libite/compare/v1.9.2...HEAD
+[v1.9.2]: https://github.com/troglobit/libite/compare/v1.9.1...v1.9.2
 [v1.9.1]: https://github.com/troglobit/libite/compare/v1.9.0...v1.9.1
 [v1.9.0]: https://github.com/troglobit/libite/compare/v1.8.3...v1.9.0
 [v1.8.3]: https://github.com/troglobit/libite/compare/v1.8.2...v1.8.3

Makefile.am

@@ -10,7 +10,7 @@ libite_la_SOURCES   = chomp.c copyfile.c dir.c fexist.c fisdir.c fmode.c fparsel
 
 libite_la_CPPFLAGS  = -D_GNU_SOURCE
 libite_la_CFLAGS    = -W -Wall -Wextra
-libite_la_LDFLAGS   = $(AM_LDFLAGS) -version-info 4:0:0
+libite_la_LDFLAGS   = $(AM_LDFLAGS) -version-info 4:1:0
 
 pkgconfigdir        = $(libdir)/pkgconfig
 pkgconfig_DATA      = libite.pc

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT(libite, 1.9.1, https://github.com/troglobit/libite/issues)
+AC_INIT(libite, 1.9.3, https://github.com/troglobit/libite/issues)
 AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
 AM_SILENT_RULES([yes])
 

conio.h

@@ -1,6 +1,6 @@
 /* A conio.h like implementation for VTANSI displays.
  *
- * Copyright (c) 2009-2013  Joachim Nilsson <troglobit@gmail.com>
+ * Copyright (c) 2009-2017  Joachim Nilsson <troglobit@gmail.com>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -19,6 +19,8 @@
 #define CONIO_H_
 
 #include <stdio.h>
+#include <termios.h>
+#include <unistd.h>
 
 /* Attributes */
 #define RESETATTR    0
@@ -49,35 +51,96 @@
 #define WHITE        0x17
 
 #ifndef SCREEN_WIDTH
-#define SCREEN_WIDTH 80		/* Override as #define SCREEN_WIDTH tty_width() */
+#define SCREEN_WIDTH 80		/* Override using, e.g. #define SCREEN_WIDTH tty_width() */
 #endif
 
 /* Esc[2JEsc[1;1H             - Clear screen and move cursor to 1,1 (upper left) pos. */
-#define clrscr()              fputs ("\033[2J\033[1;1H", stdout)
+#define clrscr()              fputs("\033[2J\033[1;1H", stdout)
 /* Esc[K                      - Erases from the current cursor position to the end of the current line. */
-#define clreol()              fputs ("\033[K", stdout)
+#define clreol()              fputs("\033[K", stdout)
 /* Esc[2K                     - Erases the entire current line. */
-#define delline()             fputs ("\033[2K", stdout)
+#define delline()             fputs("\033[2K", stdout)
 /* Esc[Line;ColumnH           - Moves the cursor to the specified position (coordinates) */
-#define gotoxy(x,y)           printf("\033[%d;%dH", y, x)
+#define gotoxy(x,y)           fprintf(stdout, "\033[%d;%dH", y, x)
 /* Esc[?25l (lower case L)    - Hide Cursor */
-#define hidecursor()          fputs ("\033[?25l", stdout)
+#define hidecursor()          fputs("\033[?25l", stdout)
 /* Esc[?25h (lower case H)    - Show Cursor */
-#define showcursor()          fputs ("\033[?25h", stdout)
+#define showcursor()          fputs("\033[?25h", stdout)
 
-/* Esc[Value;...;Valuem       - Set Graphics Mode */
+/* Esc[Value;...;Valuem       - Set Graphics Mode (attr, color, val) */
-#define __set_gm(attr,color,val)					\
+#define __set_gm(a,c,v)							\
-	if (!color)							\
+	if (!c)								\
-		printf("\033[%dm", attr);				\
+		fprintf(stdout, "\033[%dm", a);				\
 	else								\
-		printf("\033[%d;%dm", color & 0x10 ? 1 : 0, (color & 0xF) + val)
+		fprintf(stdout, "\033[%d;%dm", c & 0x10 ? 1 : 0, (c & 0xF) + v)
 #define textattr(attr)        __set_gm(attr, 0, 0)
 #define textcolor(color)      __set_gm(RESETATTR, color, 30)
 #define textbackground(color) __set_gm(RESETATTR, color, 40)
 
-#define printheader(fp, line, nl)					\
+/* Print table heading @line to @fp, with optional leading newline */
-	fprintf(fp ?: stdout, "%s\033[7m%s%*s\033[0m\n", nl ? "\n" : "",\
+static inline void printheader(FILE *fp, const char *line, int nl)
-		line, SCREEN_WIDTH - (int)strlen(line), "")
+{
+	fprintf(fp ?: stdout,
+		"%s\033[7m%s%*s\033[0m\n",
+		nl ? "\n" : "",
+		line, SCREEN_WIDTH - (int)strlen(line), "");
+}
+
+/* Requries: #inlude <termios.h> and #include <poll.h> */
+static inline void initscr(int *row, int *col)
+{
+	if (!row || !col)
+		return;
+
+#if defined(TCSANOW) && defined(POLLIN)
+	struct termios tc, saved;
+	struct pollfd fd = { STDIN_FILENO, POLLIN, 0 };
+
+	if (!isatty(STDIN_FILENO) || !isatty(STDOUT_FILENO)) {
+		*row = 24;
+		*col = 80;
+		return;
+	}
+
+	/* Disable echo to terminal while probing */
+	tcgetattr(STDOUT_FILENO, &tc);
+	saved = tc;
+	tc.c_cflag |= (CLOCAL | CREAD);
+	tc.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG);
+	tcsetattr(STDOUT_FILENO, TCSANOW, &tc);
+
+	/*
+	 * Save cursor pos+attr
+	 * Diable top+bottom margins
+	 * Set cursor at the far bottom,right pos
+	 * Query term for resulting pos
+	 */
+	fprintf(stdout, "\e7" "\e[r" "\e[999;999H" "\e[6n");
+	fflush(stdout);
+
+	/*
+	 * Wait here for terminal to echo back \e[row,lineR ...
+	 */
+	if (poll(&fd, 1, 300) <= 0 || scanf("\e[%d;%dR", row, col) != 2) {
+		*row = 24;
+		*col = 80;
+	}
+
+	/*
+	 * Restore above saved cursor pos+attr
+	 */
+	fprintf(stdout, "\e8");
+	fflush(stdout);
+
+	/* Restore terminal */
+	tcsetattr(STDOUT_FILENO, TCSANOW, &saved);
+
+	return;
+#else
+	*row = 24;
+	*col = 80;
+#endif
+}
 
 #endif /* CONIO_H_ */
 

debian/changelog

@@ -1,3 +1,15 @@
+libite (1.9.3-1) unstable; urgency=low
+
+  * New upstream release, v1.9.3, fixes to conio.h, initscr() and tree().
+
+ -- Joachim Nilsson <troglobit@gmail.com>  Tue, 24 Oct 2017 08:49:54 +0200
+
+libite (1.9.2-1) unstable; urgency=low
+
+  * New upstream reelase, v1.9.2, see upstream ChangeLog for details.
+
+ -- Joachim Nilsson <troglobit@gmail.com>  Tue, 15 Aug 2017 08:15:14 +0200
+
 libite (1.9.1-1) unstable; urgency=low
 
   * New upstream reelase, v1.9.1.

tests/tree.c

@@ -7,7 +7,7 @@ int main(void)
 	struct { char *path; int fail; } arr[] = {
 		{ "/etc/passwd", -1 },
 		{ "/dev",         0 },
-		{ "/sbin",        0 },
+		{ "/usr/sbin",    0 },
 	};
 
 	for (i = 0; i < NELEMS(arr); i++) {

tree.c

@@ -75,7 +75,7 @@ static int descend(char *path, int show_perms, char *pfx)
 	if (n) {
 		for (i = 0; i < n; i++) {
 			char t = ' ', p[14] = "", s[256] = "";
-			char buf[256];
+			char buf[512];
 			char dir[80];
 
 			if (i + 1 == n) {