be905d550
Denis Vlasenko
2006-09-27
Subject
process utilities related style cleanup
SOURCE BUG
This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
libbb/find_pid_by_name.c+8 -9
| @@ -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++) { | |
procps/ps.c+16 -17
| @@ -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; | |