From: Eugene Syromyatnikov <evgsyr@gmail.com>
Date: Sun, 1 Jan 2017 18:46:42 +0000 (+0300)
Subject: term: do not abort decoding in case of non-verbose output
X-Git-Tag: v4.16~88
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a8f0442fd78ea556445d90710be89d4463a3cbf6;p=strace

term: do not abort decoding in case of non-verbose output

The case of unset verbose is handled by umoven_or_printaddr, moreover,
exiting at this point is plain wrong and leads to last argument not
being printed while it should be.

* term.c (decode_termios, decode_termio, decode_winsize, decode_ttysize,
decode_modem_flags): Do not check verbose flags explicitly and do not
exit early if it is not set.
---

diff --git a/term.c b/term.c
index dcac3ccd..d083cdd5 100644
--- a/term.c
+++ b/term.c
@@ -43,9 +43,6 @@ decode_termios(struct tcb *const tcp, const kernel_ulong_t addr)
 	struct termios tios;
 	int i;
 
-	if (!verbose(tcp))
-		return;
-
 	tprints(", ");
 	if (umove_or_printaddr(tcp, addr, &tios))
 		return;
@@ -79,9 +76,6 @@ decode_termio(struct tcb *const tcp, const kernel_ulong_t addr)
 	struct termio tio;
 	int i;
 
-	if (!verbose(tcp))
-		return;
-
 	tprints(", ");
 	if (umove_or_printaddr(tcp, addr, &tio))
 		return;
@@ -120,9 +114,6 @@ decode_winsize(struct tcb *const tcp, const kernel_ulong_t addr)
 {
 	struct winsize ws;
 
-	if (!verbose(tcp))
-		return;
-
 	tprints(", ");
 	if (umove_or_printaddr(tcp, addr, &ws))
 		return;
@@ -136,9 +127,6 @@ decode_ttysize(struct tcb *const tcp, const kernel_ulong_t addr)
 {
 	struct ttysize ts;
 
-	if (!verbose(tcp))
-		return;
-
 	tprints(", ");
 	if (umove_or_printaddr(tcp, addr, &ts))
 		return;
@@ -152,9 +140,6 @@ decode_modem_flags(struct tcb *const tcp, const kernel_ulong_t addr)
 {
 	int i;
 
-	if (!verbose(tcp))
-		return;
-
 	tprints(", ");
 	if (umove_or_printaddr(tcp, addr, &i))
 		return;