ps: fix -Z (by Yuichi Nakamura <ynakam@hitachisoft.jp>)

This commit is contained in:
Denis Vlasenko
2007-06-06 07:40:16 +00:00
parent cd0df46d8c
commit 0696b8aae8
3 changed files with 59 additions and 29 deletions

View File

@ -4,7 +4,8 @@
*
* Copyright 1998 by Albert Cahalan; all rights reserved.
* Copyright (C) 2002 by Vladimir Oleynik <dzo@simtreas.ru>
*
* SELinux support: (c) 2007 by Yuichi Nakamura <ynakam@hitachisoft.jp>
*
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
@ -95,6 +96,7 @@ void free_procps_scan(procps_status_t* sp)
{
closedir(sp->dir);
free(sp->cmd);
USE_SELINUX(free(sp->context);)
free(sp);
}
@ -132,6 +134,13 @@ procps_status_t* procps_scan(procps_status_t* sp, int flags)
sp->pid = pid;
if (!(flags & ~PSSCAN_PID)) break;
#if ENABLE_SELINUX
if (flags & PSSCAN_CONTEXT) {
if (getpidcon(sp->pid, &sp->context) < 0)
sp->context = NULL;
}
#endif
filename_tail = filename + sprintf(filename, "/proc/%d", pid);
if (flags & PSSCAN_UIDGID) {