summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko2009-09-11 23:29:45 +0200
committerDenys Vlasenko2009-09-11 23:29:45 +0200
commitae357bd7138a179a1433b7d6e1aca48cc6438966 (patch)
tree3fec254b84c9b0b73108f69e270fa7315f8487dc
parent00528822004e5763c669e58191f10c5202f679b5 (diff)
downloadbusybox-ae357bd7138a179a1433b7d6e1aca48cc6438966.zip
busybox-ae357bd7138a179a1433b7d6e1aca48cc6438966.tar.gz
top, ps: do not output trailing spaces
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--include/usage.h2
-rw-r--r--libbb/procps.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/include/usage.h b/include/usage.h
index 907eb78..6f9d155 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -1338,7 +1338,7 @@
#define ftpd_trivial_usage \
"[-wvS] [-t N] [-T N] [DIR]"
#define ftpd_full_usage "\n\n" \
- "FTP server\n" \
+ "Anonymous FTP server\n" \
"\n" \
"ftpd should be used as an inetd service.\n" \
"ftpd's line for inetd.conf:\n" \
diff --git a/libbb/procps.c b/libbb/procps.c
index 307d8d6..9a8e42d 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -471,6 +471,8 @@ void FAST_FUNC read_cmdline(char *buf, int col, unsigned pid, const char *comm)
sz = open_read_close(filename, buf, col);
if (sz > 0) {
buf[sz] = '\0';
+ while (--sz >= 0 && buf[sz] == '\0')
+ continue;
while (--sz >= 0)
if ((unsigned char)(buf[sz]) < ' ')
buf[sz] = ' ';