Skip to content

Commit ea032f8

Browse files
author
jan.nijtmans
committed
lf -> crlf in vctool.bat
1 parent e746a36 commit ea032f8

File tree

5 files changed

+187
-188
lines changed

5 files changed

+187
-188
lines changed

.fossil-settings/crlf-glob

+2-5
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,8 @@ libtommath/*.dsp
1212
libtommath/*.sln
1313
libtommath/*.vcproj
1414
tools/tcl.wse.in
15-
win/buildall.vc.bat
15+
win/*.bat
16+
win/*.vc
1617
win/coffbase.txt
17-
win/makefile.vc
18-
win/rules.vc
19-
win/rules-ext.vc
20-
win/targets.vc
2118
win/tcl.dsp
2219
win/tcl.dsw

.gitattributes

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
# Declare files that will always have CRLF line endings on checkout.
2424
*.bat eol=crlf
2525
*.cs eol=crlf
26+
*.dsp eol=crlf
27+
*.dsw eol=crlf
2628
*.sln eol=crlf
2729
*.vc eol=crlf
2830

generic/tclZipfs.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -3848,7 +3848,7 @@ SerializeCentralDirectoryEntry(
38483848
ZipEntry *z, /* The description of what to serialize. */
38493849
size_t nameLength, /* The length of the name. */
38503850
long long dataStartOffset) /* The overall file offset of the start of the
3851-
* data section of the file. */
3851+
* data section of the file. */
38523852
{
38533853
ZipWriteInt(start, end, buf + ZIP_CENTRAL_SIG_OFFS,
38543854
ZIP_CENTRAL_HEADER_SIG);

tests/zipfs.test

+8-8
Original file line numberDiff line numberDiff line change
@@ -922,19 +922,19 @@ namespace eval test_ns_zipfs {
922922
} -result {path "//zipfs:/testmt/a" not found in any zipfs volume} -returnCodes error
923923

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

928928
test zipfs-info-tcllib-2 "extract zip using zipfs info" -constraints zipfslib -cleanup {
929929
cleanup
930930
} -body {
931-
set mt [file dirname $::tcl_library]
932-
lassign [zipfs info $mt] container_path - - offset
933-
set fd [open $container_path rb]
934-
chan seek $fd $offset
935-
set zipdata [read $fd]
936-
zipfs mountdata $zipdata /testmt
937-
list [expr {$offset > 0}] [file exists [file join [zipfs root] testmt tcl_library]]
931+
set mt [file dirname $::tcl_library]
932+
lassign [zipfs info $mt] container_path - - offset
933+
set fd [open $container_path rb]
934+
chan seek $fd $offset
935+
set zipdata [read $fd]
936+
zipfs mountdata $zipdata /testmt
937+
list [expr {$offset > 0}] [file exists [file join [zipfs root] testmt tcl_library]]
938938
} -result {1 1}
939939

940940
#

0 commit comments

Comments
 (0)