Fossil

Check-in [1226e3ef]
Login

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

Overview
Comment:Correct sense of _WIN32 conditional compilation
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | enhanced-symlink
Files: files | file ages | folders
SHA3-256:1226e3ef524c758d8ffb09523d9882fb95664cd8a9dd594621c3bca95fd67400
User & Date: andygoth 2017-10-14 22:19:55
Context
2017-10-14
22:22
Update change log to describe Windows behavior of "l" flag to "manifest" setting check-in: 810370cd user: andygoth tags: enhanced-symlink
22:19
Correct sense of _WIN32 conditional compilation check-in: 1226e3ef user: andygoth tags: enhanced-symlink
22:03
Use transactions while creating symlink_perm table check-in: f42ee09a user: andygoth tags: enhanced-symlink
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/vfile.c.

208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
    isDeleted = db_column_int(&q, 3);
    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);
#ifndef _WIN32
    /* For Windows, if the "manifest" setting contains the "l" flag and the
    ** "manifest.symlinks" file exists, use its contents to determine which
    ** files do and do not have the symlink permission. */
    if( !manifestSymlinks ){
      currentPerm = origPerm;
    }else if( db_exists("SELECT 1 FROM symlink_perm "
                        "WHERE filename=%Q", zName+nRoot) ){







|







208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
    isDeleted = db_column_int(&q, 3);
    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);
#ifdef _WIN32
    /* For Windows, if the "manifest" setting contains the "l" flag and the
    ** "manifest.symlinks" file exists, use its contents to determine which
    ** files do and do not have the symlink permission. */
    if( !manifestSymlinks ){
      currentPerm = origPerm;
    }else if( db_exists("SELECT 1 FROM symlink_perm "
                        "WHERE filename=%Q", zName+nRoot) ){