aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/event
diff options
context:
space:
mode:
authorJosh Rahm <joshuarahm@gmail.com>2025-02-05 23:09:29 +0000
committerJosh Rahm <joshuarahm@gmail.com>2025-02-05 23:09:29 +0000
commitd5f194ce780c95821a855aca3c19426576d28ae0 (patch)
treed45f461b19f9118ad2bb1f440a7a08973ad18832 /src/nvim/event
parentc5d770d311841ea5230426cc4c868e8db27300a8 (diff)
parent44740e561fc93afe3ebecfd3618bda2d2abeafb0 (diff)
downloadrneovim-rahm.tar.gz
rneovim-rahm.tar.bz2
rneovim-rahm.zip
Merge remote-tracking branch 'upstream/master' into mix_20240309HEADrahm
Diffstat (limited to 'src/nvim/event')
-rw-r--r--src/nvim/event/proc.c3
-rw-r--r--src/nvim/event/proc.h5
-rw-r--r--src/nvim/event/rstream.c6
-rw-r--r--src/nvim/event/socket.c2
-rw-r--r--src/nvim/event/stream.c1
5 files changed, 11 insertions, 6 deletions
diff --git a/src/nvim/event/proc.c b/src/nvim/event/proc.c
index 5ae3bd8c2d..37cb102d11 100644
--- a/src/nvim/event/proc.c
+++ b/src/nvim/event/proc.c
@@ -1,8 +1,10 @@
#include <assert.h>
#include <inttypes.h>
#include <signal.h>
+#include <string.h>
#include <uv.h>
+#include "klib/kvec.h"
#include "nvim/event/libuv_proc.h"
#include "nvim/event/loop.h"
#include "nvim/event/multiqueue.h"
@@ -13,6 +15,7 @@
#include "nvim/globals.h"
#include "nvim/log.h"
#include "nvim/main.h"
+#include "nvim/memory_defs.h"
#include "nvim/os/proc.h"
#include "nvim/os/pty_proc.h"
#include "nvim/os/shell.h"
diff --git a/src/nvim/event/proc.h b/src/nvim/event/proc.h
index f525d46f87..cd4d5913ac 100644
--- a/src/nvim/event/proc.h
+++ b/src/nvim/event/proc.h
@@ -4,6 +4,7 @@
#include <stddef.h>
#include "nvim/event/defs.h" // IWYU pragma: keep
+#include "nvim/os/os_defs.h"
#include "nvim/types_defs.h"
static inline Proc proc_init(Loop *loop, ProcType type, void *data)
@@ -21,8 +22,8 @@ static inline Proc proc_init(Loop *loop, ProcType type, void *data)
.argv = NULL,
.exepath = NULL,
.in = { .closed = false },
- .out = { .s.closed = false },
- .err = { .s.closed = false },
+ .out = { .s.closed = false, .s.fd = STDOUT_FILENO },
+ .err = { .s.closed = false, .s.fd = STDERR_FILENO },
.cb = NULL,
.closed = false,
.internal_close_cb = NULL,
diff --git a/src/nvim/event/rstream.c b/src/nvim/event/rstream.c
index 15bdc547d5..6304953029 100644
--- a/src/nvim/event/rstream.c
+++ b/src/nvim/event/rstream.c
@@ -1,7 +1,6 @@
#include <assert.h>
#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
+#include <string.h>
#include <uv.h>
#include "nvim/event/multiqueue.h"
@@ -9,7 +8,8 @@
#include "nvim/event/stream.h"
#include "nvim/log.h"
#include "nvim/macros_defs.h"
-#include "nvim/main.h"
+#include "nvim/memory.h"
+#include "nvim/memory_defs.h"
#include "nvim/os/os_defs.h"
#include "nvim/types_defs.h"
diff --git a/src/nvim/event/socket.c b/src/nvim/event/socket.c
index 1214c3e336..c340ef2826 100644
--- a/src/nvim/event/socket.c
+++ b/src/nvim/event/socket.c
@@ -33,7 +33,7 @@ int socket_watcher_init(Loop *loop, SocketWatcher *watcher, const char *endpoint
char *host_end = strrchr(addr, ':');
if (host_end && addr != host_end) {
- // Split user specified address into two strings, addr(hostname) and port.
+ // Split user specified address into two strings, addr (hostname) and port.
// The port part in watcher->addr will be updated later.
*host_end = NUL;
char *port = host_end + 1;
diff --git a/src/nvim/event/stream.c b/src/nvim/event/stream.c
index 71de6ee1ba..9c155b55ea 100644
--- a/src/nvim/event/stream.c
+++ b/src/nvim/event/stream.c
@@ -8,6 +8,7 @@
#include "nvim/event/loop.h"
#include "nvim/event/stream.h"
#include "nvim/log.h"
+#include "nvim/memory.h"
#include "nvim/types_defs.h"
#ifdef MSWIN
# include "nvim/os/os_win_console.h"