Skip to content

Commit

Permalink
lf -> crlf in vctool.bat
Browse files Browse the repository at this point in the history
  • Loading branch information
jan.nijtmans committed Dec 21, 2024
1 parent e746a36 commit ea032f8
Show file tree
Hide file tree
Showing 5 changed files with 187 additions and 188 deletions.
7 changes: 2 additions & 5 deletions .fossil-settings/crlf-glob
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,8 @@ libtommath/*.dsp
libtommath/*.sln
libtommath/*.vcproj
tools/tcl.wse.in
win/buildall.vc.bat
win/*.bat
win/*.vc
win/coffbase.txt
win/makefile.vc
win/rules.vc
win/rules-ext.vc
win/targets.vc
win/tcl.dsp
win/tcl.dsw
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
# Declare files that will always have CRLF line endings on checkout.
*.bat eol=crlf
*.cs eol=crlf
*.dsp eol=crlf
*.dsw eol=crlf
*.sln eol=crlf
*.vc eol=crlf

Expand Down
2 changes: 1 addition & 1 deletion generic/tclZipfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -3848,7 +3848,7 @@ SerializeCentralDirectoryEntry(
ZipEntry *z, /* The description of what to serialize. */
size_t nameLength, /* The length of the name. */
long long dataStartOffset) /* The overall file offset of the start of the
* data section of the file. */
* data section of the file. */
{
ZipWriteInt(start, end, buf + ZIP_CENTRAL_SIG_OFFS,
ZIP_CENTRAL_HEADER_SIG);
Expand Down
16 changes: 8 additions & 8 deletions tests/zipfs.test
Original file line number Diff line number Diff line change
Expand Up @@ -922,19 +922,19 @@ namespace eval test_ns_zipfs {
} -result {path "//zipfs:/testmt/a" not found in any zipfs volume} -returnCodes error

test zipfs-info-tcllib-1 "zipfs info offset on tcl library" -constraints zipfslib -body {
expr {[lindex [zipfs info [file dirname $::tcl_library]] 3] > 0}
expr {[lindex [zipfs info [file dirname $::tcl_library]] 3] > 0}
} -result 1

test zipfs-info-tcllib-2 "extract zip using zipfs info" -constraints zipfslib -cleanup {
cleanup
} -body {
set mt [file dirname $::tcl_library]
lassign [zipfs info $mt] container_path - - offset
set fd [open $container_path rb]
chan seek $fd $offset
set zipdata [read $fd]
zipfs mountdata $zipdata /testmt
list [expr {$offset > 0}] [file exists [file join [zipfs root] testmt tcl_library]]
set mt [file dirname $::tcl_library]
lassign [zipfs info $mt] container_path - - offset
set fd [open $container_path rb]
chan seek $fd $offset
set zipdata [read $fd]
zipfs mountdata $zipdata /testmt
list [expr {$offset > 0}] [file exists [file join [zipfs root] testmt tcl_library]]
} -result {1 1}

#
Expand Down
Loading

0 comments on commit ea032f8

Please sign in to comment.