From: hawk <hawk@pld-linux.org>
Date: Fri, 31 Oct 2008 18:08:47 +0000 (+0000)
Subject: - busybox 1.12.1 fix
X-Git-Tag: auto/th/busybox-1_12_2-1~4
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=15f6552cc5c2117b5b92eafd6b9d5c04ff5fa889;p=packages%2Fbusybox.git

- busybox 1.12.1 fix

Changed files:
    busybox-lineedit.patch -> 1.1
    busybox-vi.patch -> 1.1
---

diff --git a/busybox-lineedit.patch b/busybox-lineedit.patch
new file mode 100644
index 0000000..57583ef
--- /dev/null
+++ b/busybox-lineedit.patch
@@ -0,0 +1,13 @@
+diff -urpN busybox-1.12.1.orig/libbb/lineedit.c busybox-1.12.1/libbb/lineedit.c
+--- busybox-1.12.1.orig/libbb/lineedit.c	2008-09-28 20:04:20.000000000 +0200
++++ busybox-1.12.1/libbb/lineedit.c	2008-10-31 19:01:43.000000000 +0100
+@@ -1415,7 +1415,8 @@ int FAST_FUNC read_line_input(const char
+ 	if ((state->flags & SAVE_HISTORY) && state->hist_file)
+ 		load_history(state->hist_file);
+ #endif
+-	state->cur_history = state->cnt_history;
++	if (state->flags)
++		state->cur_history = state->cnt_history;
+ 
+ 	/* prepare before init handlers */
+ 	cmdedit_y = 0;  /* quasireal y, not true if line > xt*yt */
diff --git a/busybox-vi.patch b/busybox-vi.patch
new file mode 100644
index 0000000..2cce044
--- /dev/null
+++ b/busybox-vi.patch
@@ -0,0 +1,46 @@
+--- busybox-1.12.1/editors/vi.c	Sun Sep 28 20:04:29 2008
++++ busybox-1.12.1-vi/editors/vi.c	Thu Oct 30 23:54:30 2008
+@@ -291,6 +291,8 @@
+ #define INIT_G() do { \
+ 	SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+ 	last_file_modified = -1; \
++	/* "" but has space for 2 chars */ \
++	USE_FEATURE_VI_SEARCH(last_search_pattern = xzalloc(2);) \
+ } while (0)
+ 
+ 
+@@ -2974,7 +2976,7 @@
+ 	const char *msg = msg; // for compiler
+ 	char c1, *p, *q, *save_dot;
+ 	char buf[12];
+-	int dir = dir; // for compiler
++	int dir;
+ 	int cnt, i, j;
+ 
+ //	c1 = c; // quiet the compiler
+@@ -3316,7 +3318,7 @@
+ 		q = get_input_line(buf);	// get input line- use "status line"
+ 		if (q[0] && !q[1]) {
+ 			if (last_search_pattern[0])
+-			    last_search_pattern[0] = c;
++				last_search_pattern[0] = c;
+ 			goto dc3; // if no pat re-use old pat
+ 		}
+ 		if (q[0]) {       // strlen(q) > 1: new pat- save it and find
+@@ -3346,14 +3348,8 @@
+ 			do_cmd(c);
+ 		}				// repeat cnt
+  dc3:
+-		if (last_search_pattern == 0) {
+-			msg = "No previous regular expression";
+-			goto dc2;
+-		}
+-		if (last_search_pattern[0] == '/') {
+-			dir = FORWARD;	// assume FORWARD search
+-			p = dot + 1;
+-		}
++		dir = FORWARD;	// assume FORWARD search
++		p = dot + 1;
+ 		if (last_search_pattern[0] == '?') {
+ 			dir = BACK;
+ 			p = dot - 1;