ui/termstatus: extract background handling code

internal/terminal/background_unix.go

@@ -1,6 +1,6 @@
 //go:build unix
 
-package termstatus
+package terminal
 
 import "github.com/restic/restic/internal/debug"
 

internal/terminal/background_unix_test.go

@@ -1,6 +1,6 @@
 //go:build unix
 
-package termstatus
+package terminal
 
 import (
 	"os"

internal/terminal/background_windows.go

@@ -1,4 +1,4 @@
-package termstatus
+package terminal
 
 // IsProcessBackground reports whether the current process is running in the
 // background. Not implemented for this platform.

internal/terminal/foreground_unix.go

@@ -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

internal/terminal/getpgrp_solaris.go

@@ -1,4 +1,4 @@
-package termstatus
+package terminal
 
 import "golang.org/x/sys/unix"
 

internal/terminal/getpgrp_unix.go

@@ -1,6 +1,6 @@
 //go:build unix && !solaris
 
-package termstatus
+package terminal
 
 import "golang.org/x/sys/unix"
 

internal/terminal/tcgetpgrp_linux.go

@@ -1,4 +1,4 @@
-package termstatus
+package terminal
 
 import "golang.org/x/sys/unix"
 

internal/terminal/tcgetpgrp_unix.go

@@ -1,6 +1,6 @@
 //go:build unix && !linux
 
-package termstatus
+package terminal
 
 import "golang.org/x/sys/unix"
 

internal/terminal/tcsetpgrp_aix.go

@@ -1,4 +1,4 @@
-package termstatus
+package terminal
 
 import "golang.org/x/sys/unix"
 

internal/terminal/tcsetpgrp_unix.go

@@ -1,6 +1,6 @@
 //go:build unix && !aix
 
-package termstatus
+package terminal
 
 import "golang.org/x/sys/unix"
 

internal/ui/termstatus/status.go

@@ -12,6 +12,8 @@ import (
 
 	"golang.org/x/term"
 	"golang.org/x/text/width"
+
+	"github.com/restic/restic/internal/terminal"
 )
 
 // Terminal is used to write messages and display status lines which can be
@@ -101,14 +103,14 @@ func (t *Terminal) run(ctx context.Context) {
 	for {
 		select {
 		case <-ctx.Done():
-			if !IsProcessBackground(t.fd) {
+			if !terminal.IsProcessBackground(t.fd) {
 				t.writeStatus([]string{})
 			}
 
 			return
 
 		case msg := <-t.msg:
-			if IsProcessBackground(t.fd) {
+			if terminal.IsProcessBackground(t.fd) {
 				// ignore all messages, do nothing, we are in the background process group
 				continue
 			}
@@ -140,7 +142,7 @@ func (t *Terminal) run(ctx context.Context) {
 			}
 
 		case stat := <-t.status:
-			if IsProcessBackground(t.fd) {
+			if terminal.IsProcessBackground(t.fd) {
 				// ignore all messages, do nothing, we are in the background process group
 				continue
 			}