c218a2932
"Vladimir N. Oleynik"
2006-02-15
Subject
add last terminal line
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 →
procps/top.c+12 -6
| @@ -394,9 +394,13 @@ static void display_status(int count, int col) | |
| s->pid, s->user, s->state, rss_str_buf, s->ppid, | |
| pmem/10, pmem%10); | |
| #endif | |
| - | if((int)strlen(namecmd) > col) |
| - | namecmd[col] = 0; |
| - | printf("%s\n", namecmd); |
| + | if((int)strlen(namecmd) > col) |
| + | namecmd[col] = 0; |
| + | printf("%s", namecmd); |
| + | if(count) |
| + | putchar('\n'); |
| + | else |
| + | fflush(stdout); |
| s++; | |
| } | |
| } | |
| @@ -485,7 +489,7 @@ int top_main(int argc, char **argv) | |
| get_terminal_width_height(0, &col, &lines); | |
| if (lines > 4) { | |
| - | lines -= 5; |
| + | lines -= 4; |
| #ifdef CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE | |
| col = col - 80 + 35 - 6; | |
| #else | |
| @@ -544,7 +548,7 @@ int top_main(int argc, char **argv) | |
| return EXIT_FAILURE; | |
| } | |
| if(c == 'q' || c == initial_settings.c_cc[VINTR]) | |
| - | return EXIT_SUCCESS; |
| + | break; |
| if(c == 'M') { | |
| #ifdef CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE | |
| sort_function[0] = mem_sort; | |
| @@ -579,6 +583,8 @@ int top_main(int argc, char **argv) | |
| #endif /* CONFIG_FEATURE_USE_TERMIOS */ | |
| clearmems(); | |
| } | |
| - | |
| + | if(ENABLE_FEATURE_CLEAN_UP) |
| + | clearmems(); |
| + | putchar('\n'); |
| return EXIT_SUCCESS; | |
| } | |