 @@ -1,14 +1,14 @@
-/*	$NetBSD: history.c,v 1.38 2011/01/16 03:05:51 christos Exp $	*/
+/*	$NetBSD: history.c,v 1.39 2011/07/27 02:23:29 christos Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Christos Zoulas of Cornell University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,27 +27,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
 #if 0
 static char sccsid[] = "@(#)history.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: history.c,v 1.38 2011/01/16 03:05:51 christos Exp $");
+__RCSID("$NetBSD: history.c,v 1.39 2011/07/27 02:23:29 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 /*
  * hist.c: TYPE(History) access functions
  */
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #ifdef HAVE_VIS_H
 #include <vis.h>
 #else
 #include "np/vis.h"
 @@ -455,61 +455,63 @@ history_def_delete(history_t *h,
 	hp->next->prev = hp->prev;
 	h_free((ptr_t) evp->str);
 	h_free(hp);
 	h->cur--;
+}
 /* history_def_insert():
  *	Insert element with string str in the h list
  */
 private int
 history_def_insert(history_t *h, TYPE(HistEvent) *ev, const Char *str)
+{
 	hentry_t *c;
-	h->cursor = (hentry_t *) h_malloc(sizeof(hentry_t));
+	c = h_malloc(sizeof(*c));
-	if (h->cursor == NULL)
+	if (c == NULL)
 		goto oomem;
-	if ((h->cursor->ev.str = h_strdup(str)) == NULL) {
+	if ((c->ev.str = h_strdup(str)) == NULL) {
-		h_free((ptr_t)h->cursor);
+		h_free((ptr_t)c);
 		goto oomem;
+	}
-	h->cursor->data = NULL;
+	c->data = NULL;
-	h->cursor->ev.num = ++h->eventid;
+	c->ev.num = ++h->eventid;
-	h->cursor->next = h->list.next;
+	c->next = h->list.next;
-	h->cursor->prev = &h->list;
+	c->prev = &h->list;
-	h->list.next->prev = h->cursor;
+	h->list.next->prev = c;
-	h->list.next = h->cursor;
+	h->list.next = c;
 	h->cur++;
 	h->cursor = c;
-	*ev = h->cursor->ev;
+	*ev = c->ev;
 	return (0);
 oomem:
 	he_seterrev(ev, _HE_MALLOC_FAILED);
 	return (-1);
+}
 /* history_def_enter():
  *	Default function to enter an item in the history
  */
 private int
 history_def_enter(ptr_t p, TYPE(HistEvent) *ev, const Char *str)
+{
 	history_t *h = (history_t *) p;
 	if ((h->flags & H_UNIQUE) != 0 && h->list.next != &h->list &&
 	    Strcmp(h->list.next->ev.str, str) == 0)
 	    return (0);
 	if (history_def_insert(h, ev, str) == -1)
 		return (-1);	/* error, keep error message */
 	/*
          * Always keep at least one entry.
          * This way we don't have to check for the empty list.
          */
 	while (h->cur > h->max && h->cur > 0)
 		history_def_delete(h, ev, h->list.prev);
 	return (1);
+}
 @@ -541,26 +543,27 @@ history_def_init(ptr_t *p, TYPE(HistEven
+}
 /* history_def_clear():
  *	Default history cleanup function
  */
 private void
 history_def_clear(ptr_t p, TYPE(HistEvent) *ev)
+{
 	history_t *h = (history_t *) p;
 	while (h->list.prev != &h->list)
 		history_def_delete(h, ev, h->list.prev);
 	h->cursor = &h->list;
 	h->eventid = 0;
 	h->cur = 0;
+}
 /************************************************************************/
 /* history_init():
  *	Initialization function.
  */
 public TYPE(History) *
 @@ -784,56 +787,57 @@ done:
+}
 /* history_save():
  *	TYPE(History) save function
  */
 private int
 history_save(TYPE(History) *h, const char *fname)
+{
 	FILE *fp;
 	TYPE(HistEvent) ev;
 	int i = -1, retval;
 	size_t len, max_size;
-	char *ptr;
+	char *ptr, *str;
 #ifdef WIDECHAR
 	static ct_buffer_t conv;
 #endif
 	if ((fp = fopen(fname, "w")) == NULL)
 		return (-1);
 	if (fchmod(fileno(fp), S_IRUSR|S_IWUSR) == -1)
 		goto done;
 	if (fputs(hist_cookie, fp) == EOF)
 		goto done;
 	ptr = h_malloc(max_size = 1024);
 	if (ptr == NULL)
 		goto done;
 	for (i = 0, retval = HLAST(h, &ev);
 	    retval != -1;
 	    retval = HPREV(h, &ev), i++) {
-		len = Strlen(ev.str) * 4;
+		str = ct_encode_string(ev.str, &conv);
 		len = strlen(str) * 4;
 		if (len >= max_size) {
 			char *nptr;
 			max_size = (len + 1024) & ~1023;
 			nptr = h_realloc(ptr, max_size);
 			if (nptr == NULL) {
 				i = -1;
 				goto oomem;
+			}
 			ptr = nptr;
+		}
-		(void) strvis(ptr, ct_encode_string(ev.str, &conv), VIS_WHITE);
+		(void) strvis(ptr, str, VIS_WHITE);
 		(void) fprintf(fp, "%s\n", ptr);
+	}
 oomem:
 	h_free((ptr_t)ptr);
 done:
 	(void) fclose(fp);
 	return (i);
+}
 /* history_prev_event():
  *	Find the previous event, with number given
  */