diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-04-08 17:20:25 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-04-11 02:41:05 +0200 |
| commit | 507bda1c95cdac2886f64e59aa6bbf85c3fac389 (patch) | |
| tree | 7e34913e3b802e40e7f9aaa765e13b9d4cc6ac86 /src/nvim/msgpack_rpc/server.c | |
| parent | 7362ca44305d11c41d0dee14f49d0ac248abacf8 (diff) | |
| download | rneovim-507bda1c95cdac2886f64e59aa6bbf85c3fac389.tar.gz rneovim-507bda1c95cdac2886f64e59aa6bbf85c3fac389.tar.bz2 rneovim-507bda1c95cdac2886f64e59aa6bbf85c3fac389.zip | |
server: introduce --listen, deprecate $NVIM_LISTEN_ADDRESS
Diffstat (limited to 'src/nvim/msgpack_rpc/server.c')
| -rw-r--r-- | src/nvim/msgpack_rpc/server.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/nvim/msgpack_rpc/server.c b/src/nvim/msgpack_rpc/server.c index 4d0e6b07a0..abff5cfe4f 100644 --- a/src/nvim/msgpack_rpc/server.c +++ b/src/nvim/msgpack_rpc/server.c @@ -32,24 +32,26 @@ static garray_T watchers = GA_EMPTY_INIT_VALUE; #endif /// Initializes the module -bool server_init(void) +bool server_init(const char *listen_address) { ga_init(&watchers, sizeof(SocketWatcher *), 1); bool must_free = false; - const char *listen_address = os_getenv(LISTEN_ADDRESS_ENV_VAR); if (listen_address == NULL) { - must_free = true; - listen_address = server_address_new(); - } - - if (!listen_address) { - return false; + // Deprecated: $NVIM_LISTEN_ADDRESS + listen_address = os_getenv(LISTEN_ADDRESS_ENV_VAR); + if (listen_address == NULL) { + must_free = true; + listen_address = server_address_new(); + if (listen_address == NULL) { + return false; + } + } } bool ok = (server_start(listen_address) == 0); if (must_free) { - xfree((char *) listen_address); + xfree((char *)listen_address); } return ok; } |