d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change the #if-ish logic which is used to add the -f' option when ps'

Browse Source 
is compiled with LAZY_PS, so that there is only one PS_ARGS string to
modify when changing the option-list.  Also get `-f' to show up in the
usage() statement when compiled with LAZY_PS.
This commit is contained in:
gad 2004-03-27 21:56:49 +00:00
parent ad1098e739
commit 153d99ec1c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bin/ps/ps.c
View File

@ -112,10 +112,13 @@ struct listinfo {
};
static int needuser, needcomm, needenv;
#if defined(LAZY_PS)
static int forceuread=0;
#ifdef LAZY_PS
static int forceuread = 0;
#define OPT_LAZY_f "f"
#else
static int forceuread=1;
static int forceuread = 1;
#define OPT_LAZY_f /* Ie, the `-f' option is not added. */
#endif
static enum sort { DEFAULT, SORTMEM, SORTCPU } sortby = DEFAULT;
@ -150,11 +153,7 @@ static char Zfmt[] = "label";
static kvm_t *kd;
#if defined(LAZY_PS)
#define PS_ARGS "AaCcefG:gHhjLlM:mN:O:o:p:rSTt:U:uvwXxZ"
#else
#define PS_ARGS "AaCceG:gHhjLlM:mN:O:o:p:rSTt:U:uvwXxZ"
#endif
#define PS_ARGS "AaCc" OPT_LAZY_f "G:gHhjLlM:mN:O:o:p:rSTt:U:uvwXxZ"
int
main(int argc, char *argv[])
@ -1100,9 +1099,10 @@ kludge_oldps_options(char *s)
static void
usage(void)
{
#define SINGLE_OPTS "[-aC" OPT_LAZY_f "HhjlmrSTuvwXxZ]"
(void)fprintf(stderr, "%s\n%s\n%s\n%s\n",
"usage: ps [-aCHhjlmrSTuvwXxZ] [-G gid[,gid]] [-O|o fmt]",
"usage: ps " SINGLE_OPTS " [-G gid[,gid]] [-O|o fmt]",
" [-p pid[,pid]] [-t tty[,tty]] [-U user[,user]]",
" [-M core] [-N system]",
" ps [-L]");