emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Merge branch 'master' into newlib

Browse Source 
Conflicts:
	pgrep.c
	proc/sysinfo.c
	ps/output.c
	skill.c
	top/top.c
	top/top.h
	w.c
This commit is contained in:
Craig Small
2015-10-28 21:09:26 +11:00
parent 2b0dd2d702 94e4749be3
commit 471cf4cd36
20 changed files with 4022 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ps/global.c
View File

@ -382,14 +382,7 @@ static const char *set_personality(void){
return NULL;
case_default: /* use defaults for ps, ignoring other environment variables */
return NULL;
case_unknown: /* defaults, but also check inferior environment variables */
if(
getenv("UNIX95") /* Irix */
|| getenv("POSIXLY_CORRECT") /* most gnu stuff */
|| (getenv("POSIX2") && !strcmp(getenv("POSIX2"), "on")) /* Unixware 7 */
) personality = PER_BROKEN_o;
return NULL;
case_aix:
@ -431,8 +424,9 @@ static const char *set_personality(void){
case_irix:
case_sgi:
s = getenv("_XPG");
if(s && s[0]>'0' && s[0]<='9') personality = PER_BROKEN_o;
else personality = PER_IRIX_l;
if(s && s[0]>'0' && s[0]<='9')
return NULL;
personality = PER_IRIX_l;
return NULL;
case_os390: /* IBM's OS/390 OpenEdition on the S/390 mainframe */
@ -443,13 +437,13 @@ static const char *set_personality(void){
case_hp:
case_hpux:
personality = PER_BROKEN_o | PER_HPUX_x;
personality = PER_HPUX_x;
return NULL;
case_svr4:
case_sysv:
case_sco:
personality = PER_BROKEN_o | PER_SVR4_x;
personality = PER_SVR4_x;
return NULL;
case_posix:
@ -457,7 +451,6 @@ static const char *set_personality(void){
case_unix95:
case_unix98:
case_unix:
personality = PER_BROKEN_o;
return NULL;
}