Better label the globals.

diff --git a/lash.c b/lash.c
index c756a2749622483815a36e9968cc47b1f214be22..9e017b169d2a8c16b1c2362402bad3ea4ac2bdd5 100644 (file)
--- a/lash.c
+++ b/lash.c
@@ -73,8 +73,6 @@ static const unsigned int IF_TRUE_CONTEXT=0x2;
 static const unsigned int IF_FALSE_CONTEXT=0x4;
 static const unsigned int THEN_EXP_CONTEXT=0x8;
 static const unsigned int ELSE_EXP_CONTEXT=0x10;
-unsigned int shell_context;
-
 
 
 struct jobset {
@@ -184,6 +182,13 @@ static struct built_in_command bltins_forking[] = {
        {NULL, NULL, NULL}
 };
 
+
+/* Variables we export */
+unsigned int shell_context;  /* Used in cmdedit.c to reset the
+                                                               context when someone hits ^C */
+
+
+/* Globals that are static to this file */
 static char *cwd;
 static char *local_pending_command;
 static struct jobset job_list = { NULL, NULL };

diff --git a/sh.c b/sh.c
index c756a2749622483815a36e9968cc47b1f214be22..9e017b169d2a8c16b1c2362402bad3ea4ac2bdd5 100644 (file)
--- a/sh.c
+++ b/sh.c
@@ -73,8 +73,6 @@ static const unsigned int IF_TRUE_CONTEXT=0x2;
 static const unsigned int IF_FALSE_CONTEXT=0x4;
 static const unsigned int THEN_EXP_CONTEXT=0x8;
 static const unsigned int ELSE_EXP_CONTEXT=0x10;
-unsigned int shell_context;
-
 
 
 struct jobset {
@@ -184,6 +182,13 @@ static struct built_in_command bltins_forking[] = {
        {NULL, NULL, NULL}
 };
 
+
+/* Variables we export */
+unsigned int shell_context;  /* Used in cmdedit.c to reset the
+                                                               context when someone hits ^C */
+
+
+/* Globals that are static to this file */
 static char *cwd;
 static char *local_pending_command;
 static struct jobset job_list = { NULL, NULL };

diff --git a/shell/lash.c b/shell/lash.c
index c756a2749622483815a36e9968cc47b1f214be22..9e017b169d2a8c16b1c2362402bad3ea4ac2bdd5 100644 (file)
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -73,8 +73,6 @@ static const unsigned int IF_TRUE_CONTEXT=0x2;
 static const unsigned int IF_FALSE_CONTEXT=0x4;
 static const unsigned int THEN_EXP_CONTEXT=0x8;
 static const unsigned int ELSE_EXP_CONTEXT=0x10;
-unsigned int shell_context;
-
 
 
 struct jobset {
@@ -184,6 +182,13 @@ static struct built_in_command bltins_forking[] = {
        {NULL, NULL, NULL}
 };
 
+
+/* Variables we export */
+unsigned int shell_context;  /* Used in cmdedit.c to reset the
+                                                               context when someone hits ^C */
+
+
+/* Globals that are static to this file */
 static char *cwd;
 static char *local_pending_command;
 static struct jobset job_list = { NULL, NULL };