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

Make 'update' warn about merge conflicts

Browse source 
git-svn-id: https://shellinabox.googlecode.com/svn/trunk@147 0da03de8-d603-11dd-86c2-0f8696b7b6f9
This commit is contained in:
zodiac 2009-07-08 20:11:40 +00:00
parent d51ada4a87
commit 13263e1737
8 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.h
View file

@ -135,7 +135,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 "146" #define VCS_REVISION "147"
/* Version number of package */ /* Version number of package */
#define VERSION "2.9" #define VERSION "2.9"

2
configure vendored
View file

@ -2037,7 +2037,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=146 VCS_REVISION=147
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.9, markus@shellinabox.com) AC_INIT(shellinabox, 2.9, markus@shellinabox.com)
VCS_REVISION=146 VCS_REVISION=147
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

@ -1693,7 +1693,7 @@ VT100.prototype.toggleBell = function() {
}; };
VT100.prototype.about = function() { VT100.prototype.about = function() {
alert("VT100 Terminal Emulator " + "2.9 (revision 146)" + alert("VT100 Terminal Emulator " + "2.9 (revision 147)" +
"\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");
}; };

3
libhttp/httpconnection.c
View file

@ -595,7 +595,8 @@ void httpTransfer(struct HttpConnection *http, char *msg, int len) {
free(msg); free(msg);
msg = compressed; msg = compressed;
len -= strm.avail_out; len -= strm.avail_out;
snprintf(contentLength, 21, "%20d", len - (ptr - compressed)); snprintf(contentLength, 21, "%20lu",
(unsigned long)(len - (ptr - compressed)));
contentLength[20] = '\r'; contentLength[20] = '\r';
} else { } else {
free(compressed); free(compressed);

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.9 (revision 146)" + alert("Shell In A Box version " + "2.9 (revision 147)" +
"\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

@ -1693,7 +1693,7 @@ VT100.prototype.toggleBell = function() {
}; };
VT100.prototype.about = function() { VT100.prototype.about = function() {
alert("VT100 Terminal Emulator " + "2.9 (revision 146)" + alert("VT100 Terminal Emulator " + "2.9 (revision 147)" +
"\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");
}; };

7
update
View file

@ -29,6 +29,13 @@ rm -rf aclocal.m4 configure config.guess config.h config.h.in config.sub \
ltmain.sh m4 Makefile.in ltmain.sh m4 Makefile.in
svn update svn update
[ -z "$(svn sv|grep '^C')" ] || {
echo "Some files could not be synchronized with the SVN repository." >&2
echo "You have to manually resolve the merge conflicts and rerun this " \
"script" >&2
exit 1
}
aclocal aclocal
libtoolize --force --copy libtoolize --force --copy
autoreconf autoreconf