mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-01 07:28:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

main: Flush file in place of closing it, also do error reporting

Browse Source 
Apparently on travis OS X systems it crashes when cleaning up streams with
stdout closed:

    (lldb) bt all
    * thread #1: tid = 0x0000, 0x00007fff8703df06 libsystem_kernel.dylib`__pthread_kill + 10, stop reason = signal SIGSTOP
      * frame #0: 0x00007fff8703df06 libsystem_kernel.dylib`__pthread_kill + 10
        frame #1: 0x00007fff93a764ec libsystem_pthread.dylib`pthread_kill + 90
        frame #2: 0x00007fff97c056df libsystem_c.dylib`abort + 129
        frame #3: 0x00007fff97bccdd8 libsystem_c.dylib`__assert_rtn + 321
        frame #4: 0x0000000107a4e106 nvim`uv__close(fd=<unavailable>) + 102 at core.c:521
        frame #5: 0x0000000107a5307d nvim`uv__loop_close(loop=0x00007fff5847c018) + 77 at loop.c:118
        frame #6: 0x0000000107a4d149 nvim`uv_loop_close(loop=0x00007fff5847c018) + 57 at uv-common.c:626
        frame #7: 0x000000010783e5bc nvim`stream_set_blocking(fd=0, blocking=true) + 204 at stream.c:34
        frame #8: 0x000000010795d66b nvim`mch_exit(r=0) + 91 at os_unix.c:147
        frame #9: 0x00000001078d5663 nvim`command_line_scan(parmp=0x00007fff5847c760) + 1779 at main.c:787
        frame #10: 0x00000001078d4393 nvim`main(argc=2, argv=0x00007fff5847c898) + 163 at main.c:249
        frame #11: 0x00007fff8cdd65ad libdyld.dylib`start + 1
        frame #12: 0x00007fff8cdd65ad libdyld.dylib`start + 1
This commit is contained in:
ZyX
2017-07-04 19:48:26 +03:00
parent 28f6bd822b
commit 7109f63e3c
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/main.c
View File

@@ -783,7 +783,10 @@ static void command_line_scan(mparm_T *parmp)
msgpack_rpc_from_object(md, p); msgpack_rpc_from_object(md, p);
msgpack_packer_free(p); msgpack_packer_free(p);
file_close(&fp, false); const int ff_ret = file_flush(&fp);
if (ff_ret < 0) {
msgpack_file_write_error(ff_ret);
}
mch_exit(0); mch_exit(0);
} else if (STRICMP(argv[0] + argv_idx, "headless") == 0) { } else if (STRICMP(argv[0] + argv_idx, "headless") == 0) {
parmp->headless = true; parmp->headless = true;

15
src/nvim/os/fileio.c
View File

@@ -400,9 +400,18 @@ int msgpack_file_write(void *data, const char *buf, size_t len)
assert(len < PTRDIFF_MAX); assert(len < PTRDIFF_MAX);
const ptrdiff_t written_bytes = file_write((FileDescriptor *)data, buf, len); const ptrdiff_t written_bytes = file_write((FileDescriptor *)data, buf, len);
if (written_bytes < 0) { if (written_bytes < 0) {
emsgf(_("E5420: Failed to write to file: %s"), return msgpack_file_write_error((int)written_bytes);
os_strerror((int)written_bytes));
return -1;
} }
return 0; return 0;
} }
/// Print error which occurs when failing to write msgpack data
///
/// @param[in] error Error code of the error to print.
///
/// @return -1 (error return for msgpack_packer callbacks).
int msgpack_file_write_error(const int error)
{
emsgf(_("E5420: Failed to write to file: %s"), os_strerror(error));
return -1;
}