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

Fixed assertion failure, when loading empty style files and using a more modern

Browse source 
version of glibc.

Fixed incorrect autoconf detection of isnan() support when using glibc and more
recent versions of gcc.


git-svn-id: https://shellinabox.googlecode.com/svn/trunk@209 0da03de8-d603-11dd-86c2-0f8696b7b6f9
This commit is contained in:
zodiac@gmail.com 2010-07-09 16:10:21 +00:00
parent c5d55118af
commit a5c8e032b7
7 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.h
View file

@ -153,7 +153,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 "208" #define VCS_REVISION "209"
/* Version number of package */ /* Version number of package */
#define VERSION "2.10" #define VERSION "2.10"

4
configure vendored
View file

@ -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 ac_compiler_gnu=$ac_cv_c_compiler_gnu
VCS_REVISION=208 VCS_REVISION=209
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -10720,7 +10720,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
int int
main () main ()
{ {
isnan(0.0); if (isnan(0.0)) return 1;
; ;
return 0; return 0;
} }

4
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.10, markus@shellinabox.com) AC_INIT(shellinabox, 2.10, markus@shellinabox.com)
VCS_REVISION=208 VCS_REVISION=209
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])
@ -57,7 +57,7 @@ AC_TRY_LINK([#include <pthread.h>
dnl Not every system has support for isnan() dnl Not every system has support for isnan()
AC_TRY_LINK([#include <math.h>], AC_TRY_LINK([#include <math.h>],
[isnan(0.0);], [if (isnan(0.0)) return 1;],
[AC_DEFINE(HAVE_ISNAN, 1, [AC_DEFINE(HAVE_ISNAN, 1,
Define to 1 if you have support for isnan)]) Define to 1 if you have support for isnan)])

2
demo/vt100.js
View file

@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = function() {
}; };
VT100.prototype.about = function() { VT100.prototype.about = function() {
alert("VT100 Terminal Emulator " + "2.10 (revision 208)" + alert("VT100 Terminal Emulator " + "2.10 (revision 209)" +
"\nCopyright 2008-2010 by Markus Gutschke\n" + "\nCopyright 2008-2010 by Markus Gutschke\n" +
"For more information check http://shellinabox.com"); "For more information check http://shellinabox.com");
}; };

2
shellinabox/shell_in_a_box.js
View file

@ -358,7 +358,7 @@ ShellInABox.prototype.extendContextMenu = function(entries, actions) {
}; };
ShellInABox.prototype.about = function() { ShellInABox.prototype.about = function() {
alert("Shell In A Box version " + "2.10 (revision 208)" + alert("Shell In A Box version " + "2.10 (revision 209)" +
"\nCopyright 2008-2010 by Markus Gutschke\n" + "\nCopyright 2008-2010 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 ?

4
shellinabox/usercss.c
View file

@ -76,7 +76,9 @@ static void readStylesheet(struct UserCSS *userCSS, const char *filename,
FILE *fp; FILE *fp;
check(fp = fdopen(fd, "r")); check(fp = fdopen(fd, "r"));
check(*style = malloc(st.st_size + 1)); check(*style = malloc(st.st_size + 1));
check(fread(*style, st.st_size, 1, fp) == 1); if (st.st_size > 0) {
check(fread(*style, st.st_size, 1, fp) == 1);
}
(*style)[st.st_size] = '\000'; (*style)[st.st_size] = '\000';
*len = st.st_size; *len = st.st_size;
fclose(fp); fclose(fp);

2
shellinabox/vt100.js
View file

@ -1955,7 +1955,7 @@ VT100.prototype.toggleBell = function() {
}; };
VT100.prototype.about = function() { VT100.prototype.about = function() {
alert("VT100 Terminal Emulator " + "2.10 (revision 208)" + alert("VT100 Terminal Emulator " + "2.10 (revision 209)" +
"\nCopyright 2008-2010 by Markus Gutschke\n" + "\nCopyright 2008-2010 by Markus Gutschke\n" +
"For more information check http://shellinabox.com"); "For more information check http://shellinabox.com");
}; };