Differences From Artifact [79bed8df57]:

• File src/file.c — part of check-in [6092935ff2] at 2011-10-05 02:03:04 on branch trunk — Change a #ifdef so that builds on MSVC will work on repos larger than 2GB. (user: drh size: 25875) [more...]

To Artifact [64460aeaaa]:

• File src/file.c — part of check-in [409f370a6d] at 2011-10-14 16:11:08 on branch declined — Merging the annotate_noleak changes, about removing an important memory leak in the annotate operation.

  It also fixes some blob behaviour in blob.c and content.c.

  Update: Removed from trunk. Replaced by the must simpler fix at [9929bab702f99839ee] (user: viriketo size: 25888) [more...]

755
756
757
758
759
760
761
762
763
764
765
766
767
768
769

** message and quit if the errFatal flag is true.  If errFatal is
** false, then simply return 0.
**
** The root of the tree is defined by the g.zLocalRoot variable.
*/
int file_tree_name(const char *zOrigName, Blob *pOut, int errFatal){
  int n;
  Blob full;
  int nFull;
  char *zFull;

  blob_zero(pOut);
  db_must_be_within_tree();
  file_canonical_name(zOrigName, &full);
  n = strlen(g.zLocalRoot);

|

755
756
757
758
759
760
761
762
763
764
765
766
767
768
769

** message and quit if the errFatal flag is true.  If errFatal is
** false, then simply return 0.
**
** The root of the tree is defined by the g.zLocalRoot variable.
*/
int file_tree_name(const char *zOrigName, Blob *pOut, int errFatal){
  int n;
  Blob full = empty_blob;
  int nFull;
  char *zFull;

  blob_zero(pOut);
  db_must_be_within_tree();
  file_canonical_name(zOrigName, &full);
  n = strlen(g.zLocalRoot);