X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=status.go;h=d6f7c0d4f9898270ca3df148584415a802b49a8b;hb=b42c8c2dba5ea7667c32681338930969ed5c1cdb;hp=b918c65671dfbe5ebedb32dfadc9a43a5adcac7b;hpb=a3d6bbf97e90bf923142d061bc68b28cc1dec2a8;p=goredo.git

diff --git a/status.go b/status.go
index b918c65..d6f7c0d 100644
--- a/status.go
+++ b/status.go
@@ -1,6 +1,6 @@
 /*
-goredo -- redo implementation on pure Go
-Copyright (C) 2020 Sergey Matveev <stargrave@stargrave.org>
+goredo -- djb's redo implementation on pure Go
+Copyright (C) 2020-2021 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@ package main
 import (
 	"flag"
 	"fmt"
+	"log"
 	"os"
 )
 
@@ -36,9 +37,17 @@ const (
 var (
 	FdStatus *os.File
 
-	flagNoStatus = flag.Bool("no-status", false, "disable statusline (REDO_NO_STATUS=1)")
+	flagNoStatus *bool
 )
 
+func init() {
+	cmdName := CmdName()
+	if !(cmdName == CmdNameRedo || cmdName == CmdNameRedoIfchange) {
+		return
+	}
+	flagNoStatus = flag.Bool("no-status", false, "disable statusline (REDO_NO_STATUS=1)")
+}
+
 func statusInit() {
 	if NoProgress || *flagNoStatus {
 		return
@@ -57,7 +66,7 @@ func statusInit() {
 	var err error
 	r, FdStatus, err = os.Pipe()
 	if err != nil {
-		panic(err)
+		log.Fatalln(err)
 	}
 	go func() {
 		running := 0
@@ -95,8 +104,9 @@ func statusInit() {
 					CJS, done, CReset,
 				)
 			}
+			out = erasedStatus(out, "\r")
 			LogMutex.Lock()
-			os.Stderr.WriteString(fillUpToTermSize(out, "\r"))
+			os.Stderr.WriteString(out)
 			LogMutex.Unlock()
 		}
 	}()