simono41/shellinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed variable expansion in service descriptions.

Browse source 
git-svn-id: https://shellinabox.googlecode.com/svn/trunk@118 0da03de8-d603-11dd-86c2-0f8696b7b6f9
This commit is contained in:
zodiac 2009-04-28 07:12:55 +00:00
parent 28b65c9f2a
commit abb9a50f3b
8 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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> 2009-04-27 Markus Gutschke <markus@shellinabox.com>
* Released version 2.7 * Released version 2.7

2
config.h
View file

@ -95,7 +95,7 @@
#define STDC_HEADERS 1 #define STDC_HEADERS 1
/* Most recent revision number in the version control system */ /* Most recent revision number in the version control system */
#define VCS_REVISION "117" #define VCS_REVISION "118"
/* Version number of package */ /* Version number of package */
#define VERSION "2.7" #define VERSION "2.7"

2
configure vendored
View file

@ -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 ac_compiler_gnu=$ac_cv_c_compiler_gnu
VCS_REVISION=117 VCS_REVISION=118
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF

2
configure.ac
View file

@ -2,7 +2,7 @@ AC_PREREQ(2.57)
dnl This is the one location where the authoritative version number is stored dnl This is the one location where the authoritative version number is stored
AC_INIT(shellinabox, 2.7, markus@shellinabox.com) AC_INIT(shellinabox, 2.7, markus@shellinabox.com)
VCS_REVISION=117 VCS_REVISION=118
AC_SUBST(VCS_REVISION) AC_SUBST(VCS_REVISION)
AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}", AC_DEFINE_UNQUOTED(VCS_REVISION, "${VCS_REVISION}",
[Most recent revision number in the version control system]) [Most recent revision number in the version control system])

2
demo/vt100.js
View file

@ -1500,7 +1500,7 @@ VT100.prototype.toggleBell = function() {
}; };
VT100.prototype.about = 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" + "\nCopyright 2008-2009 by Markus Gutschke\n" +
"For more information check http://shellinabox.com"); "For more information check http://shellinabox.com");
}; };

4
shellinabox/launcher.c
View file

@ -944,7 +944,7 @@ static void execService(int width, int height, struct Service *service,
case '$': case '$':
if ((quote == NONE || quote == DOUBLE) && ptr[1] == '{') { if ((quote == NONE || quote == DOUBLE) && ptr[1] == '{') {
// Always treat environment variables as if they were quoted. There // 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. // expanded environment variables. This just leads to subtle bugs.
char *end = ptr + 2; char *end = ptr + 2;
while (*end && *end != '}') { while (*end && *end != '}') {
@ -952,7 +952,7 @@ static void execService(int width, int height, struct Service *service,
} }
char ch = *end; char ch = *end;
*end = '\000'; *end = '\000';
const char *repl = getFromHashMap(vars, ptr); const char *repl = getFromHashMap(vars, ptr + 2);
int replLen = repl ? strlen(repl) : 0; int replLen = repl ? strlen(repl) : 0;
*end = ch; *end = ch;
if (ch) { if (ch) {

2
shellinabox/shell_in_a_box.js
View file

@ -355,7 +355,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) {
}; };
ShellInABox.prototype.about = function() { 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" + "\nCopyright 2008-2009 by Markus Gutschke\n" +
"For more information check http://shellinabox.com" + "For more information check http://shellinabox.com" +
(typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ? (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ?

2
shellinabox/vt100.js
View file

@ -1500,7 +1500,7 @@ VT100.prototype.toggleBell = function() {
}; };
VT100.prototype.about = 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" + "\nCopyright 2008-2009 by Markus Gutschke\n" +
"For more information check http://shellinabox.com"); "For more information check http://shellinabox.com");
}; };