summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrunge <runge>2008-02-01 02:08:13 +0000
committerrunge <runge>2008-02-01 02:08:13 +0000
commitcaca05eb53f06421c35e5f6ad7fc1dafe8a904f6 (patch)
tree8521768774cc7481417f37e5edf3d61beeabdff9
parent7e7ef1b4716839045c4904c472564f13290ebd8b (diff)
downloadlibtdevnc-caca05eb53f06421c35e5f6ad7fc1dafe8a904f6.tar.gz
libtdevnc-caca05eb53f06421c35e5f6ad7fc1dafe8a904f6.zip
sync java viewer.
-rw-r--r--classes/ssl/SignedVncViewer.jarbin79586 -> 79584 bytes
-rw-r--r--classes/ssl/VncViewer.jarbin76795 -> 76795 bytes
-rwxr-xr-xclasses/ssl/ss_vncviewer18
3 files changed, 16 insertions, 2 deletions
diff --git a/classes/ssl/SignedVncViewer.jar b/classes/ssl/SignedVncViewer.jar
index 2a1200c..ea4445e 100644
--- a/classes/ssl/SignedVncViewer.jar
+++ b/classes/ssl/SignedVncViewer.jar
Binary files differ
diff --git a/classes/ssl/VncViewer.jar b/classes/ssl/VncViewer.jar
index 7ac7e5e..02f9d6b 100644
--- a/classes/ssl/VncViewer.jar
+++ b/classes/ssl/VncViewer.jar
Binary files differ
diff --git a/classes/ssl/ss_vncviewer b/classes/ssl/ss_vncviewer
index 7bf11a7..cffe6df 100755
--- a/classes/ssl/ss_vncviewer
+++ b/classes/ssl/ss_vncviewer
@@ -354,7 +354,9 @@ disp=`echo "$orig" | awk -F: '{print $2}'`
if [ "X$host" = "X" ]; then
host=localhost
fi
-if [ $disp -lt 0 ]; then
+if [ "X$disp" = "X" ]; then
+ port="" # probably -listen mode.
+elif [ $disp -lt 0 ]; then
# negative means use |n| without question:
port=`expr 0 - $disp`
elif [ $disp -lt 200 ]; then
@@ -907,8 +909,20 @@ sub xfer {
close($out);
}
'
- echo "$cod" > $tf
+ # xpg_echo will expand \n \r, etc.
+ # try to unset and then test for it.
+ shopt -u xpg_echo >/dev/null 2>&1
+ v='print STDOUT "abc\n";'
+ echo "$v" > $tf
chmod 700 $tf
+
+ lc=`wc -l $tf | awk '{print $1}'`
+ if [ "X$lc" = "X1" ]; then
+ echo "$cod" > $tf
+ else
+ printf "%s" "$cod" > $tf
+ echo "" >> $tf
+ fi
# prime perl
perl -e 'use IO::Socket::INET; select(undef, undef, undef, 0.01)' >/dev/null 2>&1
}