Fossil

Check-in [5bbf1ab3]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fixed a broken conditional for code which should only be compiled on Windows but was only being compiled for posix.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | winsymlink
Files: files | file ages | folders
SHA1: 5bbf1ab3f5811a095a90d6b364423c3a92ac45b0
User & Date: sdr 2015-09-04 15:44:08
Context
2015-09-04
15:51
Merge from trunk. check-in: f571ded3 user: sdr tags: winsymlink
15:44
Fixed a broken conditional for code which should only be compiled on Windows but was only being compiled for posix. check-in: 5bbf1ab3 user: sdr tags: winsymlink
2015-09-03
23:15
Merged from trunk with a few tiny edits to make new functionality work on Windows check-in: 8f33e49d user: sdr tags: winsymlink
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/vfile.c.

203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
    oldChnged = chnged = db_column_int(&q, 4);
    oldMtime = db_column_int64(&q, 7);
    origSize = db_column_int64(&q, 6);
    currentSize = file_wd_size(zName);
    currentMtime = file_wd_mtime(0);
    origPerm = db_column_int(&q, 8);
    currentPerm = file_wd_perm(zName);
#if !defined(_WIN32)
    /*
    ** Windows doesn't have an execute bit, but it does support symlinks;
    ** if the current permission is not a symlink, make it the original
    ** permission (EXE or REG); if it is a symlink, leave it alone
    */
    if( currentPerm != PERM_LNK ){
      currentPerm = origPerm;







|







203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
    oldChnged = chnged = db_column_int(&q, 4);
    oldMtime = db_column_int64(&q, 7);
    origSize = db_column_int64(&q, 6);
    currentSize = file_wd_size(zName);
    currentMtime = file_wd_mtime(0);
    origPerm = db_column_int(&q, 8);
    currentPerm = file_wd_perm(zName);
#if defined(_WIN32)
    /*
    ** Windows doesn't have an execute bit, but it does support symlinks;
    ** if the current permission is not a symlink, make it the original
    ** permission (EXE or REG); if it is a symlink, leave it alone
    */
    if( currentPerm != PERM_LNK ){
      currentPerm = origPerm;