tclserv

commit 1ac6a4c19f438b4b1f7822a18cb5200deeb6723a
parent 22c6f060c9eb867670e1c7fd87e82dc61ef5392e
Author: Ellenor Malik <ellenor@umbrellix.net>
Date:   Thu, 11 Feb 2021 04:53:05 -0800

post-merge commit

Diffstat:
M
core/0000-callbacks.tcl
 | 
2
+-
M
core/2003-ts6.tcl
 | 
6
+++---
M
main.tcl
 | 
5
+++--
M
modules/debugserv.tcl
 | 
1
+
M
modules/quoteserv.tcl
 | 
2
+-

5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/core/0000-callbacks.tcl b/core/0000-callbacks.tcl
@@ -32,7 +32,7 @@ proc unllbindall {sock type client comd} {
 	tnda unset "llbinds/$::netname($sock)/$type/$client/[ndcenc $comd]"
 }
 proc firellbind {sock type client comd args} {
-#	puts stdout "$sock $type $client [ndcenc $comd] $args"
+#	puts stdout "$sock $type $client $comd $args"
 	global globuctx globctx
 	if {$sock == "-"} {} {set globctx $::netname($sock)}
 	set oldglobuctx $globuctx
diff --git a/core/2003-ts6.tcl b/core/2003-ts6.tcl
@@ -334,9 +334,9 @@ proc ::ts6::irc-main {sck} {
 #			if {[lindex $comd [expr {$one + 2}]] != 1} {return};#we don't support jupes
 			tnda set "servers/$::netname($sck)/[ndaenc [tnda get "socksid/$::netname($sck)"]]/name" [lindex $comd [expr {$one + 1}]]
 			tnda set "servers/$::netname($sck)/[ndaenc [tnda get "socksid/$::netname($sck)"]]/description" [lindex $comd [expr {$one + 3}]]
-			firellbind $sck evnt "-" "alive" $::netname($sck)
-			firellbind - evnt "-" "alive" $::netname($sck)
-			firellbind $sck evnt "-" "ts6.alive" $::netname($sck)
+#			firellbind $sck evnt "-" "alive" $::netname($sck)
+			if {$one == 0} {firellbind - evnt "-" "alive" $::netname($sck)}
+#			firellbind $sck evnt "-" "ts6.alive" $::netname($sck)
 		}
 
 		"SID" {
diff --git a/main.tcl b/main.tcl
@@ -39,6 +39,7 @@ proc mysrc {script} {
 
 proc readfile {script} {
 	set fp [open $script r]
+	chan configure $fp -encoding utf-8
 	set ev [read $fp]
 	close $fp
 	return $ev
@@ -73,8 +74,8 @@ proc save.db {name var no oper {apres 1}} {
 	# but do not save CPU time if we are apres=0
 	# ensure DB save is atomic, so if tclserv is killed during or under 12.5 seconds after save
 	catch [list file rename $name [format "%s.bk%s" $name $now]]
-	set there [open $name [list WRONLY CREAT TRUNC BINARY]]
-	chan configure $there -blocking 0 -buffering full -buffersize 8192
+	set there [open $name [list WRONLY CREAT TRUNC]]
+	chan configure $there -encoding utf-8 -blocking 0 -buffering full -buffersize 8192
 	# should not block for long
 	puts -nonewline $there $db
 	flush $there
diff --git a/modules/debugserv.tcl b/modules/debugserv.tcl
@@ -63,6 +63,7 @@ proc debugserv.oneintro {headline block} {
 	                  dnsconf dnsconf dbname dbname
 	if {$dbname == ""} {set dbname debugserv}
 	tnda set "debugserv/$net/rehashprivs" $rehashprivs
+	tnda set "debugserv/$net/tclprivs" $tclprivs
 	tnda set "debugserv/$net/logchan" $logchan
 	#tnda set "debugserv/$net/nspass" $nspass
 	setctx $net
diff --git a/modules/quoteserv.tcl b/modules/quoteserv.tcl
@@ -40,7 +40,7 @@ proc quoteserv.oneintro {headline block} {
 	tnda set "quoteserv/[curctx net]/logchan" $logchan
 	#tnda set "quoteserv/[curctx net]/nspass" $nspass
 	setctx $net
-	% sendUid $nick $ident $host $host [set ourid [% getfreeuid]] [expr {($realname == "") ? "* Debug Service *" : $realname}] $modes
+	% sendUid $nick $ident $host $host [set ourid [% getfreeuid]] [expr {($realname == "") ? "* Quote Service *" : $realname}] $modes
 	tnda set "quoteserv/[curctx net]/ourid" $ourid
 #	llbind $nsock pub - ".metadata" [list quoteserv.pmetadata $net]
 #	llbind $nsock pub - ".rehash" [list quoteserv.crehash $net]