diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2014-06-14 13:15:07 -0400 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2014-07-14 09:04:54 -0400 |
commit | 180c84ed378e694ebcd14198a7436e01462d2c4d (patch) | |
tree | 899919991e7586a279d4704e9904afc602544494 /src/nvim/ex_cmds.c | |
parent | bf6b0e3c0aa34beca13eee898decdf0fcde8b502 (diff) | |
download | rneovim-180c84ed378e694ebcd14198a7436e01462d2c4d.tar.gz rneovim-180c84ed378e694ebcd14198a7436e01462d2c4d.tar.bz2 rneovim-180c84ed378e694ebcd14198a7436e01462d2c4d.zip |
os_open: impl mch_open with libuv. ref #133
- use return value instead of open_req.result
- libuv uv_fs_open() returns `-errno` instead of always -1
- libuv always sets open_req.result to the return value, _except_ for OOM
where it only sets the return value. So always use the return value.
- replace calls to mch_open macro.
- update call sites expecting -1 error
Diffstat (limited to 'src/nvim/ex_cmds.c')
-rw-r--r-- | src/nvim/ex_cmds.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index d8cd7961fb..78325fd4a4 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -1575,19 +1575,19 @@ void write_viminfo(char_u *file, int forceit) if (tempname != NULL) { int fd; - /* Use mch_open() to be able to use O_NOFOLLOW and set file + /* Use os_open() to be able to use O_NOFOLLOW and set file * protection: * Unix: same as original file, but strip s-bit. Reset umask to * avoid it getting in the way. * Others: r&w for user only. */ # ifdef UNIX umask_save = umask(0); - fd = mch_open((char *)tempname, + fd = os_open((char *)tempname, O_CREAT|O_EXCL|O_WRONLY|O_NOFOLLOW, (int)((old_info.stat.st_mode & 0777) | 0600)); (void)umask(umask_save); # else - fd = mch_open((char *)tempname, + fd = os_open((char *)tempname, O_CREAT|O_EXCL|O_WRONLY|O_NOFOLLOW, 0600); # endif if (fd < 0) |