ss: prevent "Process" column from being printed unless requested

Commit 5883c6eba5 ("ss: show header for --processes/-p") added
"Process" to the list of columns printed by ss. However, the "Process"
header is now printed even if --processes/-p is not used.

This change aims to fix this by moving the COL_PROC column ID to the same
index as the corresponding column structure in the columns array, and
enabling it if --processes/-p is used.

Fixes: 5883c6eba5 ("ss: show header for --processes/-p")
Signed-off-by: Quentin Deslandes <qde@naccy.de>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Quentin Deslandes
2023-12-06 12:14:44 +01:00
committed by Stephen Hemminger
parent 4913a5c206
commit 1607bf531f

View File

@@ -100,8 +100,8 @@ enum col_id {
COL_SERV,
COL_RADDR,
COL_RSERV,
COL_EXT,
COL_PROC,
COL_EXT,
COL_MAX
};
@@ -5795,6 +5795,9 @@ int main(int argc, char *argv[])
if (ssfilter_parse(&current_filter.f, argc, argv, filter_fp))
usage();
if (!show_processes)
columns[COL_PROC].disabled = 1;
if (!(current_filter.dbs & (current_filter.dbs - 1)))
columns[COL_NETID].disabled = 1;