diff options
| -rw-r--r-- | libbb/find_pid_by_name.c | 17 | ||||
| -rw-r--r-- | procps/ps.c | 33 |
2 files changed, 24 insertions, 26 deletions
diff --git a/libbb/find_pid_by_name.c b/libbb/find_pid_by_name.c index 5520220b3..247d79f9f 100644 --- a/libbb/find_pid_by_name.c +++ b/libbb/find_pid_by_name.c @@ -23,18 +23,17 @@ * Returns a list of all matching PIDs * It is the caller's duty to free the returned pidlist. */ -long* find_pid_by_name( const char* pidName) +long* find_pid_by_name(const char* pidName) { long* pidList; - int i=0; - procps_status_t * p; + int i = 0; + procps_status_t* p; pidList = xmalloc(sizeof(long)); - while ((p = procps_scan(0)) != 0) - { + while ((p = procps_scan(0)) != 0) { if (strncmp(p->short_cmd, pidName, COMM_LEN-1) == 0) { - pidList=xrealloc( pidList, sizeof(long) * (i+2)); - pidList[i++]=p->pid; + pidList = xrealloc( pidList, sizeof(long) * (i+2)); + pidList[i++] = p->pid; } } @@ -44,9 +43,9 @@ long* find_pid_by_name( const char* pidName) long *pidlist_reverse(long *pidList) { - int i=0; + int i = 0; while (pidList[i] > 0 && ++i); - if ( i-- > 0) { + if (i-- > 0) { long k; int j; for (j = 0; i > j; i--, j++) { diff --git a/procps/ps.c b/procps/ps.c index 62571493d..d88fe4af1 100644 --- a/procps/ps.c +++ b/procps/ps.c @@ -57,41 +57,40 @@ int ps_main(int argc, char **argv) #if ENABLE_SELINUX if (use_selinux) - printf(" PID Context Stat Command\n"); + puts(" PID Context Stat Command"); else #endif - printf(" PID Uid VmSize Stat Command\n"); + puts(" PID Uid VmSize Stat Command"); while ((p = procps_scan(1)) != 0) { char *namecmd = p->cmd; #if ENABLE_SELINUX - if (use_selinux) - { + if (use_selinux) { char sbuf[128]; len = sizeof(sbuf); if (is_selinux_enabled()) { - if (getpidcon(p->pid,&sid)<0) - sid=NULL; + if (getpidcon(p->pid,&sid) < 0) + sid = NULL; } if (sid) { - /* I assume sid initilized with NULL */ - len = strlen(sid)+1; - safe_strncpy(sbuf, sid, len); - freecon(sid); - sid=NULL; - }else { - safe_strncpy(sbuf, "unknown",7); + /* I assume sid initilized with NULL */ + len = strlen(sid)+1; + safe_strncpy(sbuf, sid, len); + freecon(sid); + sid = NULL; + } else { + safe_strncpy(sbuf, "unknown", 7); } len = printf("%5d %-32s %s ", p->pid, sbuf, p->state); } else #endif - if(p->rss == 0) - len = printf("%5d %-8s %s ", p->pid, p->user, p->state); - else - len = printf("%5d %-8s %6ld %s ", p->pid, p->user, p->rss, p->state); + if(p->rss == 0) + len = printf("%5d %-8s %s ", p->pid, p->user, p->state); + else + len = printf("%5d %-8s %6ld %s ", p->pid, p->user, p->rss, p->state); i = terminal_width-len; |