summaryrefslogtreecommitdiffstats
path: root/library
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2023-03-27 09:59:14 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2023-03-27 09:59:14 (GMT)
commite1fdad425a08599ce5e492ae8087a8406c9ce268 (patch)
tree278076ffc2c807bd189758f2b54eee7a31604ee5 /library
parent1df3dc0ae2488112b8d9f28bb74b73c508a11210 (diff)
parent49b6ecfb4e17876dec5c9f9edad8d5e0a44cb52c (diff)
downloadtcl-e1fdad425a08599ce5e492ae8087a8406c9ce268.zip
tcl-e1fdad425a08599ce5e492ae8087a8406c9ce268.tar.gz
tcl-e1fdad425a08599ce5e492ae8087a8406c9ce268.tar.bz2
Merge 8.7. Go back to lowercase for POSIX err-messages
Diffstat (limited to 'library')
-rw-r--r--library/http/http.tcl8
-rw-r--r--library/init.tcl4
-rw-r--r--library/safe.tcl22
3 files changed, 17 insertions, 17 deletions
diff --git a/library/http/http.tcl b/library/http/http.tcl
index d744433..f2ad0a0 100644
--- a/library/http/http.tcl
+++ b/library/http/http.tcl
@@ -1773,7 +1773,7 @@ proc http::OpenSocket {token DoLater} {
set socketPlayCmd($state(socketinfo)) [list ReplayIfClose Wready {} $socketPhQueue($sockOld)]
set socketPhQueue($sockOld) {}
}
- if {[string range $result 0 20] eq {Proxy connect failed:}} {
+ if {[string range $result 0 20] eq {proxy connect failed:}} {
# - The HTTPS proxy did not create a socket. The pre-existing value
# (a "placeholder socket") is unchanged.
# - The proxy returned a valid HTTP response to the failed CONNECT
@@ -1786,7 +1786,7 @@ proc http::OpenSocket {token DoLater} {
Finish $token $result
# Because socket creation failed, the placeholder "socket" must be
# "closed" and (if persistent) removed from the persistent sockets
- # table. In the {Proxy connect failed:} case Finish does this because
+ # table. In the {proxy connect failed:} case Finish does this because
# the value of ${token}(connection) is "close". In the other cases here,
# it does so because $result is non-empty.
}
@@ -3392,7 +3392,7 @@ proc http::Connect {token proto phost srvurl} {
# If any other requests are in flight or pipelined/queued, they will
# be discarded.
}
- Finish $token "Connect failed: $err"
+ Finish $token "connect failed: $err"
return
}
@@ -5135,7 +5135,7 @@ proc http::SecureProxyConnect {args} {
}
}
set state(connection) close
- set msg "Proxy connect failed: $code"
+ set msg "proxy connect failed: $code"
# - This error message will be detected by http::OpenSocket and will
# cause it to present the proxy's HTTP response as that of the
# original $token transaction, identified only by state(proxyUsed)
diff --git a/library/init.tcl b/library/init.tcl
index 22579c2..23f4da3 100644
--- a/library/init.tcl
+++ b/library/init.tcl
@@ -726,7 +726,7 @@ proc tcl::CopyDirectory {action src dest} {
# the following code is now commented out.
#
# return -code error "error $action \"$src\" to\
- # \"$dest\": File exists"
+ # \"$dest\": file exists"
} else {
# Depending on the platform, and on the current
# working directory, the directories '.', '..'
@@ -738,7 +738,7 @@ proc tcl::CopyDirectory {action src dest} {
foreach s $existing {
if {[file tail $s] ni {. ..}} {
return -code error "error $action \"$src\" to\
- \"$dest\": File exists"
+ \"$dest\": file exists"
}
}
}
diff --git a/library/safe.tcl b/library/safe.tcl
index c5546e5..7fc2b5c 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -818,7 +818,7 @@ proc ::safe::CheckFileName {child file} {
if {![file exists $file]} {
# don't tell the file path
- return -code error "No such file or directory"
+ return -code error "no such file or directory"
}
if {![file readable $file]} {
@@ -908,7 +908,7 @@ proc ::safe::AliasGlob {child args} {
} on error msg {
Log $child $msg
if {$got(-nocomplain)} return
- return -code error "Permission denied"
+ return -code error "permission denied"
}
if {$got(--)} {
set cmd [linsert $cmd end-1 -directory $dir]
@@ -921,7 +921,7 @@ proc ::safe::AliasGlob {child args} {
# return now and reduce the number of cases to be considered later.
Log $child {option -directory must be supplied}
if {$got(-nocomplain)} return
- return -code error "Permission denied"
+ return -code error "permission denied"
}
# Apply the -join semantics ourselves (hence -join not copied to $cmd)
@@ -980,7 +980,7 @@ proc ::safe::AliasGlob {child args} {
} on error msg {
Log $child $msg
if {$got(-nocomplain)} continue
- return -code error "Permission denied"
+ return -code error "permission denied"
}
lappend cmd $opt
}
@@ -1034,7 +1034,7 @@ proc ::safe::AliasSource {child args} {
set at 2
if {$encoding eq "identity"} {
Log $child "attempt to use the identity encoding"
- return -code error "Permission denied"
+ return -code error "permission denied"
}
} else {
set at 0
@@ -1052,7 +1052,7 @@ proc ::safe::AliasSource {child args} {
set realfile [TranslatePath $child $file]
} msg]} {
Log $child $msg
- return -code error "Permission denied"
+ return -code error "permission denied"
}
# check that the path is in the access path of that child
@@ -1060,7 +1060,7 @@ proc ::safe::AliasSource {child args} {
FileInAccessPath $child $realfile
} msg]} {
Log $child $msg
- return -code error "Permission denied"
+ return -code error "permission denied"
}
# Check that the filename exists and is readable. If it is not, deliver
@@ -1124,7 +1124,7 @@ proc ::safe::AliasLoad {child file args} {
if {!$state(nestedok)} {
Log $child "loading to a sub interp (nestedok)\
disabled (trying to load $prefix to $target)"
- return -code error "Permission denied (nested load)"
+ return -code error "permission denied (nested load)"
}
}
@@ -1139,7 +1139,7 @@ proc ::safe::AliasLoad {child file args} {
if {!$state(staticsok)} {
Log $child "static loading disabled\
(trying to load $prefix to $target)"
- return -code error "Permission denied (static library)"
+ return -code error "permission denied (static library)"
}
} else {
# file loading
@@ -1149,7 +1149,7 @@ proc ::safe::AliasLoad {child file args} {
set file [TranslatePath $child $file]
} on error msg {
Log $child $msg
- return -code error "Permission denied"
+ return -code error "permission denied"
}
# check the translated path
@@ -1157,7 +1157,7 @@ proc ::safe::AliasLoad {child file args} {
FileInAccessPath $child $file
} on error msg {
Log $child $msg
- return -code error "Permission denied (path)"
+ return -code error "permission denied (path)"
}
}