From caca05eb53f06421c35e5f6ad7fc1dafe8a904f6 Mon Sep 17 00:00:00 2001 From: runge Date: Fri, 1 Feb 2008 02:08:13 +0000 Subject: [PATCH] sync java viewer. --- classes/ssl/SignedVncViewer.jar | Bin 79586 -> 79584 bytes classes/ssl/VncViewer.jar | Bin 76795 -> 76795 bytes classes/ssl/ss_vncviewer | 18 ++++++++++++++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/classes/ssl/SignedVncViewer.jar b/classes/ssl/SignedVncViewer.jar index 2a1200ca12e2aa8da401b0fc3e968389954ab604..ea4445e3609b6962eba53f8884b38ab231eec50f 100644 GIT binary patch delta 1411 zcmZ`&T})GF7=FL@P<|{wE2T<7eo84ILdz*si9bk~4q*{ANNSkGfq(u9=9CKzd7lR+M^!!^>-*{T)0Iwoxzmv! zxuj?_z0UP%g3c?BA8H%hJ9@<#Q8bqwFkwu65q#~wJ=(s!=Pz|?P1MNA+?j_zHb*b` zf8p+Sth68IFEoAq-{+OL9}PWud~eb-a&GFMrnCF^LTPbe(9N$FHcu-6d`iIIYqnC+ zjdwL9mlJ?5cf(8wLkT)fFhjQZzf}xvG5szfUB;k-apPtq$Iz0sMahtB+cAmzc?TcB zICcKM2!_fJswG`**|LNx?c2lIza4euQjg`+!)nG2dGaLP+twkY$ayDv;<|t6l1xnW zB(a79?bGyWrS@C;GZI;eipg`#i1(HMUq($mGlen~G~J&rqC59O$@xTaLp0w^b~Dsw zCOblft$j$4j+==!UPuh^!A!*`7&r+DUw_ig77{C#rMoOdPtvH}LgEndnOkNfC=LUR4$Ks{lgP0H1tR8bD7Ivq*v{Dx%kKyV1gRY_64wRPY~gH`)9*+?2ZykMPIk76#`7dubn)W*ql3#RdKJ9h>KLu&NfOJZohSMY zt9t-Gt#KDP8cxuGETR?9$DLg49LG_ou*ODNlYMlWCnk1YZN(JJX^NF(qzTrNdo?Ai zIFBP1KqEVKzz$H-(CBd1yQz~W8&d>%OS7&j219QPSs!|P9lkg&XHzrX%9Bm$g4n^g z>dxSHYSE57{MpkOMoqQTb=*;3Cst1o4#akkzf@wz<(RSDOqa(y>d}g~LEHxERpoh% z02QCD-^N@kmaeTrD~b4zW9}32kaCj8~Fwu$RkPImEyew*;b?4x_>#jJRUjsko0#ccB6KU3=;W@SZJ;q=i8|li%=3y4xn*@J!!3Lt{F?r80nU*);EHt8ML-x@AKfeRSAH3@Wo3 Gd&7HP`DADS delta 1382 zcmZvbZA?>V6vxkLODSE8tkkPQEfiX8;#}W&nPVAa8b^wYbzy`BToi?^85sRhsrCECg1OQ%jW5QCF73uc+JPl_QkF4ah;~RBOzjV|P4KTQZy;Q){@0POBdX6`n|Sth_mPe(>tdZ~sK-KqOe6 zIiD9QnAsaO>Gr7_TSMm^zkJi2;h!!{`PJ@>r}h3^v!=#iSork7b?3ED{BsXZXw%Zm zr~c|)jE;Qyayxv{8S0V7zKZLI?%wbEyKDdJzweKX{sDo?RNYUT?KkeI0De>hdwyEj z1gj^!sNbmJB3km?pL(IJk||B7!kjs+P|kw8NoC$JtP@^7NbVpe-biVrs zyX=L>`>ixuh^f&_-#tWujrZq^O8CoY#-KS_mvd-?O%U%~`dm~Pz7=~YtQ%Jfj6!K| z53QHg$cPd5+2rL>nG0VP>N6LX8u>z>jg~ID&?iUqx-kpyQ??r|@-vlkV?9;7(VENq zd)sY`U)BL!T>-FqNv{AVDg1(zMW@^-nx%6*)JbtSuFK(}i9=fdkQTsb0C-*zYM~qt z=E{(t`i{1-b@yoi%nC?H?|Lv_hO)nHIz7wI!|qgoOa*k7j(9LnhM;G*ViSY>DFEpT zXqu)xxK@Vhn`6OTmg+6`B}oD8p|xIg$WZ+I9m5L@no3(<(-`gYVtyU(t}1pgWXu5g z+6usCv*h~sHGs_xZJUBE?>Dr*xVvdrTU($KRc6*7|HpW+^@BuYoOOMZWm&Z(6rh48 zy;vZ2q4!~ys-}vjyqHNFeYi%h&M{!x_Lwyow6Gm0VgvM%4{b8kxmT*sX0s3Jm(RY3 zhJDG|2ff`=7h6svD?vH?8JhE9zJr%)IW~S>&Bj{I#;Q!$-@)eC&_svbm|e?J9MG0^ z*a2$aSiXVTZiY722U?pyZvOv?96z?L?iR8XEY(UyR}nf@h<3TF?V5>-I}F&twx@(f zDZwE5#J09vyD-n7_WwXL0|y6J(bl4;2ez(=9asys7h#?lc!V2o(wQO@|0+##BSw#& l5w>DxT&7owF;|4_!&yod9dpCjUjTawtff<{3a0_ulSm#7Out8Xd zq+dW;>y$P!LBx_(RahXbZp~_D2#ZTM0V+~UL;5J!MG(`B_7**AC1`Uh3nGtUU> zhC_>V6(Qz)KHLOx&E(3HKOsV8r_^}Ctm%QwjKZ5YU!SE7=57aaTOit|-&A2Vho})z zWwe8^!c-X{Avb-pDx(ub>?WKguf}K%5sOoU=~$q~XbTa0sK#gkVacj9IzU*7>M(VS z)nO(-P-k?6$f{~EdO%o(8jLm&)i~WX+*=WP;sMdzLYKJzXGXS&5w}Jow delta 588 zcmex;o#pp+7QO&)W)=|!4j{ZSH`;t6pCt>J_HF{x8!tZQ0y8%6;1=S9u+E8mV1uv@ zNxy)y)+uddf`}!ns<1#<-I~?R5Ehqi0#q!|(1;Zxw#3X$0K$6b#sgLN&+`kE_089U zA0lfM8wRzbCwUhSM9ize9;&Xlc#{fPY;w;$xy6YyAdUcWrpszEvTyF1^$)7DXPyz% z4Tl!#DniWpe7FhXn#q+Xe?o-HPO0&NStGRYoU>*iAS~UX9TjA{M6x)3HE}(H0{1P>s<7!je^IbbzoD)nV!u ztHVrwpw8$BkyX`T^nkDmH5hFmtc@BlJ3eT@^crcxWQ#OmcC6E6w1?>U2xpmS!Nkh7 ZV6NH$7yAttv(bjxQLPPg)edb&X8>U6;er4F 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 }