From abb9a50f3b2c3f0227e52947fc07e962f866b76f Mon Sep 17 00:00:00 2001
From: zodiac <zodiac@0da03de8-d603-11dd-86c2-0f8696b7b6f9>
Date: Tue, 28 Apr 2009 07:12:55 +0000
Subject: [PATCH] Fixed variable expansion in service descriptions.

git-svn-id: https://shellinabox.googlecode.com/svn/trunk@118 0da03de8-d603-11dd-86c2-0f8696b7b6f9
---
 ChangeLog                     | 4 ++++
 config.h                      | 2 +-
 configure                     | 2 +-
 configure.ac                  | 2 +-
 demo/vt100.js                 | 2 +-
 shellinabox/launcher.c        | 4 ++--
 shellinabox/shell_in_a_box.js | 2 +-
 shellinabox/vt100.js          | 2 +-
 8 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d41c1e6..fead75c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-28  Markus Gutschke  <markus@shellinabox.com>
+
+	* Fixed variable expansion in service descriptions.
+	
 2009-04-27  Markus Gutschke  <markus@shellinabox.com>
 
 	* Released version 2.7
diff --git a/config.h b/config.h
index 6757193..a4d4c0e 100644
--- a/config.h
+++ b/config.h
@@ -95,7 +95,7 @@
 #define STDC_HEADERS 1
 
 /* Most recent revision number in the version control system */
-#define VCS_REVISION "117"
+#define VCS_REVISION "118"
 
 /* Version number of package */
 #define VERSION "2.7"
diff --git a/configure b/configure
index 1040006..5bb914f 100755
--- a/configure
+++ b/configure
@@ -2056,7 +2056,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-VCS_REVISION=117
+VCS_REVISION=118
 
 
 cat >>confdefs.h <<_ACEOF
diff --git a/configure.ac b/configure.ac
index 2f8423c..998856a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.57)
 
 dnl This is the one location where the authoritative version number is stored
 AC_INIT(shellinabox, 2.7, markus@shellinabox.com)
-VCS_REVISION=117
+VCS_REVISION=118
 AC_SUBST(VCS_REVISION)
 AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}",
                    [Most recent revision number in the version control system])
diff --git a/demo/vt100.js b/demo/vt100.js
index b852621..dafd0ba 100644
--- a/demo/vt100.js
+++ b/demo/vt100.js
@@ -1500,7 +1500,7 @@ VT100.prototype.toggleBell = function() {
 };
 
 VT100.prototype.about = function() {
-  alert("VT100 Terminal Emulator " + "2.7 (revision 117)" +
+  alert("VT100 Terminal Emulator " + "2.7 (revision 118)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };
diff --git a/shellinabox/launcher.c b/shellinabox/launcher.c
index ad7cb0a..be94153 100644
--- a/shellinabox/launcher.c
+++ b/shellinabox/launcher.c
@@ -944,7 +944,7 @@ static void execService(int width, int height, struct Service *service,
     case '$':
       if ((quote == NONE || quote == DOUBLE) && ptr[1] == '{') {
         // Always treat environment variables as if they were quoted. There
-        // is not good reason for us to try to look for spaces within
+        // is no good reason for us to try to look for spaces within
         // expanded environment variables. This just leads to subtle bugs.
         char *end             = ptr + 2;
         while (*end && *end != '}') {
@@ -952,7 +952,7 @@ static void execService(int width, int height, struct Service *service,
         }
         char ch               = *end;
         *end                  = '\000';
-        const char *repl      = getFromHashMap(vars, ptr);
+        const char *repl      = getFromHashMap(vars, ptr + 2);
         int replLen           = repl ? strlen(repl) : 0;
         *end                  = ch;
         if (ch) {
diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js
index 3a3a3f3..6a50b8b 100644
--- a/shellinabox/shell_in_a_box.js
+++ b/shellinabox/shell_in_a_box.js
@@ -355,7 +355,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) {
 };
 
 ShellInABox.prototype.about = function() {
-  alert("Shell In A Box version " + "2.7 (revision 117)" +
+  alert("Shell In A Box version " + "2.7 (revision 118)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com" +
         (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ?
diff --git a/shellinabox/vt100.js b/shellinabox/vt100.js
index b852621..dafd0ba 100644
--- a/shellinabox/vt100.js
+++ b/shellinabox/vt100.js
@@ -1500,7 +1500,7 @@ VT100.prototype.toggleBell = function() {
 };
 
 VT100.prototype.about = function() {
-  alert("VT100 Terminal Emulator " + "2.7 (revision 117)" +
+  alert("VT100 Terminal Emulator " + "2.7 (revision 118)" +
         "\nCopyright 2008-2009 by Markus Gutschke\n" +
         "For more information check http://shellinabox.com");
 };