mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-18 17:28:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

job: Read job data line-wise.

Browse Source 
Only read up to the last newline in push_job_event().
This commit is contained in:
Scott Prager
2014-10-25 20:10:29 -04:00
committed by Thiago de Arruda
parent 50f1c5db25
commit 37cbafa5bb
1 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/nvim/eval.c
View File

@@ -453,6 +453,7 @@ static dictitem_T vimvars_var; /* variable used for v: */
typedef struct { typedef struct {
int id; int id;
char *name, *type, *received; char *name, *type, *received;
size_t received_len;
} JobEvent; } JobEvent;
#define JobEventFreer(x) #define JobEventFreer(x)
KMEMPOOL_INIT(JobEventPool, JobEvent, JobEventFreer) KMEMPOOL_INIT(JobEventPool, JobEvent, JobEventFreer)
@@ -19528,15 +19529,33 @@ char_u *do_string_sub(char_u *str, char_u *pat, char_u *sub, char_u *flags)
// JobActivity autocommands will execute vimscript code, so it must be executed // JobActivity autocommands will execute vimscript code, so it must be executed
// on Nvim main loop // on Nvim main loop
#define push_job_event(j, r, t) \ #define push_job_event(j, r, t, eof) \
do { \ do { \
JobEvent *event_data = kmp_alloc(JobEventPool, job_event_pool); \ JobEvent *event_data = kmp_alloc(JobEventPool, job_event_pool); \
event_data->received = NULL; \ event_data->received = NULL; \
size_t read_count = 0; \
if (r) { \ if (r) { \
size_t read_count = rstream_pending(r); \ if (eof) { \
event_data->received = xmalloc(read_count + 1); \ read_count = rstream_pending(r); \
} else { \
char *read = rstream_read_ptr(r); \
char *lastnl = xmemrchr(read, NL, rstream_pending(r)); \
if (lastnl) { \
read_count = (size_t) (lastnl - read) + 1; \
} else if (rstream_available(r) == 0) { \
/* No newline or room to grow; flush everything. */ \
read_count = rstream_pending(r); \
} \
} \
if (read_count == 0) { \
/* Either we're at EOF or we need to wait until next time */ \
/* to receive a '\n. */ \
kmp_free(JobEventPool, job_event_pool, event_data); \
return; \
} \
event_data->received_len = read_count; \
event_data->received = xmallocz(read_count); \
rstream_read(r, event_data->received, read_count); \ rstream_read(r, event_data->received, read_count); \
event_data->received[read_count] = NUL; \
} \ } \
event_data->id = job_id(j); \ event_data->id = job_id(j); \
event_data->name = job_data(j); \ event_data->name = job_data(j); \
@@ -19549,31 +19568,33 @@ char_u *do_string_sub(char_u *str, char_u *pat, char_u *sub, char_u *flags)
static void on_job_stdout(RStream *rstream, void *data, bool eof) static void on_job_stdout(RStream *rstream, void *data, bool eof)
{ {
if (!eof) { if (rstream_pending(rstream)) {
push_job_event(data, rstream, "stdout"); push_job_event(data, rstream, "stdout", eof);
} }
} }
static void on_job_stderr(RStream *rstream, void *data, bool eof) static void on_job_stderr(RStream *rstream, void *data, bool eof)
{ {
if (!eof) { if (rstream_pending(rstream)) {
push_job_event(data, rstream, "stderr"); push_job_event(data, rstream, "stderr", eof);
} }
} }
static void on_job_exit(Job *job, void *data) static void on_job_exit(Job *job, void *data)
{ {
push_job_event(job, NULL, "exit"); push_job_event(job, NULL, "exit", true);
} }
static void on_job_event(Event event) static void on_job_event(Event event)
{ {
JobEvent *data = event.data; JobEvent *data = event.data;
apply_job_autocmds(data->id, data->name, data->type, data->received); apply_job_autocmds(data->id, data->name, data->type,
data->received, data->received_len);
kmp_free(JobEventPool, job_event_pool, data); kmp_free(JobEventPool, job_event_pool, data);
} }
static void apply_job_autocmds(int id, char *name, char *type, char *received) static void apply_job_autocmds(int id, char *name, char *type,
char *received, size_t received_len)
{ {
// Create the list which will be set to v:job_data // Create the list which will be set to v:job_data
list_T *list = list_alloc(); list_T *list = list_alloc();