diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-01-16 22:02:57 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-01-16 22:02:57 +0100 |
commit | 4cf7679383dca81a4a351e2b0ec333c95d6d9085 (patch) | |
tree | f439fad1b13e7dc676001386bc072fe2ee31315e /src | |
parent | 58adb14739fa240ca6020cede9ab1f1cb07bd90a (diff) |
patch 7.4.1109v7.4.1109
Problem: MS-Windows doesn't have rmdir().
Solution: Add mch_rmdir().
Diffstat (limited to 'src')
-rw-r--r-- | src/os_win32.c | 24 | ||||
-rw-r--r-- | src/proto/os_win32.pro | 1 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 27 insertions, 0 deletions
diff --git a/src/os_win32.c b/src/os_win32.c index c5b23ca7db..a47ffaf18a 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -3154,6 +3154,30 @@ mch_mkdir(char_u *name) } /* + * Delete directory "name". + * Return 0 on success, -1 on error. + */ + int +mch_rmdir(char_u *name) +{ +#ifdef FEAT_MBYTE + if (enc_codepage >= 0 && (int)GetACP() != enc_codepage) + { + WCHAR *p; + int retval; + + p = enc_to_utf16(name, NULL); + if (p == NULL) + return -1; + retval = _wrmdir(p); + vim_free(p); + return retval; + } +#endif + return _rmdir(name); +} + +/* * Return TRUE if file "fname" has more than one link. */ int diff --git a/src/proto/os_win32.pro b/src/proto/os_win32.pro index e6fce88a3b..7cdd15677a 100644 --- a/src/proto/os_win32.pro +++ b/src/proto/os_win32.pro @@ -22,6 +22,7 @@ void mch_hide __ARGS((char_u *name)); int mch_ishidden __ARGS((char_u *name)); int mch_isdir __ARGS((char_u *name)); int mch_mkdir __ARGS((char_u *name)); +int mch_rmdir __ARGS((char_u *name)); int mch_is_hard_link __ARGS((char_u *fname)); int mch_is_symbolic_link __ARGS((char_u *fname)); int mch_is_linked __ARGS((char_u *fname)); diff --git a/src/version.c b/src/version.c index 1a61df43a0..2767f1d820 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1109, +/**/ 1108, /**/ 1107, |