Fossil

Check-in [8e110293]
Login

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

Overview
Comment:Potential fix for ticket [d752140c7a]. The reconstruct op appears to have been importing raw directory entries into the blob table.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 8e110293edfa93c6b2da7f45bbc76f5f782ef728
User & Date: stephan 2014-02-04 20:14:00
References
2014-02-04
20:16 Ticket [d752140c] RECONSTRUCT failure status still Open with 3 other changes artifact: 3008bb27 user: stephan
Context
2014-02-24
09:41
[d752140c7a]: The reconstruct op appears to have been importing raw directory entries into the blob table. check-in: 503ae213 user: jan.nijtmans tags: branch-1.28
2014-02-04
20:30
Cleanup use of Tcl integration for launching the Tk diff viewer internally. check-in: fe9990ad user: mistachkin tags: trunk
20:14
Potential fix for ticket [d752140c7a]. The reconstruct op appears to have been importing raw directory entries into the blob table. check-in: 8e110293 user: stephan tags: trunk
09:34
Use built-in Tcl for "diff --tk" implementation if possible. Fallback is to spawn an external "tclsh" as before. check-in: 252aff3e user: jan.nijtmans tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/rebuild.c.

859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878


879
880
881
882
883
884
885
        continue;
      }
      zUtf8Name = fossil_filename_to_utf8(pEntry->d_name);
      zSubpath = mprintf("%s/%s", zPath, zUtf8Name);
      fossil_filename_free(zUtf8Name);
      if( file_isdir(zSubpath)==1 ){
        recon_read_dir(zSubpath);
      }
      blob_init(&path, 0, 0);
      blob_appendf(&path, "%s", zSubpath);
      if( blob_read_from_file(&aContent, blob_str(&path))==-1 ){
        fossil_fatal("some unknown error occurred while reading \"%s\"",
                     blob_str(&path));
      }
      content_put(&aContent);
      blob_reset(&path);
      blob_reset(&aContent);
      free(zSubpath);
      fossil_print("\r%d", ++nFileRead);
      fflush(stdout);


    }
    closedir(d);
  }else {
    fossil_fatal("encountered error %d while trying to open \"%s\".",
                  errno, g.argv[3]);
  }
  fossil_filename_free(zUnicodePath);







|
|
|
|
|
|
|
|
|
|
<
|
|
>
>







859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875

876
877
878
879
880
881
882
883
884
885
886
        continue;
      }
      zUtf8Name = fossil_filename_to_utf8(pEntry->d_name);
      zSubpath = mprintf("%s/%s", zPath, zUtf8Name);
      fossil_filename_free(zUtf8Name);
      if( file_isdir(zSubpath)==1 ){
        recon_read_dir(zSubpath);
      }else{
        blob_init(&path, 0, 0);
        blob_appendf(&path, "%s", zSubpath);
        if( blob_read_from_file(&aContent, blob_str(&path))==-1 ){
          fossil_fatal("some unknown error occurred while reading \"%s\"",
                       blob_str(&path));
        }
        content_put(&aContent);
        blob_reset(&path);
        blob_reset(&aContent);

        fossil_print("\r%d", ++nFileRead);
        fflush(stdout);
      }
      free(zSubpath);
    }
    closedir(d);
  }else {
    fossil_fatal("encountered error %d while trying to open \"%s\".",
                  errno, g.argv[3]);
  }
  fossil_filename_free(zUnicodePath);