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 @@ | |||
23 | * Returns a list of all matching PIDs | 23 | * Returns a list of all matching PIDs |
24 | * It is the caller's duty to free the returned pidlist. | 24 | * It is the caller's duty to free the returned pidlist. |
25 | */ | 25 | */ |
26 | long* find_pid_by_name( const char* pidName) | 26 | long* find_pid_by_name(const char* pidName) |
27 | { | 27 | { |
28 | long* pidList; | 28 | long* pidList; |
29 | int i=0; | 29 | int i = 0; |
30 | procps_status_t * p; | 30 | procps_status_t* p; |
31 | 31 | ||
32 | pidList = xmalloc(sizeof(long)); | 32 | pidList = xmalloc(sizeof(long)); |
33 | while ((p = procps_scan(0)) != 0) | 33 | while ((p = procps_scan(0)) != 0) { |
34 | { | ||
35 | if (strncmp(p->short_cmd, pidName, COMM_LEN-1) == 0) { | 34 | if (strncmp(p->short_cmd, pidName, COMM_LEN-1) == 0) { |
36 | pidList=xrealloc( pidList, sizeof(long) * (i+2)); | 35 | pidList = xrealloc( pidList, sizeof(long) * (i+2)); |
37 | pidList[i++]=p->pid; | 36 | pidList[i++] = p->pid; |
38 | } | 37 | } |
39 | } | 38 | } |
40 | 39 | ||
@@ -44,9 +43,9 @@ long* find_pid_by_name( const char* pidName) | |||
44 | 43 | ||
45 | long *pidlist_reverse(long *pidList) | 44 | long *pidlist_reverse(long *pidList) |
46 | { | 45 | { |
47 | int i=0; | 46 | int i = 0; |
48 | while (pidList[i] > 0 && ++i); | 47 | while (pidList[i] > 0 && ++i); |
49 | if ( i-- > 0) { | 48 | if (i-- > 0) { |
50 | long k; | 49 | long k; |
51 | int j; | 50 | int j; |
52 | for (j = 0; i > j; i--, j++) { | 51 | 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) | |||
57 | 57 | ||
58 | #if ENABLE_SELINUX | 58 | #if ENABLE_SELINUX |
59 | if (use_selinux) | 59 | if (use_selinux) |
60 | printf(" PID Context Stat Command\n"); | 60 | puts(" PID Context Stat Command"); |
61 | else | 61 | else |
62 | #endif | 62 | #endif |
63 | printf(" PID Uid VmSize Stat Command\n"); | 63 | puts(" PID Uid VmSize Stat Command"); |
64 | 64 | ||
65 | while ((p = procps_scan(1)) != 0) { | 65 | while ((p = procps_scan(1)) != 0) { |
66 | char *namecmd = p->cmd; | 66 | char *namecmd = p->cmd; |
67 | #if ENABLE_SELINUX | 67 | #if ENABLE_SELINUX |
68 | if (use_selinux) | 68 | if (use_selinux) { |
69 | { | ||
70 | char sbuf[128]; | 69 | char sbuf[128]; |
71 | len = sizeof(sbuf); | 70 | len = sizeof(sbuf); |
72 | 71 | ||
73 | if (is_selinux_enabled()) { | 72 | if (is_selinux_enabled()) { |
74 | if (getpidcon(p->pid,&sid)<0) | 73 | if (getpidcon(p->pid,&sid) < 0) |
75 | sid=NULL; | 74 | sid = NULL; |
76 | } | 75 | } |
77 | 76 | ||
78 | if (sid) { | 77 | if (sid) { |
79 | /* I assume sid initilized with NULL */ | 78 | /* I assume sid initilized with NULL */ |
80 | len = strlen(sid)+1; | 79 | len = strlen(sid)+1; |
81 | safe_strncpy(sbuf, sid, len); | 80 | safe_strncpy(sbuf, sid, len); |
82 | freecon(sid); | 81 | freecon(sid); |
83 | sid=NULL; | 82 | sid = NULL; |
84 | }else { | 83 | } else { |
85 | safe_strncpy(sbuf, "unknown",7); | 84 | safe_strncpy(sbuf, "unknown", 7); |
86 | } | 85 | } |
87 | len = printf("%5d %-32s %s ", p->pid, sbuf, p->state); | 86 | len = printf("%5d %-32s %s ", p->pid, sbuf, p->state); |
88 | } | 87 | } |
89 | else | 88 | else |
90 | #endif | 89 | #endif |
91 | if(p->rss == 0) | 90 | if(p->rss == 0) |
92 | len = printf("%5d %-8s %s ", p->pid, p->user, p->state); | 91 | len = printf("%5d %-8s %s ", p->pid, p->user, p->state); |
93 | else | 92 | else |
94 | len = printf("%5d %-8s %6ld %s ", p->pid, p->user, p->rss, p->state); | 93 | len = printf("%5d %-8s %6ld %s ", p->pid, p->user, p->rss, p->state); |
95 | 94 | ||
96 | i = terminal_width-len; | 95 | i = terminal_width-len; |
97 | 96 | ||