From 54237e338b0406e553df55d91509248e8c13eee0 Mon Sep 17 00:00:00 2001 From: runge Date: Wed, 26 Sep 2007 19:20:56 +0000 Subject: x11vnc: COLUMNS=256 and other fixes to find/create scripts. More ratecheck. --- x11vnc/ssltools.h | 136 ++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 106 insertions(+), 30 deletions(-) (limited to 'x11vnc/ssltools.h') diff --git a/x11vnc/ssltools.h b/x11vnc/ssltools.h index 013b7a2..caeb7ad 100644 --- a/x11vnc/ssltools.h +++ b/x11vnc/ssltools.h @@ -710,6 +710,9 @@ char find_display[] = "PATH=$PATH:/bin:/usr/bin:/usr/X11R6/bin:/usr/bin/X11:/usr/openwin/bin:/usr/ucb\n" "export PATH\n" "\n" +"COLUMNS=256\n" +"export COLUMNS\n" +"\n" "# -n means no xauth, -f prescribes file to use.\n" "showxauth=1\n" "if [ \"X$1\" = \"X-n\" ]; then\n" @@ -833,6 +836,10 @@ char find_display[] = " fi\n" " fi\n" " done\n" +" echo \"\" # failure\n" +" if [ \"X$showxauth\" != \"X\" ]; then\n" +" echo \"\"\n" +" fi\n" " exit 1\n" "fi\n" "\n" @@ -995,7 +1002,12 @@ char find_display[] = " exit\n" "fi\n" "if [ \"X$display\" = \"X\" ]; then\n" -" echo \"\" # failure\n" +" if [ \"X$FINDDISPLAY_run\" = \"X\" ]; then\n" +" echo \"\" # failure\n" +" if [ \"X$showxauth\" != \"X\" ]; then\n" +" echo \"\"\n" +" fi\n" +" fi\n" " exit 1\n" "fi\n" "\n" @@ -1046,6 +1058,9 @@ char create_display[] = " set -xv\n" "fi\n" "\n" +"COLUMNS=256\n" +"export COLUMNS\n" +"\n" "findfree() {\n" " try=20\n" " n=\"\"\n" @@ -1339,18 +1354,28 @@ char create_display[] = " fi\n" "\n" " result=0\n" -" ns=4\n" +" #ns=4\n" +" ns=0\n" +" ns2=1\n" +" #if uname | grep SunOS > /dev/null; then\n" +" # ns=2\n" +" #fi\n" +"\n" " if [ \"X$use_xdmcp_query\" = \"X1\" ]; then\n" " # we cannot use -nolisten tcp\n" " echo \"$* -once -query localhost $FD_OPTS\" 1>&2\n" " if [ \"X$have_root\" != \"X\" ]; then\n" " $have_nohup $* -once -query localhost $FD_OPTS 1>&2 &\n" " else\n" -" $have_nohup sh -c \"(sleep $ns; $* -once -query localhost -auth $authfile $FD_OPTS)\" 1>&2 &\n" -" ns=0\n" -" result=1\n" +" if [ \"X$ns\" = \"X0\" ]; then\n" +" $have_nohup sh -c \"$* -once -query localhost -auth $authfile $FD_OPTS\" 1>&2 &\n" +" else\n" +" $have_nohup sh -c \"(sleep $ns; $* -once -query localhost -auth $authfile $FD_OPTS)\" 1>&2 &\n" +" #result=1\n" +" fi\n" " fi\n" " pid=$!\n" +" sleep 10\n" " elif [ \"X$have_startx\" != \"X\" -o \"X$have_xinit\" != \"X\" ]; then\n" " if [ \"X$have_startx\" != \"X\" ]; then\n" " sxcmd=$have_startx\n" @@ -1361,43 +1386,94 @@ char create_display[] = " if [ \"X$have_root\" != \"X\" ]; then\n" " $sxcmd $sess -- $* -nolisten tcp -auth $authfile $FD_OPTS 1>&2 &\n" " else\n" -" $have_nohup sh -c \"(sleep $ns; $sxcmd $sess -- $* -nolisten tcp -auth $authfile $FD_OPTS)\" 1>&2 &\n" -" ns=0\n" -" result=1\n" +" if [ \"X$ns\" = \"X0\" ]; then\n" +" $have_nohup sh -c \"$sxcmd $sess -- $* -nolisten tcp -auth $authfile $FD_OPTS\" 1>&2 &\n" +" else\n" +" # Why did we ever sleep before starting the server??\n" +" $have_nohup sh -c \"(sleep $ns; $sxcmd $sess -- $* -nolisten tcp -auth $authfile $FD_OPTS)\" 1>&2 &\n" +" #result=1\n" +" fi\n" " fi\n" " pid=$!\n" " else\n" +" # need to emulate startx/xinit ourselves...\n" " echo \"$* -nolisten tcp -auth $authfile $FD_OPTS\" 1>&2\n" " if [ \"X$have_root\" != \"X\" ]; then\n" " $have_nohup $* -nolisten tcp -auth $authfile $FD_OPTS 1>&2 &\n" " pid=$!\n" -" sleep 2\n" +" sleep 3\n" " $have_nohup $sess 1>&2 &\n" " else\n" -" $have_nohup sh -c \"(sleep $ns; $* -nolisten tcp -auth $authfile $FD_OPTS)\" 1>&2 &\n" +" if [ \"X$ns\" = \"X0\" ]; then\n" +" $have_nohup sh -c \"$* -nolisten tcp -auth $authfile $FD_OPTS\" 1>&2 &\n" +" else\n" +" $have_nohup sh -c \"(sleep $ns; $* -nolisten tcp -auth $authfile $FD_OPTS)\" 1>&2 &\n" +" #result=1\n" +" fi\n" " pid=$!\n" -" sleep 2\n" -" $have_nohup sh -c \"(sleep $ns; $sess)\" 1>&2 &\n" -" ns=0\n" -" result=1\n" +" sleep 3\n" +" $have_nohup sh -c \"(sleep 3; $sess)\" 1>&2 &\n" " fi\n" " fi\n" -" sleep $ns\n" -" if [ \"X$result\" = \"X1\" ]; then\n" -" :\n" -" elif [ -d /proc/$pid ]; then\n" -" result=1\n" -" elif kill -0 $pid; then\n" -" result=1\n" -" else\n" -" result=0\n" -" fi\n" " if uname | grep SunOS > /dev/null; then\n" " $have_nohup sh -c \"(sleep 60; rm -f $rmf)\" 1>&2 &\n" " else\n" " $have_nohup sh -c \"(sleep 60; rm -f $rmf $authfile)\" 1>&2 &\n" " fi\n" "\n" +" t=0\n" +" tmax=5\n" +" while [ $t -lt $tmax ]\n" +" do\n" +" t=`expr $t + 1`\n" +" sleep $ns2\n" +" pid2=`head -n 1 \"/tmp/.X$N-lock\" 2>/dev/null | sed -e 's/[ ]//g' | grep '^[0-9][0-9]*$'`\n" +" if [ \"X$pid2\" = \"X\" ]; then\n" +" pid2=9999999\n" +" fi\n" +" if [ \"X$result\" = \"X1\" ]; then\n" +" break\n" +" elif [ -d /proc/$pid2 ]; then\n" +" result=1\n" +" break\n" +" elif kill -0 $pid2 2>/dev/null; then\n" +" result=1\n" +" break\n" +" elif [ -d /proc/$pid ]; then\n" +" result=1\n" +" break\n" +" elif kill -0 $pid 2>/dev/null; then\n" +" result=1\n" +" break\n" +" else\n" +" result=0\n" +" fi\n" +" if [ \"X$have_netstat\" != \"X\" ]; then\n" +" if $have_netstat -an | grep \"/tmp/.X11-unix/X$N\\$\" > /dev/null; then\n" +" result=1\n" +" fi\n" +" fi\n" +" done\n" +"\n" +"# if [ \"X$result\" = \"X1\" ]; then\n" +"# if [ \"X$use_xdmcp_query\" = \"X0\" -a \"X$have_xdpyinfo\" != \"X\" ]; then\n" +"# ok=0\n" +"# for t in 1 2 3 4\n" +"# do\n" +"# $have_xdpyinfo >/dev/null 2>&1\n" +"# if [ $? != 0 ]; then\n" +"# sleep 1\n" +"# else\n" +"# ok=1\n" +"# break;\n" +"# fi\n" +"# done\n" +"# if [ \"X$ok\" = \"X0\" ]; then\n" +"# result=0\n" +"# fi\n" +"# fi\n" +"# fi\n" +"\n" " if [ \"X$redir_daemon\" != \"X\" -a \"X$result\" = \"X1\" ]; then\n" " redir_daemon=`echo \"$redir_daemon\" | sed -e 's|[^A-z0-9:,/]||g'`\n" " xprog=$X11VNC_PROG\n" @@ -1671,7 +1747,7 @@ char create_display[] = " p_ok=1\n" "fi\n" "\n" -"for prog in startx xinit xdm gdm kdm xterm Xdummy Xvfb Xvnc xauth mcookie md5sum xmodmap startkde gnome-session blackbox fvwm2 mwm openbox twm windowmaker wmaker enlightenment metacity X Xorg XFree86 Xsun Xsession dtwm netstat nohup esddsp konsole gnome-terminal\n" +"for prog in startx xinit xdm gdm kdm xterm Xdummy Xvfb Xvnc xauth xdpyinfo mcookie md5sum xmodmap startkde gnome-session blackbox fvwm2 mwm openbox twm windowmaker wmaker enlightenment metacity X Xorg XFree86 Xsun Xsession dtwm netstat nohup esddsp konsole gnome-terminal perl\n" "do\n" " p2=`echo \"$prog\" | sed -e 's/-/_/g'`\n" " eval \"have_$p2=''\"\n" @@ -1726,15 +1802,15 @@ char create_display[] = " curr_try=`echo \"$curr_try\" | sed -e 's/[+.-]xdmcp//'`\n" " curr_try=`echo \"$curr_try\" | sed -e 's/[+.-]redirect//'`\n" " \n" -" if echo \"$curr_try\" | grep -iw \"^Xdummy\" > /dev/null; then\n" +" if echo \"$curr_try\" | grep -i '^Xdummy\\>' > /dev/null; then\n" " try_Xdummy\n" -" elif echo \"$curr_try\" | grep -iw \"^Xvfb\" > /dev/null; then\n" +" elif echo \"$curr_try\" | grep -i '^Xvfb\\>' > /dev/null; then\n" " try_Xvfb\n" -" elif echo \"$curr_try\" | grep -iw \"^Xvnc\" > /dev/null; then\n" +" elif echo \"$curr_try\" | grep -i '^Xvnc\\>' > /dev/null; then\n" " try_Xvnc\n" -" elif echo \"$curr_try\" | grep -iw \"^Xsrv\" > /dev/null; then\n" +" elif echo \"$curr_try\" | grep -i '^Xsrv\\>' > /dev/null; then\n" " try_Xsrv\n" -" elif echo \"$curr_try\" | grep -iw \"^X\" > /dev/null; then\n" +" elif echo \"$curr_try\" | grep -i '^X\\>' > /dev/null; then\n" " try_X\n" " fi\n" " if [ \"X$result\" = \"X1\" ]; then\n" -- cgit v1.2.3