Audit bb_common_bufsiz usage, add script which looks for misuse.

tr: stop using globals needlessly.
code: -103 bytes

3 files changed, 15 insertions, 17 deletions

diff --git a/networking/hostname.c b/networking/hostname.c
index 50ef7b5d1..862bbdfa2 100644
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -29,12 +29,13 @@ static void do_sethostname(char *s, int isfile)
                 }
         } else {
                 f = xfopen(s, "r");
-                while (fgets(bb_common_bufsiz1, sizeof(bb_common_bufsiz1), f) != NULL) {
-                        if (bb_common_bufsiz1[0] == '#') {
+#define strbuf bb_common_bufsiz1
+                while (fgets(strbuf, sizeof(strbuf), f) != NULL) {
+                        if (strbuf[0] == '#') {
                                 continue;
                         }
-                        chomp(bb_common_bufsiz1);
-                        do_sethostname(bb_common_bufsiz1, 0);
+                        chomp(strbuf);
+                        do_sethostname(strbuf, 0);
                 }
                 if (ENABLE_FEATURE_CLEAN_UP)
                         fclose(f);
diff --git a/networking/nc.c b/networking/nc.c
index 1fb38f83c..e7bd519e0 100644
--- a/networking/nc.c
+++ b/networking/nc.c
@@ -174,11 +174,10 @@ int nc_main(int argc, char **argv)
                 if (select(FD_SETSIZE, &testfds, NULL, NULL, NULL) < 0)
                         bb_perror_msg_and_die("select");
 
+#define iobuf bb_common_bufsiz1
                 for (fd = 0; fd < FD_SETSIZE; fd++) {
                         if (FD_ISSET(fd, &testfds)) {
-                                nread = safe_read(fd, bb_common_bufsiz1,
-                                                        sizeof(bb_common_bufsiz1));
-
+                                nread = safe_read(fd, iobuf, sizeof(iobuf));
                                 if (fd == cfd) {
                                         if (nread < 1)
                                                 exit(0);
@@ -192,8 +191,7 @@ int nc_main(int argc, char **argv)
                                         }
                                         ofd = cfd;
                                 }
-
-                                xwrite(ofd, bb_common_bufsiz1, nread);
+                                xwrite(ofd, iobuf, nread);
                                 if (delay > 0) sleep(delay);
                         }
                 }
diff --git a/networking/telnet.c b/networking/telnet.c
index caca89d2d..a634d7a2b 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -52,7 +52,6 @@ enum {
 
 typedef unsigned char byte;
 
-
 struct globals {
         int     netfd; /* console fd:s are 0 and 1 (and 2) */
         short   iaclen; /* could even use byte */
@@ -78,9 +77,13 @@ struct globals {
         struct termios termios_def;
         struct termios termios_raw;
 };
-
 #define G (*(struct globals*)&bb_common_bufsiz1)
-
+void BUG_telnet_globals_too_big(void);
+#define INIT_G() do { \
+        if (sizeof(G) > COMMON_BUFSIZE) \
+                BUG_telnet_globals_too_big(); \
+        /* memset(&G, 0, sizeof G); - already is */ \
+} while (0)
 
 /* Function prototypes */
 static void rawmode(void);
@@ -547,8 +550,6 @@ static void cookmode(void)
                 tcsetattr(0, TCSADRAIN, &G.termios_def);
 }
 
-void BUG_telnet_globals_too_big(void);
-
 int telnet_main(int argc, char** argv);
 int telnet_main(int argc, char** argv)
 {
@@ -562,9 +563,7 @@ int telnet_main(int argc, char** argv)
         int maxfd;
 #endif
 
-        if (sizeof(G) > sizeof(bb_common_bufsiz1))
-                BUG_telnet_globals_too_big();
-        /* memset(&G, 0, sizeof G); - already is */
+        INIT_G();
 
 #if ENABLE_FEATURE_AUTOWIDTH
         get_terminal_width_height(0, &G.win_width, &G.win_height);