upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-08 16:22:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ps(1): Constify the format strings for canned displays

Browse source 
Now that removal of non-explicitly-requested duplicate columns work with
a O(n) algorithm, remove the ad-hoc optimization of crushing the canned
displays' formats after first use and constify their format strings.

No functional change intended.

This change could also be useful if/when allowing, e.g., to double
letters of canned displays to indicate their columns should not be
subject to automatic removal of duplicates (e.g., 'ps -ll').

MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
Differential Revision:  https://reviews.freebsd.org/D49614

(cherry picked from commit fd6b81712e)
This commit is contained in:
Olivier Certner 2025-04-01 14:50:26 +02:00
parent 7aa2f48267
commit 220800ca96
No known key found for this signature in database
GPG key ID: 8CA13040971E2627
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
bin/ps/ps.c
View file

@ -169,16 +169,16 @@ static void remove_redundant_columns(struct keyword_info *);
static void pidmax_init(void);
static void usage(void);
static char dfmt[] = "pid,tt,state,time,command";
static char jfmt[] = "user,pid,ppid,pgid,sid,jobc,state,tt,time,command";
static char lfmt[] = "uid,pid,ppid,cpu,pri,nice,vsz,rss,mwchan,state,"
"tt,time,command";
static char o1[] = "pid";
static char o2[] = "tt,state,time,command";
static char ufmt[] = "user,pid,%cpu,%mem,vsz,rss,tt,state,start,time,command";
static char vfmt[] = "pid,state,time,sl,re,pagein,vsz,rss,lim,tsiz,"
"%cpu,%mem,command";
static char Zfmt[] = "label";
static const char dfmt[] = "pid,tt,state,time,command";
static const char jfmt[] = "user,pid,ppid,pgid,sid,jobc,state,tt,time,command";
static const char lfmt[] = "uid,pid,ppid,cpu,pri,nice,vsz,rss,mwchan,state,"
"tt,time,command";
static const char o1[] = "pid";
static const char o2[] = "tt,state,time,command";
static const char ufmt[] = "user,pid,%cpu,%mem,vsz,rss,tt,state,start,time,command";
static const char vfmt[] = "pid,state,time,sl,re,pagein,vsz,rss,lim,tsiz,"
"%cpu,%mem,command";
static const char Zfmt[] = "label";
#define PS_ARGS "AaCcD:de" OPT_LAZY_f "G:gHhjJ:LlM:mN:O:o:p:rSTt:U:uvwXxZ"
@ -341,7 +341,6 @@ main(int argc, char *argv[])
case 'j':
parsefmt(jfmt, &varlist, 0);
_fmt = 1;
jfmt[0] = '\0';
break;
case 'L':
showkey();
@ -349,7 +348,6 @@ main(int argc, char *argv[])
case 'l':
parsefmt(lfmt, &varlist, 0);
_fmt = 1;
lfmt[0] = '\0';
break;
case 'M':
memf = optarg;
@ -364,7 +362,6 @@ main(int argc, char *argv[])
parsefmt(o1, &varlist, 1);
parsefmt(optarg, &varlist, 1);
parsefmt(o2, &varlist, 1);
o1[0] = o2[0] = '\0';
_fmt = 1;
break;
case 'o':
@ -433,13 +430,11 @@ main(int argc, char *argv[])
parsefmt(ufmt, &varlist, 0);
sortby = SORTCPU;
_fmt = 1;
ufmt[0] = '\0';
break;
case 'v':
parsefmt(vfmt, &varlist, 0);
sortby = SORTMEM;
_fmt = 1;
vfmt[0] = '\0';
break;
case 'w':
if (wflag)
@ -467,7 +462,6 @@ main(int argc, char *argv[])
break;
case 'Z':
parsefmt(Zfmt, &varlist, 0);
Zfmt[0] = '\0';
break;
case '?':
default: