From: Jim Warner <james.warner@comcast.net>
Date: Sat, 11 Feb 2012 00:18:18 +0000 (-0600)
Subject: top: remove residual logic for obsolete functionality
X-Git-Tag: v3.3.3~79
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=045538e01b4588e33bacc1ac57abc799b6d24d7b;p=procps-ng

top: remove residual logic for obsolete functionality

At one time the 'open_psdb_message' library call was
supported with the concept of a postponed message
which would display after top startup completed.
In turn, that required logic to strip the '\n' which
was embedded (inappropriately) in any such message.

Nowdays top treats such a returned error as fatal so
there is no need for the 'strim' function which is
being removed with this commit.

Signed-off-by: Jim Warner <james.warner@comcast.net>
---

diff --git a/top/top.c b/top/top.c
index 5d3db5f1..2bdae65f 100644
--- a/top/top.c
+++ b/top/top.c
@@ -285,19 +285,6 @@ static inline char *scat (char *dst, const char *src) {
 } // end: scat
 
 
-#ifdef TERMIOS_ONLY
-        /*
-         * Trim line oriented input */
-static char *strim (char *str) {
-   static const char ws[] = "\b\f\n\r\t\v\x1b\x9b";  // 0x1b + 0x9b are escape
-   char *p;
-
-   if ((p = strpbrk(str, ws))) *p = '\0';
-   return str;
-} // end: strim
-#endif
-
-
         /*
          * This guy just facilitates Batch and protects against dumb ttys
          * -- we'd 'inline' him but he's only called twice per frame,
@@ -944,7 +931,7 @@ static char *linein (const char *prompt) {
    putp(Cap_curs_norm);
 
    // note: we DO produce a vaid 'string'
-   return strim(buf);
+   return buf;
 } // end: linein
 
 #else
diff --git a/top/top.h b/top/top.h
index fbb89a4b..6c04d36d 100644
--- a/top/top.h
+++ b/top/top.h
@@ -537,9 +537,6 @@ typedef struct WIN_t {
 /*------  Tiny useful routine(s)  ----------------------------------------*/
 //atic const char   *fmtmk (const char *fmts, ...);
 //atic inline char  *scat (char *dst, const char *src);
-#ifdef TERMIOS_ONLY
-//atic char         *strim (char *str);
-#endif
 //atic const char   *tg2 (int x, int y);
 /*------  Exit/Interrput routines  ---------------------------------------*/
 //atic void          bye_bye (const char *str);