public
Last active

symlinkfix-update.diff

  • Download Gist
symlinkfix-update.diff
Diff
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452
diff --git a/src/fileio.c b/src/fileio.c
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3778,12 +3778,12 @@
}
}
-# ifdef UNIX
/*
* Break symlinks and/or hardlinks if we've been asked to.
*/
if ((bkc_flags & BKC_BREAKSYMLINK) || (bkc_flags & BKC_BREAKHARDLINK))
{
+# ifdef UNIX
int lstat_res;
lstat_res = mch_lstat((char *)fname, &st);
@@ -3799,8 +3799,18 @@
&& st_old.st_nlink > 1
&& (lstat_res != 0 || st.st_ino == st_old.st_ino))
backup_copy = FALSE;
- }
-#endif
+# elif defined(WIN32)
+ /* Symlinks. */
+ if ((bkc_flags & BKC_BREAKSYMLINK)
+ && mch_is_symbolic_link(fname))
+ backup_copy = FALSE;
+
+ /* Hardlinks. */
+ if ((bkc_flags & BKC_BREAKHARDLINK)
+ && mch_is_hard_link(fname))
+ backup_copy = FALSE;
+# endif
+ }
#endif
diff --git a/src/os_win32.c b/src/os_win32.c
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -72,6 +72,16 @@
# endif
#endif
+/*
+ * Reparse Point
+ */
+#ifndef FILE_ATTRIBUTE_REPARSE_POINT
+# define FILE_ATTRIBUTE_REPARSE_POINT 0x00000400
+#endif
+#ifndef IO_REPARSE_TAG_SYMLINK
+# define IO_REPARSE_TAG_SYMLINK 0xA000000C
+#endif
+
/* Record all output and all keyboard & mouse input */
/* #define MCH_WRITE_DUMP */
@@ -208,6 +218,10 @@
static char *vimrun_path = "vimrun ";
#endif
+static int win32_getattrs(char_u *name);
+static int win32_setattrs(char_u *name, int attrs);
+static int win32_set_archive(char_u *name);
+
#ifndef FEAT_GUI_W32
static int suppress_winsize = 1; /* don't fiddle with console */
#endif
@@ -2568,57 +2582,54 @@
/*
* get file permissions for `name'
* -1 : error
- * else FILE_ATTRIBUTE_* defined in winnt.h
+ * else mode_t
*/
long
mch_getperm(char_u *name)
{
-#ifdef FEAT_MBYTE
- if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
- {
- WCHAR *p = enc_to_utf16(name, NULL);
- long n;
-
- if (p != NULL)
- {
- n = (long)GetFileAttributesW(p);
- vim_free(p);
- if (n >= 0 || GetLastError() != ERROR_CALL_NOT_IMPLEMENTED)
- return n;
- /* Retry with non-wide function (for Windows 98). */
- }
- }
-#endif
- return (long)GetFileAttributes((char *)name);
+ struct stat st;
+ int n;
+
+ n = mch_stat(name, &st);
+ return n == 0 ? (int)st.st_mode : -1;
}
/*
* set file permission for `name' to `perm'
+ *
+ * return FAIL for failure, OK otherwise
*/
int
mch_setperm(
char_u *name,
long perm)
{
- perm |= FILE_ATTRIBUTE_ARCHIVE; /* file has changed, set archive bit */
+ long n;
#ifdef FEAT_MBYTE
+ WCHAR *p;
if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
{
- WCHAR *p = enc_to_utf16(name, NULL);
- long n;
+ p = enc_to_utf16(name, NULL);
if (p != NULL)
{
- n = (long)SetFileAttributesW(p, perm);
+ n = _wchmod(p, perm);
vim_free(p);
- if (n || GetLastError() != ERROR_CALL_NOT_IMPLEMENTED)
- return n ? OK : FAIL;
+ if (n == -1 && GetLastError() != ERROR_CALL_NOT_IMPLEMENTED)
+ return FAIL;
/* Retry with non-wide function (for Windows 98). */
}
}
+ if (p == NULL)
#endif
- return SetFileAttributes((char *)name, perm) ? OK : FAIL;
+ n = _chmod(name, perm);
+ if (n == -1)
+ return FAIL;
+
+ win32_set_archive(name);
+
+ return OK;
}
/*
@@ -2627,49 +2638,12 @@
void
mch_hide(char_u *name)
{
- int perm;
-#ifdef FEAT_MBYTE
- WCHAR *p = NULL;
-
- if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
- p = enc_to_utf16(name, NULL);
-#endif
-
-#ifdef FEAT_MBYTE
- if (p != NULL)
- {
- perm = GetFileAttributesW(p);
- if (perm < 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
- {
- /* Retry with non-wide function (for Windows 98). */
- vim_free(p);
- p = NULL;
- }
- }
- if (p == NULL)
-#endif
- perm = GetFileAttributes((char *)name);
- if (perm >= 0)
- {
- perm |= FILE_ATTRIBUTE_HIDDEN;
-#ifdef FEAT_MBYTE
- if (p != NULL)
- {
- if (SetFileAttributesW(p, perm) == 0
- && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
- {
- /* Retry with non-wide function (for Windows 98). */
- vim_free(p);
- p = NULL;
- }
- }
- if (p == NULL)
-#endif
- SetFileAttributes((char *)name, perm);
- }
-#ifdef FEAT_MBYTE
- vim_free(p);
-#endif
+ int attrs = win32_getattrs(name);
+ if (attrs == -1)
+ return;
+
+ attrs |= FILE_ATTRIBUTE_HIDDEN;
+ win32_setattrs(name, attrs);
}
/*
@@ -2679,7 +2653,7 @@
int
mch_isdir(char_u *name)
{
- int f = mch_getperm(name);
+ int f = win32_getattrs(name);
if (f == -1)
return FALSE; /* file does not exist at all */
@@ -2715,12 +2689,86 @@
* Return TRUE if file "fname" has more than one link.
*/
int
+mch_is_hard_link(char_u *fname)
+{
+ BY_HANDLE_FILE_INFORMATION info;
+
+ return win32_fileinfo(fname, &info) == FILEINFO_OK
+ && info.nNumberOfLinks > 1;
+}
+
+/*
+ * Return TRUE if file "fname" is a symbolic link.
+ */
+ int
+mch_is_symbolic_link(char_u *fname)
+{
+ HANDLE hFind;
+ int res = FALSE;
+ WIN32_FIND_DATAA findDataA;
+ DWORD fileFlags = 0, reparseTag = 0;
+#ifdef FEAT_MBYTE
+ WCHAR *wn = NULL;
+ WIN32_FIND_DATAW findDataW;
+
+ if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+ {
+ wn = enc_to_utf16(fname, NULL);
+ }
+ if (wn != NULL)
+ {
+ hFind = FindFirstFileW(wn, &findDataW);
+ vim_free(wn);
+ if (hFind == INVALID_HANDLE_VALUE
+ && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
+ {
+ /* Retry with non-wide function (for Windows 98). */
+
+ hFind = FindFirstFile(fname, &findDataA);
+ if (hFind != INVALID_HANDLE_VALUE)
+ {
+ fileFlags = findDataA.dwFileAttributes;
+ reparseTag = findDataA.dwReserved0;
+ }
+ }
+ else
+ {
+ fileFlags = findDataW.dwFileAttributes;
+ reparseTag = findDataW.dwReserved0;
+ }
+ }
+#else
+ hFind = FindFirstFile(fname, &findDataA);
+ if (hFind != INVALID_HANDLE_VALUE)
+ {
+ fileFlags = findDataA.dwFileAttributes;
+ reparseTag = findDataA.dwReserved0;
+ }
+#endif
+
+ if (hFind != INVALID_HANDLE_VALUE)
+ FindClose(hFind);
+
+ if ((fileFlags & FILE_ATTRIBUTE_REPARSE_POINT)
+ && reparseTag == IO_REPARSE_TAG_SYMLINK)
+ res = TRUE;
+
+ return res;
+}
+
+/*
+ * Return TRUE if file "fname" has more than one link or if it is a symbolic link.
+ */
+ int
mch_is_linked(char_u *fname)
{
- BY_HANDLE_FILE_INFORMATION info;
-
- return win32_fileinfo(fname, &info) == FILEINFO_OK
- && info.nNumberOfLinks > 1;
+ if (mch_is_hard_link(fname))
+ return TRUE;
+
+ if (mch_is_symbolic_link(fname))
+ return TRUE;
+
+ return FALSE;
}
/*
@@ -2787,6 +2835,92 @@
}
/*
+ * get file attributes for `name'
+ * -1 : error
+ * else FILE_ATTRIBUTE_* defined in winnt.h
+ */
+ static
+ int
+win32_getattrs(char_u *name)
+{
+ int attr;
+#ifdef FEAT_MBYTE
+ WCHAR *p = NULL;
+
+ if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+ p = enc_to_utf16(name, NULL);
+
+ if (p != NULL)
+ {
+ attr = GetFileAttributesW(p);
+ if (attr < 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
+ {
+ /* Retry with non-wide function (for Windows 98). */
+ vim_free(p);
+ p = NULL;
+ }
+ }
+ if (p == NULL)
+#endif
+ attr = GetFileAttributes((char *)name);
+#ifdef FEAT_MBYTE
+ vim_free(p);
+#endif
+ return attr;
+}
+
+/*
+ * set file attributes for `name' to `attrs'
+ *
+ * return -1 for failure, 0 otherwise
+ */
+ static
+ int
+win32_setattrs(char_u *name, int attrs)
+{
+ int res;
+#ifdef FEAT_MBYTE
+ WCHAR *p = NULL;
+
+ if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+ p = enc_to_utf16(name, NULL);
+
+ if (p != NULL)
+ {
+ res = SetFileAttributesW(p, attrs);
+ if (res == FALSE
+ && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
+ {
+ /* Retry with non-wide function (for Windows 98). */
+ vim_free(p);
+ p = NULL;
+ }
+ }
+ if (p == NULL)
+#endif
+ res = SetFileAttributes((char *)name, attrs);
+#ifdef FEAT_MBYTE
+ vim_free(p);
+#endif
+ return res ? 0 : -1;
+}
+
+/*
+ * Set archive flag for "name".
+ */
+ static
+ int
+win32_set_archive(char_u *name)
+{
+ int attrs = win32_getattrs(name);
+ if (attrs == -1)
+ return -1;
+
+ attrs |= FILE_ATTRIBUTE_ARCHIVE;
+ return win32_setattrs(name, attrs);
+}
+
+/*
* Return TRUE if file or directory "name" is writable (not readonly).
* Strange semantics of Win32: a readonly directory is writable, but you can't
* delete a file. Let's say this means it is writable.
@@ -2794,10 +2928,10 @@
int
mch_writable(char_u *name)
{
- int perm = mch_getperm(name);
-
- return (perm != -1 && (!(perm & FILE_ATTRIBUTE_READONLY)
- || (perm & FILE_ATTRIBUTE_DIRECTORY)));
+ int attrs = win32_getattrs(name);
+
+ return (attrs != -1 && (!(attrs & FILE_ATTRIBUTE_READONLY)
+ || (attrs & FILE_ATTRIBUTE_DIRECTORY)));
}
/*
@@ -4957,13 +5091,16 @@
#ifdef FEAT_MBYTE
WCHAR *wn = NULL;
int n;
-
+#endif
+
+ win32_setattrs(name, FILE_ATTRIBUTE_NORMAL);
+
+#ifdef FEAT_MBYTE
if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
{
wn = enc_to_utf16(name, NULL);
if (wn != NULL)
{
- SetFileAttributesW(wn, FILE_ATTRIBUTE_NORMAL);
n = DeleteFileW(wn) ? 0 : -1;
vim_free(wn);
if (n == 0 || GetLastError() != ERROR_CALL_NOT_IMPLEMENTED)
@@ -4972,7 +5109,6 @@
}
}
#endif
- SetFileAttributes(name, FILE_ATTRIBUTE_NORMAL);
return DeleteFile(name) ? 0 : -1;
}
diff --git a/src/proto/os_win32.pro b/src/proto/os_win32.pro
--- a/src/proto/os_win32.pro
+++ b/src/proto/os_win32.pro
@@ -21,6 +21,8 @@
void mch_hide __ARGS((char_u *name));
int mch_isdir __ARGS((char_u *name));
int mch_mkdir __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));
int win32_fileinfo __ARGS((char_u *name, BY_HANDLE_FILE_INFORMATION *lpFileInfo));
int mch_writable __ARGS((char_u *name));

Please sign in to comment on this gist.

Something went wrong with that request. Please try again.