From 2ea15936f1eb4800e331df354e2c6a6fcc6ad7f0 Mon Sep 17 00:00:00 2001 From: "zodiac@gmail.com" Date: Mon, 27 Sep 2010 16:56:43 +0000 Subject: [PATCH] Removed a VLA that can trip up some compilers. git-svn-id: https://shellinabox.googlecode.com/svn/trunk@228 0da03de8-d603-11dd-86c2-0f8696b7b6f9 --- config.h | 2 +- configure | 2 +- configure.ac | 2 +- demo/vt100.js | 2 +- shellinabox/shell_in_a_box.js | 2 +- shellinabox/shellinaboxd.c | 2 +- shellinabox/vt100.js | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config.h b/config.h index 347a300..c236166 100644 --- a/config.h +++ b/config.h @@ -153,7 +153,7 @@ #define STDC_HEADERS 1 /* Most recent revision number in the version control system */ -#define VCS_REVISION "225" +#define VCS_REVISION "228" /* Version number of package */ #define VERSION "2.10" diff --git a/configure b/configure index ca1d7a8..1c9896e 100755 --- a/configure +++ b/configure @@ -2328,7 +2328,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -VCS_REVISION=225 +VCS_REVISION=228 cat >>confdefs.h <<_ACEOF diff --git a/configure.ac b/configure.ac index 65d2ff8..24a2e8a 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.10, markus@shellinabox.com) -VCS_REVISION=225 +VCS_REVISION=228 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 6b25ce5..0cab41f 100644 --- a/demo/vt100.js +++ b/demo/vt100.js @@ -2402,7 +2402,7 @@ VT100.prototype.toggleCursorBlinking = function() { }; VT100.prototype.about = function() { - alert("VT100 Terminal Emulator " + "2.10 (revision 225)" + + alert("VT100 Terminal Emulator " + "2.10 (revision 228)" + "\nCopyright 2008-2010 by Markus Gutschke\n" + "For more information check http://shellinabox.com"); }; diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js index 571d945..c9b288d 100644 --- a/shellinabox/shell_in_a_box.js +++ b/shellinabox/shell_in_a_box.js @@ -358,7 +358,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) { }; ShellInABox.prototype.about = function() { - alert("Shell In A Box version " + "2.10 (revision 225)" + + alert("Shell In A Box version " + "2.10 (revision 228)" + "\nCopyright 2008-2010 by Markus Gutschke\n" + "For more information check http://shellinabox.com" + (typeof serverSupportsSSL != 'undefined' && serverSupportsSSL ? diff --git a/shellinabox/shellinaboxd.c b/shellinabox/shellinaboxd.c index e526818..43c685e 100644 --- a/shellinabox/shellinaboxd.c +++ b/shellinabox/shellinaboxd.c @@ -269,7 +269,7 @@ static int handleSession(struct ServerConnection *connection, void *arg, if (len <= 0) { len = 1; } - char buf[len]; + char buf[MAX_RESPONSE]; int bytes = 0; if (revents & POLLIN) { bytes = NOINTR(read(session->pty, buf, len)); diff --git a/shellinabox/vt100.js b/shellinabox/vt100.js index 6b25ce5..0cab41f 100644 --- a/shellinabox/vt100.js +++ b/shellinabox/vt100.js @@ -2402,7 +2402,7 @@ VT100.prototype.toggleCursorBlinking = function() { }; VT100.prototype.about = function() { - alert("VT100 Terminal Emulator " + "2.10 (revision 225)" + + alert("VT100 Terminal Emulator " + "2.10 (revision 228)" + "\nCopyright 2008-2010 by Markus Gutschke\n" + "For more information check http://shellinabox.com"); };