From: Steffen Daode Nurpmeso <sdaoden@googlemail.com>
To: git@vger.kernel.org
Subject: [PATCH] progress: use \r as EOL only if isatty(stderr) is true
Date: Tue, 28 Jun 2011 16:40:09 +0200 [thread overview]
Message-ID: <1309272009-23076-1-git-send-email-sdaoden@gmail.com> (raw)
So far progress always uses \r to produce one-line output on stderr.
This only produces useful and easy parsable output if stderr is opened
on a file which does interpret CR as a real carriage return operation.
This patch changes EOL to the plain newline \n control if isatty() is
false instead.
Signed-off-by: Steffen Daode Nurpmeso <sdaoden@gmail.com>
---
progress.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/progress.c b/progress.c
index 3971f49..c548de4 100644
--- a/progress.c
+++ b/progress.c
@@ -27,6 +27,7 @@ struct throughput {
struct progress {
const char *title;
+ const char *eol;
int last_value;
unsigned total;
unsigned last_percent;
@@ -90,7 +91,7 @@ static int display(struct progress *progress, unsigned n, const char *done)
progress->last_value = n;
tp = (progress->throughput) ? progress->throughput->display : "";
- eol = done ? done : " \r";
+ eol = done ? done : progress->eol;
if (progress->total) {
unsigned percent = n * 100 / progress->total;
if (percent != progress->last_percent || progress_update) {
@@ -219,6 +220,7 @@ struct progress *start_progress_delay(const char *title, unsigned total,
return NULL;
}
progress->title = title;
+ progress->eol = isatty(fileno(stderr)) ? " \r" : "\n";
progress->total = total;
progress->last_value = -1;
progress->last_percent = -1;
--
1.7.6.rc0
next reply other threads:[~2011-06-28 14:46 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-28 14:40 Steffen Daode Nurpmeso [this message]
[not found] ` <BANLkTinRe=pA=_obCmPKBjJMXH_pDfwCtw@mail.gmail.com>
2011-06-28 16:51 ` [PATCH] progress: use \r as EOL only if isatty(stderr) is true Steffen Daode Nurpmeso
2011-06-28 18:04 ` Steffen Daode Nurpmeso
2011-06-28 18:33 ` Junio C Hamano
2011-06-28 18:48 ` Steffen Daode Nurpmeso
2011-06-28 18:55 ` Steffen Daode Nurpmeso
2011-06-28 22:45 ` Jeff King
2011-06-29 21:36 ` Junio C Hamano
2011-06-30 4:33 ` Miles Bader
2011-06-29 17:42 ` [PATCH/RFC] sideband: remove line padding (was: Re: [PATCH] progress: use \r as EOL only if isatty(stderr) is true) Steffen Daode Nurpmeso
2011-06-29 18:15 ` Nicolas Pitre
2011-06-30 21:13 ` Steffen Daode Nurpmeso
2011-07-01 3:46 ` Nicolas Pitre
2011-08-27 19:45 ` [PATCH] checkout: be quiet if not on isatty() Steffen Daode Nurpmeso
2011-08-27 19:45 ` Steffen Daode Nurpmeso
2011-08-28 6:22 ` Junio C Hamano
2011-08-28 6:28 ` martin f krafft
2011-08-28 17:37 ` [PATCH] checkout: add --verbose, and restrict progress reporting (was: Re: [PATCH] checkout: be quiet if not on isatty()) Steffen Daode Nurpmeso
2011-08-29 20:14 ` [PATCH 0/2 RFC] Add update_progress(), divert checkout messages sdaoden
2011-08-29 20:17 ` [PATCH 1/2] progress: add update_progress() sdaoden
2011-08-29 20:17 ` [PATCH 2/2] unpack-trees: divert check_updates() output via update_progress() sdaoden
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1309272009-23076-1-git-send-email-sdaoden@gmail.com \
--to=sdaoden@googlemail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).