diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:34:18 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:34:18 +0000 |
| commit | e81c9eb0ff201e28e32dfb0e1639885e4e1d7b71 (patch) | |
| tree | 52da975f1eed9615e4b5b8799131b8fc1a2687c2 /startx.cpp | |
| parent | 4e14556c04921fb1ebdf00a4615670d88c09d148 (diff) | |
Pull XORG-6_8_0 to CYGWIN branchCYGWIN-6_8_0-MERGE
Diffstat (limited to 'startx.cpp')
| -rw-r--r-- | startx.cpp | 47 |
1 files changed, 21 insertions, 26 deletions
@@ -48,9 +48,8 @@ fi scoclientrc=$HOME/.startxrc #endif -userclientrc="$HOME/.xinitrc" -userserverrc="$HOME/.xserverrc" -/* Note: XINITDIR and BINDIR should be space-free */ +userclientrc=$HOME/.xinitrc +userserverrc=$HOME/.xserverrc sysclientrc=XINITDIR/xinitrc sysserverrc=XINITDIR/xserverrc defaultclient=BINDIR/xterm @@ -65,19 +64,19 @@ if [ -f $scoclientrc ]; then defaultclientargs=$scoclientrc else #endif -if [ -f "$userclientrc" ]; then - defaultclientargs="\"$userclientrc\"" -elif [ -f "$sysclientrc" ]; then - defaultclientargs="\"$sysclientrc\"" +if [ -f $userclientrc ]; then + defaultclientargs=$userclientrc +elif [ -f $sysclientrc ]; then + defaultclientargs=$sysclientrc fi #ifdef SCO fi #endif -if [ -f "$userserverrc" ]; then - defaultserverargs="\"$userserverrc\"" -elif [ -f "$sysserverrc" ]; then - defaultserverargs="\"$sysserverrc\"" +if [ -f $userserverrc ]; then + defaultserverargs=$userserverrc +elif [ -f $sysserverrc ]; then + defaultserverargs=$sysserverrc fi whoseargs="client" @@ -87,15 +86,15 @@ while [ x"$1" != x ]; do /''*|\./''*) if [ "$whoseargs" = "client" ]; then if [ x"$clientargs" = x ]; then - client="\"$1\"" + client="$1" else - clientargs="$clientargs \"$1\"" + clientargs="$clientargs $1" fi else if [ x"$serverargs" = x ]; then - server="\"$1\"" + server="$1" else - serverargs="$serverargs \"$1\"" + serverargs="$serverargs $1" fi fi ;; @@ -104,14 +103,14 @@ while [ x"$1" != x ]; do ;; *) if [ "$whoseargs" = "client" ]; then - clientargs="$clientargs \"$1\"" + clientargs="$clientargs $1" else XCOMM display must be the FIRST server argument if [ x"$serverargs" = x ] && @@ expr "$1" : ':[0-9][0-9]*$' > /dev/null 2>&1; then - display="\"$1\"" + display="$1" else - serverargs="$serverargs \"$1\"" + serverargs="$serverargs $1" fi fi ;; @@ -125,7 +124,7 @@ if [ x"$client" = x ]; then if [ x"$clientargs" = x ]; then client="$defaultclientargs" else - client="$defaultclient" + client=$defaultclient fi fi @@ -135,12 +134,12 @@ if [ x"$server" = x ]; then if [ x"$serverargs" = x -a x"$display" = x ]; then server="$defaultserverargs" else - server="$defaultserver" + server=$defaultserver fi fi if [ x"$XAUTHORITY" = x ]; then - XAUTHORITY="$HOME/.Xauthority" + XAUTHORITY=$HOME/.Xauthority export XAUTHORITY fi @@ -173,13 +172,9 @@ EOF done #endif -XCOMM correctly process quotes, etc -eval "set -- $client $clientargs -- $server $display $serverargs" - -xinit "$@" +xinit $client $clientargs -- $server $display $serverargs if [ x"$removelist" != x ]; then - XCOMM Note: this is still not space-friendly! xauth remove $removelist fi |