From 6f5b3c1fa3e9554a26cbf6401366ff8b0f0506fe Mon Sep 17 00:00:00 2001
From: pfg <pfg@FreeBSD.org>
Date: Sun, 6 Mar 2016 21:32:54 +0000
Subject: Revert r296175 Undo update of libedit 2016-02-27

Something in libedit appears to be causing breakage in lldb38.
The changes are not generally huge but they are suficient to
to justify reverting for now.

Reported by:	novel, bapt
---
 lib/libedit/tokenizer.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'lib/libedit/tokenizer.c')

diff --git a/lib/libedit/tokenizer.c b/lib/libedit/tokenizer.c
index 23f940f..f5171c4 100644
--- a/lib/libedit/tokenizer.c
+++ b/lib/libedit/tokenizer.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tokenizer.c,v 1.24 2016/02/17 19:47:49 christos Exp $	*/
+/*	$NetBSD: tokenizer.c,v 1.22 2016/01/30 04:02:51 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)tokenizer.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: tokenizer.c,v 1.24 2016/02/17 19:47:49 christos Exp $");
+__RCSID("$NetBSD: tokenizer.c,v 1.22 2016/01/30 04:02:51 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 #include <sys/cdefs.h>
@@ -47,9 +47,8 @@ __FBSDID("$FreeBSD$");
 /*
  * tokenize.c: Bourne shell like tokenizer
  */
-#include <stdlib.h>
 #include <string.h>
-
+#include <stdlib.h>
 #include "histedit.h"
 #include "chartype.h"
 
@@ -416,10 +415,8 @@ FUN(tok,line)(TYPE(Tokenizer) *tok, const TYPE(LineInfo) *line,
 			Char **p;
 			tok->amax += AINCR;
 			p = tok_realloc(tok->argv, tok->amax * sizeof(*p));
-			if (p == NULL) {
-				tok->amax -= AINCR;
+			if (p == NULL)
 				return -1;
-			}
 			tok->argv = p;
 		}
 	}
-- 
cgit v1.1