Make still more file-scope variables `static'.

diff --git a/src/stty.c b/src/stty.c
index 8810762..7e27cac 100644 (file)
--- a/src/stty.c
+++ b/src/stty.c
@@ -317,7 +317,7 @@ struct control_info
 
 /* Control characters. */
 
-struct control_info control_info[] =
+static struct control_info control_info[] =
 {
   {"intr", CINTR, VINTR},
   {"quit", CQUIT, VQUIT},
@@ -354,12 +354,12 @@ struct control_info control_info[] =
 };
 
 /* The width of the screen, for output wrapping. */
-int max_col;
+static int max_col;
 
 /* Current position, to know when to wrap. */
-int current_col;
+static int current_col;
 
-struct option longopts[] =
+static struct option longopts[] =
 {
   {"all", 0, NULL, 'a'},
   {"save", 0, NULL, 'g'},

diff --git a/src/su.c b/src/su.c
index dc29063..d118f4a 100644 (file)
--- a/src/su.c
+++ b/src/su.c
@@ -153,15 +153,15 @@ extern char **environ;
 char *program_name;
 
 /* If nonzero, pass the `-f' option to the subshell.  */
-int fast_startup;
+static int fast_startup;
 
 /* If nonzero, simulate a login instead of just starting a shell.  */
-int simulate_login;
+static int simulate_login;
 
 /* If nonzero, change some environment vars to indicate the user su'd to.  */
-int change_environment;
+static int change_environment;
 
-struct option longopts[] =
+static struct option longopts[] =
 {
   {"command", 1, 0, 'c'},
   {"fast", 0, &fast_startup, 1},

diff --git a/src/tee.c b/src/tee.c
index 721014b..ca8f53a 100644 (file)
--- a/src/tee.c
+++ b/src/tee.c
@@ -29,15 +29,15 @@ void error ();
 void xwrite ();
 
 /* If nonzero, append to output files rather than truncating them. */
-int append;
+static int append;
 
 /* If nonzero, ignore interrupts. */
-int ignore_interrupts;
+static int ignore_interrupts;
 
 /* The name that this program was run with. */
 char *program_name;
 
-struct option long_options[] =
+static struct option long_options[] =
 {
   {"append", 0, NULL, 'a'},
   {"ignore-interrupts", 0, NULL, 'i'},

diff --git a/src/tty.c b/src/tty.c
index 056c7da..8396aa9 100644 (file)
--- a/src/tty.c
+++ b/src/tty.c
@@ -32,9 +32,9 @@ void usage ();
 char *program_name;
 
 /* If nonzero, return an exit status but produce no output. */
-int silent;
+static int silent;
 
-struct option longopts[] =
+static struct option longopts[] =
 {
   {"silent", 0, NULL, 's'},
   {"quiet", 0, NULL, 's'},

diff --git a/src/uname.c b/src/uname.c
index 77eaae6..4b7a6f5 100644 (file)
--- a/src/uname.c
+++ b/src/uname.c
@@ -55,12 +55,12 @@ void usage ();
 #define PRINT_MACHINE 16
 
 /* Mask indicating which elements of the name to print. */
-unsigned char toprint;
+static unsigned char toprint;
 
 /* The name this program was run with, for error messages. */
 char *program_name;
 
-struct option long_options[] =
+static struct option long_options[] =
 {
   {"sysname", 0, NULL, 's'},
   {"nodename", 0, NULL, 'n'},