enable zmodem and drag file even if trzsz is disabled

trzsz · Feb 3, 2024 · b021858 · b021858
1 parent 5b03991
commit b021858
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/tssh/trzsz.go b/tssh/trzsz.go
@@ -102,8 +102,12 @@ func enableTrzsz(args *sshArgs, ss *sshSession) error {
 		return nil
 	}
 
+	disableTrzsz := strings.ToLower(getExOptionConfig(args, "EnableTrzsz")) == "no"
+	enableZmodem := args.Zmodem || strings.ToLower(getExOptionConfig(args, "EnableZmodem")) == "yes"
+	enableDragFile := args.DragFile || strings.ToLower(getExOptionConfig(args, "EnableDragFile")) == "yes"
+
 	// disable trzsz ( trz / tsz )
-	if strings.ToLower(getExOptionConfig(args, "EnableTrzsz")) == "no" {
+	if disableTrzsz && !enableZmodem && !enableDragFile {
 		wrapStdIO(ss.serverIn, ss.serverOut, ss.serverErr, ss.tty)
 		onTerminalResize(func(width, height int) { _ = ss.session.WindowChange(height, width) })
 		return nil
@@ -146,9 +150,9 @@ func enableTrzsz(args *sshArgs, ss *sshSession) error {
 	//   os.Stderr └────────┘                  stderr                   └────────┘
 	trzszFilter := trzsz.NewTrzszFilter(os.Stdin, os.Stdout, ss.serverIn, ss.serverOut, trzsz.TrzszOptions{
 		TerminalColumns: int32(width),
-		DetectDragFile:  args.DragFile || strings.ToLower(getExOptionConfig(args, "EnableDragFile")) == "yes",
+		DetectDragFile:  enableDragFile,
 		DetectTraceLog:  args.TraceLog,
-		EnableZmodem:    args.Zmodem || strings.ToLower(getExOptionConfig(args, "EnableZmodem")) == "yes",
+		EnableZmodem:    enableZmodem,
 	})
 
 	// reset terminal size on resize