diff options
author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2015-01-27 08:00:32 -0300 |
---|---|---|
committer | Peter Korsgaard <peter@korsgaard.com> | 2015-01-27 15:31:50 +0100 |
commit | bf838d06ff00bcc52f2885ac691721367a49f6c6 (patch) | |
tree | 02a8ef88a05f3c9fc288bedc0db9f0928e93ec23 /package/busybox/0003-vi.patch | |
parent | 74dd54bf73ad25eb29384b7e2ca9ee5a2760d448 (diff) | |
download | buildroot-bf838d06ff00bcc52f2885ac691721367a49f6c6.tar.gz buildroot-bf838d06ff00bcc52f2885ac691721367a49f6c6.zip |
busybox: bump to version 1.23.1
Removed patches are upstream.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/busybox/0003-vi.patch')
-rw-r--r-- | package/busybox/0003-vi.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/package/busybox/0003-vi.patch b/package/busybox/0003-vi.patch deleted file mode 100644 index be5457f5b3..0000000000 --- a/package/busybox/0003-vi.patch +++ /dev/null @@ -1,54 +0,0 @@ -Upstream http://busybox.net/downloads/fixes-1.23.0/busybox-1.23.0-vi.patch -post-release hotfix patch for vi crash when called without a filename. - -Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> - ---- busybox-1.23.0/editors/vi.c -+++ busybox-1.23.0-vi/editors/vi.c -@@ -542,9 +542,6 @@ static void cookmode(void); // return to - static int mysleep(int); - static int readit(void); // read (maybe cursor) key from stdin - static int get_one_char(void); // read 1 char from stdin --#if !ENABLE_FEATURE_VI_READONLY --#define file_insert(fn, p, update_ro_status) file_insert(fn, p) --#endif - // file_insert might reallocate text[]! - static int file_insert(const char *, char *, int); - static int file_write(char *, char *, char *); -@@ -1325,7 +1322,7 @@ static void colon(char *buf) - q = next_line(q); - { // dance around potentially-reallocated text[] - uintptr_t ofs = q - text; -- size = file_insert(fn, q, /*update_ro:*/ 0); -+ size = file_insert(fn, q, 0); - q = text + ofs; - } - if (size < 0) -@@ -2905,7 +2902,7 @@ static char *get_input_line(const char * - } - - // might reallocate text[]! --static int file_insert(const char *fn, char *p, int update_ro_status) -+static int file_insert(const char *fn, char *p, int initial) - { - int cnt = -1; - int fd, size; -@@ -2918,7 +2915,8 @@ static int file_insert(const char *fn, c - - fd = open(fn, O_RDONLY); - if (fd < 0) { -- status_line_bold_errno(fn); -+ if (!initial) -+ status_line_bold_errno(fn); - return cnt; - } - -@@ -2946,7 +2944,7 @@ static int file_insert(const char *fn, c - close(fd); - - #if ENABLE_FEATURE_VI_READONLY -- if (update_ro_status -+ if (initial - && ((access(fn, W_OK) < 0) || - /* root will always have access() - * so we check fileperms too */ |