TheArchive/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2025-12-11 18:47:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui/termstatus: extract background handling code

Browse Source
This commit is contained in:
Michael Eischer
2025-09-07 12:15:27 +02:00
parent 6ff7cd9050
commit 48cbbf9651
11 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/terminal/foreground_unix.go
View File

@@ -9,7 +9,6 @@ import (
"github.com/restic/restic/internal/debug"
"github.com/restic/restic/internal/errors"
"github.com/restic/restic/internal/ui/termstatus"
"golang.org/x/sys/unix"
)
@@ -29,13 +28,13 @@ func startForeground(cmd *exec.Cmd) (bg func() error, err error) {
}
// only move child process to foreground if restic is in the foreground
prev, err := termstatus.Tcgetpgrp(int(tty.Fd()))
prev, err := Tcgetpgrp(int(tty.Fd()))
if err != nil {
_ = tty.Close()
return nil, err
}
self := termstatus.Getpgrp()
self := Getpgrp()
if prev != self {
debug.Log("restic is not controlling the tty; err = %v", err)
if err := tty.Close(); err != nil {
@@ -56,7 +55,7 @@ func startForeground(cmd *exec.Cmd) (bg func() error, err error) {
}
// move the command's process group into the foreground
err = termstatus.Tcsetpgrp(int(tty.Fd()), cmd.Process.Pid)
err = Tcsetpgrp(int(tty.Fd()), cmd.Process.Pid)
if err != nil {
_ = tty.Close()
return nil, err
@@ -67,7 +66,7 @@ func startForeground(cmd *exec.Cmd) (bg func() error, err error) {
signal.Reset(unix.SIGTTOU)
// reset the foreground process group
err = termstatus.Tcsetpgrp(int(tty.Fd()), prev)
err = Tcsetpgrp(int(tty.Fd()), prev)
if err != nil {
_ = tty.Close()
return err