Update ChangeLog and bump version for v1.17.0

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

.travis.yml

@@ -23,7 +23,7 @@ addons:
       description: "A small line editing library"
     notification_email: troglobit@gmail.com
     build_command_prepend: "./autogen.sh && ./configure --enable-sigstop --enable-terminal-bell"
-    build_command:   "make -j5"
+    build_command:   "make clean all"
     branch_pattern: dev
 
 # We don't store generated files (configure and Makefile) in GIT,
@@ -31,4 +31,4 @@ addons:
 script:
   - ./autogen.sh
   - ./configure --enable-sigstop --enable-terminal-bell 
-  - make -j5
+  - make clean all

ChangeLog.md

@@ -4,8 +4,23 @@ Change Log
 All notable changes to the project are documented in this file.
 
 
-[1.16.1] - 2019-06-07
----------------------
+[1.17.0][] - 2020-01-05
+-----------------------
+
+### Changes
+- Simple multi-line support by Dima Volynets, @dvolynets
+
+### Fixes
+- Fix return value from `read_history()` and `write_history()`, could
+  return `errno` instead of `EOF` to indicate error.  Now both functions
+  have uniform return values on error
+- Handle internal `realloc()` errors better.  Now memory is not leaked
+  if `realloc()` fails
+- Fix possible NULL pointer dereference in key binding lookup function
+
+
+[1.16.1][] - 2019-06-07
+-----------------------
 
 ### Changes
 - Major updates to the `editline.3` man page
@@ -222,7 +237,8 @@ Adaptations to Debian editline package.
 - First version, forked from Minix current 2008-06-06
 
 
-[UNRELEASED]:    https://github.com/troglobit/finit/compare/1.16.0...HEAD
+[UNRELEASED]:    https://github.com/troglobit/finit/compare/1.17.0...HEAD
+[1.17.0]:        https://github.com/troglobit/finit/compare/1.16.1...1.17.0
 [1.16.1]:        https://github.com/troglobit/finit/compare/1.16.0...1.16.1
 [1.16.0]:        https://github.com/troglobit/finit/compare/1.15.3...1.16.0
 [1.15.3]:        https://github.com/troglobit/finit/compare/1.15.2...1.15.3
@@ -240,9 +256,3 @@ Adaptations to Debian editline package.
 [Travis-CI]:     https://travis-ci.org/troglobit/uftpd
 [Coverity Scan]: https://scan.coverity.com/projects/2947
 [README.md]:     https://github.com/troglobit/editline/blob/master/README.md
-
-<!--
-  -- Local Variables:
-  -- mode: markdown
-  -- End:
-  -->

configure.ac

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

debian/changelog

@@ -1,3 +1,12 @@
+editline (1.17.0) unstable; urgency=medium
+
+  * Simple multi-line support
+  * Handle internal realloc() errors better
+  * Fix return value from read_history() and write_history()
+  * Fix potential NULL pointer dereference in key binging lookup
+
+ -- Joachim Nilsson <troglobit@gmail.com>  Sun, 05 Jan 2020 09:47:34 +0100
+
 editline (1.16.1) unstable; urgency=medium
 
   * Minor bug fix and documentation update release.

examples/cli.c

@@ -38,9 +38,9 @@ static char *my_rl_complete(char *token, int *match)
     int count = 0;
 
     for (i = 0; list[i]; i++) {
-	int partlen = strlen (token); /* Part of token */
+	int partlen = strlen(token); /* Part of token */
 
-	if (!strncmp (list[i], token, partlen)) {
+	if (!strncmp(list[i], token, partlen)) {
 	    index = i;
 	    matchlen = partlen;
 	    count ++;
@@ -49,7 +49,7 @@ static char *my_rl_complete(char *token, int *match)
 
     if (count == 1) {
 	*match = 1;
-	return strdup (list[index] + matchlen);
+	return strdup(list[index] + matchlen);
     }
 
     return NULL;
@@ -64,11 +64,14 @@ static int my_rl_list_possib(char *token, char ***av)
     for (num = 0; list[num]; num++)
 	;
 
-    copy = (char **) malloc (num * sizeof(char *));
+    if (!num)
+	return 0;
+
+    copy = malloc(num * sizeof(char *));
     for (i = 0; i < num; i++) {
-	if (!strncmp (list[i], token, strlen (token))) {
-	    copy[total] = strdup (list[i]);
-	    total ++;
+	if (!strncmp(list[i], token, strlen (token))) {
+	    copy[total] = strdup(list[i]);
+	    total++;
 	}
     }
     *av = copy;
@@ -106,14 +109,41 @@ el_status_t do_suspend(void)
 
 static void breakit(int signo)
 {
+    (void)signo;
     puts("Got SIGINT");
 }
 
+/* Use el_no_echo when reading passwords and similar */
+static int unlock(const char *passwd)
+{
+    char *prompt = "Enter password: ";
+    char *line;
+    int rc = 1;
+
+    el_no_echo = 1;
+
+    while ((line = readline(prompt))) {
+	rc = strncmp(line, passwd, strlen(passwd));
+	free(line);
+
+	if (rc) {
+	    printf("\nWrong password, please try again, it's secret.\n");
+	    continue;
+	}
+
+	printf("\nAchievement unlocked!\n");
+	break;
+    }
+
+    el_no_echo = 0;
+
+    return rc;
+}
+
 int main(void)
 {
     char *line;
     char *prompt = "cli> ";
-    char *passwd = "Enter password: ";
 
     signal(SIGINT, breakit);
 
@@ -126,30 +156,12 @@ int main(void)
     read_history(HISTORY);
 
     while ((line = readline(prompt))) {
-	int next = 0;
-
-	/* Use el_no_echo when reading passwords and similar */
-	if (!strncmp(line, "unlock", 6)) {
-	    el_no_echo = 1;
-	    while ((line = readline(passwd))) {
-		if (strncmp(line, "secret", 6)) {
-		    printf("\nWrong password, please try again, it's secret.\n");
-		    free(line);
-		    continue;
-		}
-
-		el_no_echo = 0;
-
-		printf("\nAchievement unlocked!\n");
-		free(line);
-		next = 1;
-		break;
-	    }
+	if (!strncmp(line, "unlock", 6) && unlock("secret")) {
+	    free(line);
+	    fprintf(stderr, "\nSecurity breach, user logged out!\n");
+	    break;
 	}
 
-	if (next)
-	    continue;
-
 	if (*line != '\0')
 	    printf("\t\t\t|%s|\n", line);
  	free(line);

src/Makefile.am

@@ -3,4 +3,4 @@ libeditline_la_SOURCES  = editline.c editline.h complete.c sysunix.c unix.h
 libeditline_la_CFLAGS   = -std=gnu99
 libeditline_la_CFLAGS  += -W -Wall -Wextra -Wundef -Wunused -Wstrict-prototypes
 libeditline_la_CFLAGS  += -Werror-implicit-function-declaration -Wshadow -Wcast-qual
-libeditline_la_LDFLAGS  = $(AM_LDFLAGS) -version-info 1:1:0
+libeditline_la_LDFLAGS  = $(AM_LDFLAGS) -version-info 1:2:0