Fossil

Check-in [1abc8a94]
Login

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

Overview
Comment:Fix a bug in file change detection introduced by check-in [d7a583e697]. Don't use that check-in, nor [30f23e3f5c].
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:1abc8a940ee2ef715ee654c67e965e2cba0c7c71
User & Date: drh 2010-01-20 21:51:56
Context
2010-01-21
20:53
Merge experimental remote-url password handling changes into the trunk. check-in: a3c97c90 user: drh tags: trunk, release
18:13
Factor the sync password out of the last-sync-url configuration setting. Store the password separately. Prompt the user for the password if it is missing. check-in: 59002d5e user: drh tags: experimental
2010-01-20
21:51
Fix a bug in file change detection introduced by check-in [d7a583e697]. Don't use that check-in, nor [30f23e3f5c]. check-in: 1abc8a94 user: drh tags: trunk
21:40
Require only ZIP permission (not ZIP permission plus check-out and history permission as formerely) in order to download a ZIP archive. Ticket [164e519962]. check-in: 30f23e3f user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/file.c.

43
44
45
46
47
48
49

50
51
52
53
54
55
56
** Return the number of errors.  No error messages are generated.
*/
static int getStat(const char *zFilename){
  if( zFilename==0 ){
    if( fileStatValid==0 ) return 1;
  }else{
    if( stat(zFilename, &fileStat)!=0 ) return 1;

  }
  return 0;
}


/*
** Return the size of a file in bytes.  Return -1 if the file does not







>







43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
** Return the number of errors.  No error messages are generated.
*/
static int getStat(const char *zFilename){
  if( zFilename==0 ){
    if( fileStatValid==0 ) return 1;
  }else{
    if( stat(zFilename, &fileStat)!=0 ) return 1;
    fileStatValid = 1;
  }
  return 0;
}


/*
** Return the size of a file in bytes.  Return -1 if the file does not

Changes to src/vfile.c.

178
179
180
181
182
183
184

185
186
187
188
189
190
191
    }else if( oldChnged>=2 ){
      chnged = oldChnged;
    }else if( isDeleted || rid==0 ){
      chnged = 1;
    }
    if( chnged!=1 ){
      currentMtime = file_mtime(0);

    }
    if( chnged!=1 && (checkMtime==0 || currentMtime!=oldMtime) ){
      db_ephemeral_blob(&q, 5, &origCksum);
      if( sha1sum_file(zName, &fileCksum) ){
        blob_zero(&fileCksum);
      }
      if( blob_compare(&fileCksum, &origCksum) ){







>







178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
    }else if( oldChnged>=2 ){
      chnged = oldChnged;
    }else if( isDeleted || rid==0 ){
      chnged = 1;
    }
    if( chnged!=1 ){
      currentMtime = file_mtime(0);
      assert( currentMtime>0 );
    }
    if( chnged!=1 && (checkMtime==0 || currentMtime!=oldMtime) ){
      db_ephemeral_blob(&q, 5, &origCksum);
      if( sha1sum_file(zName, &fileCksum) ){
        blob_zero(&fileCksum);
      }
      if( blob_compare(&fileCksum, &origCksum) ){