top, ps: do not output trailing spaces

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/include/usage.h b/include/usage.h
index 907eb78f448670b4e492da09ed124b25135ae00f..6f9d155c362ccec2a04780c2ee628c7b51872f82 100644 (file)
--- 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 307d8d6229233f5ae8ec06e9e498e259cb07af98..9a8e42df77fe2bff1dd84bbfc503fe44927760e0 100644 (file)
--- 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] = ' ';