From c6483aa2fae07654f8a874a0c479916de33ec592 Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Fri, 23 May 2014 15:49:17 -0300 Subject: API: Bugfix: Fix loop condition in vim_list_runtime_paths --- src/nvim/api/vim.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/nvim/api/vim.c') diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c index 505844e651..5796d7bc0e 100644 --- a/src/nvim/api/vim.c +++ b/src/nvim/api/vim.c @@ -94,14 +94,12 @@ StringArray vim_list_runtime_paths(void) rtp++; } - // index - uint32_t i = 0; // Allocate memory for the copies rv.items = xmalloc(sizeof(String) * rv.size); // reset the position rtp = p_rtp; // Start copying - while (*rtp != NUL) { + for (size_t i = 0; i < rv.size && *rtp != NUL; i++) { rv.items[i].data = xmalloc(MAXPATHL); // Copy the path from 'runtimepath' to rv.items[i] int length = copy_option_part(&rtp, @@ -110,7 +108,6 @@ StringArray vim_list_runtime_paths(void) ","); assert(length >= 0); rv.items[i].size = (size_t)length; - i++; } return rv; -- cgit From 677d30d7966dd2766bbf20665791c568dacc427a Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Fri, 23 May 2014 15:49:19 -0300 Subject: API: Bugfix: Use 0-terminated string in vim_strwidth While the mb_string2cells function accepts a length parameter, it only seems to work properly with 0-terminated strings, since valgrind reports a conditional jump that depends on uninitialized values(means it reads after the string boundaries which could result in overflows or wrong results) --- src/nvim/api/vim.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/nvim/api/vim.c') diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c index 5796d7bc0e..1f335cf5e0 100644 --- a/src/nvim/api/vim.c +++ b/src/nvim/api/vim.c @@ -73,7 +73,10 @@ Integer vim_strwidth(String str, Error *err) return 0; } - return mb_string2cells((char_u *)str.data, (int)str.size); + char *buf = xstrndup(str.data, str.size); + Integer rv = mb_string2cells((char_u *)buf, -1); + free(buf); + return rv; } StringArray vim_list_runtime_paths(void) -- cgit From 399a0e37405a0f68ef3373c8ad9bcfa94ee0f649 Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Fri, 23 May 2014 15:49:21 -0300 Subject: API: Bugfix: Terminate directory string in vim_change_directory Also check that the string length is not equal or greater than MAXPATHL. --- src/nvim/api/vim.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/nvim/api/vim.c') diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c index 1f335cf5e0..8cf4fb04d7 100644 --- a/src/nvim/api/vim.c +++ b/src/nvim/api/vim.c @@ -118,8 +118,14 @@ StringArray vim_list_runtime_paths(void) void vim_change_directory(String dir, Error *err) { + if (dir.size >= MAXPATHL) { + set_api_error("directory string is too long", err); + return; + } + char string[MAXPATHL]; strncpy(string, dir.data, dir.size); + string[dir.size] = NUL; try_start(); -- cgit From 72e3125f452ae7224162da8e940e20b00680d41a Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Fri, 23 May 2014 15:49:25 -0300 Subject: API: Refactor: Move non-public files to private subdirectory --- src/nvim/api/vim.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/nvim/api/vim.c') diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c index 8cf4fb04d7..cfde53b0a8 100644 --- a/src/nvim/api/vim.c +++ b/src/nvim/api/vim.c @@ -4,8 +4,8 @@ #include #include "nvim/api/vim.h" -#include "nvim/api/helpers.h" -#include "nvim/api/defs.h" +#include "nvim/api/private/helpers.h" +#include "nvim/api/private/defs.h" #include "nvim/api/buffer.h" #include "nvim/vim.h" #include "nvim/buffer.h" -- cgit From f70f9bfac1ae62828d222bc6ccb528e6e93be523 Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Fri, 23 May 2014 15:49:42 -0300 Subject: API: Refactor: Change the integer type of remote objects to uint64_t --- src/nvim/api/vim.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'src/nvim/api/vim.c') diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c index cfde53b0a8..6e8840a003 100644 --- a/src/nvim/api/vim.c +++ b/src/nvim/api/vim.c @@ -142,17 +142,27 @@ void vim_change_directory(String dir, Error *err) String vim_get_current_line(Error *err) { - return buffer_get_line(curbuf->b_fnum, curwin->w_cursor.lnum - 1, err); + assert(curbuf->b_fnum >= 0); + return buffer_get_line((uint64_t)curbuf->b_fnum, + curwin->w_cursor.lnum - 1, + err); } void vim_set_current_line(String line, Error *err) { - buffer_set_line(curbuf->b_fnum, curwin->w_cursor.lnum - 1, line, err); + assert(curbuf->b_fnum >= 0); + buffer_set_line((uint64_t)curbuf->b_fnum, + curwin->w_cursor.lnum - 1, + line, + err); } void vim_del_current_line(Error *err) { - buffer_del_line(curbuf->b_fnum, curwin->w_cursor.lnum - 1, err); + assert(curbuf->b_fnum >= 0); + buffer_del_line((uint64_t)curbuf->b_fnum, + curwin->w_cursor.lnum - 1, + err); } Object vim_get_var(String name, Error *err) @@ -205,7 +215,8 @@ Integer vim_get_buffer_count(void) Buffer vim_get_current_buffer(void) { - return curbuf->b_fnum; + assert(curbuf->b_fnum >= 0); + return (uint64_t)curbuf->b_fnum; } void vim_set_current_buffer(Buffer buffer, Error *err) -- cgit From a842fe4dc1e0624a6332ee0fef40517e7925dfb4 Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Fri, 23 May 2014 15:49:44 -0300 Subject: API: Refactor: Return handles instead of indexes - Define specialized arrays for each remote object type - Implement msgpack_rpc functions for dealing with the new types - Refactor all functions dealing with buffers, windows and tabpages to return/accept handles instead of list indexes. --- src/nvim/api/vim.c | 104 ++++++++++++++++++++++++++--------------------------- 1 file changed, 51 insertions(+), 53 deletions(-) (limited to 'src/nvim/api/vim.c') diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c index 6e8840a003..d9a5ce1db5 100644 --- a/src/nvim/api/vim.c +++ b/src/nvim/api/vim.c @@ -142,27 +142,17 @@ void vim_change_directory(String dir, Error *err) String vim_get_current_line(Error *err) { - assert(curbuf->b_fnum >= 0); - return buffer_get_line((uint64_t)curbuf->b_fnum, - curwin->w_cursor.lnum - 1, - err); + return buffer_get_line(curbuf->handle, curwin->w_cursor.lnum - 1, err); } void vim_set_current_line(String line, Error *err) { - assert(curbuf->b_fnum >= 0); - buffer_set_line((uint64_t)curbuf->b_fnum, - curwin->w_cursor.lnum - 1, - line, - err); + buffer_set_line(curbuf->handle, curwin->w_cursor.lnum - 1, line, err); } void vim_del_current_line(Error *err) { - assert(curbuf->b_fnum >= 0); - buffer_del_line((uint64_t)curbuf->b_fnum, - curwin->w_cursor.lnum - 1, - err); + buffer_del_line(curbuf->handle, curwin->w_cursor.lnum - 1, err); } Object vim_get_var(String name, Error *err) @@ -200,33 +190,43 @@ void vim_err_write(String str) write_msg(str, true); } -Integer vim_get_buffer_count(void) +BufferArray vim_get_buffers(void) { + BufferArray rv = {.size = 0}; buf_T *b = firstbuf; - Integer n = 0; while (b) { - n++; + rv.size++; b = b->b_next; } - return n; + rv.items = xmalloc(sizeof(Buffer) * rv.size); + size_t i = 0; + b = firstbuf; + + while (b) { + rv.items[i++] = b->handle; + b = b->b_next; + } + + return rv; } Buffer vim_get_current_buffer(void) { - assert(curbuf->b_fnum >= 0); - return (uint64_t)curbuf->b_fnum; + return curbuf->handle; } void vim_set_current_buffer(Buffer buffer, Error *err) { - if (!find_buffer(buffer, err)) { + buf_T *buf = find_buffer(buffer, err); + + if (!buf) { return; } try_start(); - if (do_buffer(DOBUF_GOTO, DOBUF_FIRST, FORWARD, (int)buffer, 0) == FAIL) { + if (do_buffer(DOBUF_GOTO, DOBUF_FIRST, FORWARD, buf->b_fnum, 0) == FAIL) { if (try_end(err)) { return; } @@ -240,14 +240,21 @@ void vim_set_current_buffer(Buffer buffer, Error *err) try_end(err); } -Integer vim_get_window_count(void) +WindowArray vim_get_windows(void) { + WindowArray rv = {.size = 0}; tabpage_T *tp; win_T *wp; - Integer rv = 0; FOR_ALL_TAB_WINDOWS(tp, wp) { - rv++; + rv.size++; + } + + rv.items = xmalloc(sizeof(Window) * rv.size); + size_t i = 0; + + FOR_ALL_TAB_WINDOWS(tp, wp) { + rv.items[i++] = wp->handle; } return rv; @@ -255,20 +262,7 @@ Integer vim_get_window_count(void) Window vim_get_current_window(void) { - tabpage_T *tp; - win_T *wp; - Window rv = 1; - - FOR_ALL_TAB_WINDOWS(tp, wp) { - if (wp == curwin) { - return rv; - } - - rv++; - } - - // There should always be a current window - abort(); + return curwin->handle; } void vim_set_current_window(Window window, Error *err) @@ -280,7 +274,7 @@ void vim_set_current_window(Window window, Error *err) } try_start(); - win_goto(win); + goto_tabpage_win(win_find_tabpage(win), win); if (win != curwin) { if (try_end(err)) { @@ -293,14 +287,23 @@ void vim_set_current_window(Window window, Error *err) try_end(err); } -Integer vim_get_tabpage_count(void) +TabpageArray vim_get_tabpages(void) { + TabpageArray rv = {.size = 0}; tabpage_T *tp = first_tabpage; - Integer rv = 0; - while (tp != NULL) { + while (tp) { + rv.size++; + tp = tp->tp_next; + } + + rv.items = xmalloc(sizeof(Tabpage) * rv.size); + size_t i = 0; + tp = first_tabpage; + + while (tp) { + rv.items[i++] = tp->handle; tp = tp->tp_next; - rv++; } return rv; @@ -308,24 +311,19 @@ Integer vim_get_tabpage_count(void) Tabpage vim_get_current_tabpage(void) { - Tabpage rv = 1; - tabpage_T *t; - - for (t = first_tabpage; t != NULL && t != curtab; t = t->tp_next) { - rv++; - } - - return rv; + return curtab->handle; } void vim_set_current_tabpage(Tabpage tabpage, Error *err) { - if (!find_tab(tabpage, err)) { + tabpage_T *tp = find_tab(tabpage, err); + + if (!tp) { return; } try_start(); - goto_tabpage((int)tabpage); + goto_tabpage_tp(tp, true, true); try_end(err); } -- cgit From 9815688fbdeb7bc1f1a28b9d827b31eea4fe8cfb Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Fri, 23 May 2014 15:49:48 -0300 Subject: API: Refactor: Use macro for initializing all arrays --- src/nvim/api/vim.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/nvim/api/vim.c') diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c index d9a5ce1db5..694781e0a3 100644 --- a/src/nvim/api/vim.c +++ b/src/nvim/api/vim.c @@ -81,7 +81,7 @@ Integer vim_strwidth(String str, Error *err) StringArray vim_list_runtime_paths(void) { - StringArray rv = {.size = 0}; + StringArray rv = ARRAY_DICT_INIT; uint8_t *rtp = p_rtp; if (*rtp == NUL) { @@ -192,7 +192,7 @@ void vim_err_write(String str) BufferArray vim_get_buffers(void) { - BufferArray rv = {.size = 0}; + BufferArray rv = ARRAY_DICT_INIT; buf_T *b = firstbuf; while (b) { @@ -242,7 +242,7 @@ void vim_set_current_buffer(Buffer buffer, Error *err) WindowArray vim_get_windows(void) { - WindowArray rv = {.size = 0}; + WindowArray rv = ARRAY_DICT_INIT; tabpage_T *tp; win_T *wp; @@ -289,7 +289,7 @@ void vim_set_current_window(Window window, Error *err) TabpageArray vim_get_tabpages(void) { - TabpageArray rv = {.size = 0}; + TabpageArray rv = ARRAY_DICT_INIT; tabpage_T *tp = first_tabpage; while (tp) { -- cgit