From: Max Kellermann <max@duempel.org>
Date: Mon, 6 Oct 2008 12:55:31 +0000 (+0200)
Subject: wreadln: use memmove() instead of an temporary buffer
X-Git-Tag: v0.12_alpha1~57
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=62388ceda61d89a9a58c5ba6181150912f67b93a;p=ncmpc.git

wreadln: use memmove() instead of an temporary buffer

memmove() handles overlapping buffers well, we can use it to get room
for the inserted character.
---

diff --git a/src/wreadln.c b/src/wreadln.c
index f10b8c2..0bfc414 100644
--- a/src/wreadln.c
+++ b/src/wreadln.c
@@ -122,16 +122,11 @@ wreadln_insert_byte(struct wreadln *wr, gint key)
 {
 	if (strlen(wr->line + wr->cursor)) { /* if the cursor is */
 		/* not at the last pos */
-		gchar *tmp = NULL;
 		gsize rest = strlen(wr->line + wr->cursor) + 1;
 
-		tmp = g_malloc0(rest);
-		g_strlcpy (tmp, wr->line + wr->cursor, rest);
+		memmove(wr->line + wr->cursor + 1,
+			wr->line + wr->cursor, rest);
 		wr->line[wr->cursor] = key;
-		wr->line[wr->cursor + 1] = 0;
-		g_strlcat(&wr->line[wr->cursor + 1], tmp, rest);
-		g_free(tmp);
-		cursor_move_right(wr);
 	} else {
 		wr->line[wr->cursor + 1] = 0;
 		wr->line[wr->cursor] = key;