| Message ID | 20191204213228.164704-1-brianvv@google.com |
|---|---|
| State | Accepted |
| Delegated to: | stephen hemminger |
| Headers | show |
| Series | [iproute2,v2] ss: fix end-of-line printing in misc/ss.c | expand |
On Wed, 4 Dec 2019 13:32:28 -0800 Brian Vazquez <brianvv@google.com> wrote: > The previous change to ss to show header broke the printing of > end-of-line for the last entry. > > Tested: > diff <(./ss.old -nltp) <(misc/ss -nltp) > 38c38 > < LISTEN 0 128 [::1]:35417 [::]:* users:(("foo",pid=65254,fd=116)) > \ No newline at end of file > --- > > LISTEN 0 128 [::1]:35417 [::]:* users:(("foo",pid=65254,fd=116)) > > Cc: Hritik Vijay <hritikxx8@gmail.com> > Fixes: 5883c6eba517 ("ss: show header for --processes/-p") > Signed-off-by: Brian Vazquez <brianvv@google.com> > Tested-by: Michal Kubecek <mkubecek@suse.cz> > --- Applied
diff <(./ss.old -nltp) <(misc/ss -nltp) 38c38 < LISTEN 0 128 [::1]:35417 [::]:* users:(("foo",pid=65254,fd=116)) \ No newline at end of file --- > LISTEN 0 128 [::1]:35417 [::]:* users:(("foo",pid=65254,fd=116)) Cc: Hritik Vijay <hritikxx8@gmail.com> Fixes: 5883c6eba517 ("ss: show header for --processes/-p") Signed-off-by: Brian Vazquez <brianvv@google.com> Tested-by: Michal Kubecek <mkubecek@suse.cz> --- v2: Rewrote commit message as suggested by Stephen Hemminger. misc/ss.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/misc/ss.c b/misc/ss.c index c58e5c4d..95f1d37a 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -1290,6 +1290,11 @@ static void render(void) token = buf_token_next(token); } + /* Deal with final end-of-line when the last non-empty field printed + * is not the last field. + */ + if (line_started) + printf("\n"); buf_free_all(); current_field = columns;