Differences From Artifact [bcedd9c9e7]:
- File src/file.c — part of check-in [9c5bbd6a01] at 2014-09-25 19:21:45 on branch winsymlink — Summary: a number of changes to improve windows symlink handling. Detail: fixed file_contains_merge_marker failure on windows symlinks; fixed inadequate S_ISLNK macro for windows; backed out change made to revert query ("OR islink" removed); added special processing to vfile_check_signature for windows symlink type changes; fixed a few flaws in the windows specific posix-compatibility routines to improve symlink handling. (user: sdr size: 35144)
To Artifact [e4c41b83bb]:
- File src/file.c — part of check-in [631dff61e0] at 2014-09-26 09:23:37 on branch winsymlink — Make everything compile on MinGW(-w64). WARNING: will not run on Windows XP, that still has to be fixed! Should work on Vista+. (user: jan.nijtmans size: 35198)
| ︙ | ︙ | |||
70 71 72 73 74 75 76 77 78 79 80 81 82 83 | /* ** On Windows S_ISLNK can be true or false. */ /* the S_ISLNK provided by dirent.h for windows is inadequate, so fix it */ #if defined(S_ISLNK) # undef S_ISLNK #endif #if !defined(S_ISLNK) # define S_ISLNK(x) ((x)==S_IFLNK) #endif #endif static int fileStatValid = 0; static struct fossilStat fileStat; | > > > | 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 | /* ** On Windows S_ISLNK can be true or false. */ /* the S_ISLNK provided by dirent.h for windows is inadequate, so fix it */ #if defined(S_ISLNK) # undef S_ISLNK #endif #if !defined(S_IFLNK) # define S_IFLNK 0120000 #endif #if !defined(S_ISLNK) # define S_ISLNK(x) ((x)==S_IFLNK) #endif #endif static int fileStatValid = 0; static struct fossilStat fileStat; |
| ︙ | ︙ |