From 13263e173758ea99377c069dafe866b91b3b2a6b Mon Sep 17 00:00:00 2001
From: zodiac <zodiac@0da03de8-d603-11dd-86c2-0f8696b7b6f9>
Date: Wed, 8 Jul 2009 20:11:40 +0000
Subject: [PATCH] Make 'update' warn about merge conflicts

git-svn-id: https://shellinabox.googlecode.com/svn/trunk@147 0da03de8-d603-11dd-86c2-0f8696b7b6f9
---
 config.h                      | 2 +-
 configure                     | 2 +-
 configure.ac                  | 2 +-
 demo/vt100.js                 | 2 +-
 libhttp/httpconnection.c      | 3 ++-
 shellinabox/shell_in_a_box.js | 2 +-
 shellinabox/vt100.js          | 2 +-
 update                        | 7 +++++++
 8 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/config.h b/config.h
index 3c7fdf1..b13bf50 100644
--- a/config.h
+++ b/config.h
@@ -135,7 +135,7 @@
 #define STDC_HEADERS 1
 
 /* Most recent revision number in the version control system */
-#define VCS_REVISION "146"
+#define VCS_REVISION "147"
 
 /* Version number of package */
 #define VERSION "2.9"
diff --git a/configure b/configure
index e732907..0eaf7df 100755
--- a/configure
+++ b/configure
@@ -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
 
 
-VCS_REVISION=146
+VCS_REVISION=147
 
 
 cat >>confdefs.h <<_ACEOF
diff --git a/configure.ac b/configure.ac
index 92e9470..a39efc4 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.9, markus@shellinabox.com)
-VCS_REVISION=146
+VCS_REVISION=147
 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 f7a1e58..452bc5d 100644
--- a/demo/vt100.js
+++ b/demo/vt100.js
@@ -1693,7 +1693,7 @@ VT100.prototype.toggleBell = 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" +
         "For more information check http://shellinabox.com");
 };
diff --git a/libhttp/httpconnection.c b/libhttp/httpconnection.c
index fc6efe7..a41c0c1 100644
--- a/libhttp/httpconnection.c
+++ b/libhttp/httpconnection.c
@@ -595,7 +595,8 @@ void httpTransfer(struct HttpConnection *http, char *msg, int len) {
           free(msg);
           msg               = compressed;
           len              -= strm.avail_out;
-          snprintf(contentLength, 21, "%20d", len - (ptr - compressed));
+          snprintf(contentLength, 21, "%20lu",
+                   (unsigned long)(len - (ptr - compressed)));
           contentLength[20] = '\r';
         } else {
           free(compressed);
diff --git a/shellinabox/shell_in_a_box.js b/shellinabox/shell_in_a_box.js
index bb10ff8..fa028b5 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.9 (revision 146)" +
+  alert("Shell In A Box version " + "2.9 (revision 147)" +
         "\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 f7a1e58..452bc5d 100644
--- a/shellinabox/vt100.js
+++ b/shellinabox/vt100.js
@@ -1693,7 +1693,7 @@ VT100.prototype.toggleBell = 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" +
         "For more information check http://shellinabox.com");
 };
diff --git a/update b/update
index 9387618..e03b877 100755
--- a/update
+++ b/update
@@ -29,6 +29,13 @@ rm -rf aclocal.m4 configure config.guess config.h config.h.in config.sub      \
        ltmain.sh m4 Makefile.in
 
 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
 libtoolize --force --copy
 autoreconf