diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:11 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:11 +0000 |
| commit | 76fe43f3e1a0ecda6998f4e96d707e39a19f566e (patch) | |
| tree | 9d3f67c6c2ac960f893bb3daaf2d8f1fb2bcad39 /startx.cpp | |
| parent | 7ac8228123639c28b6d106505ce513072714cdcd (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branchXEVIE-BASE
Diffstat (limited to 'startx.cpp')
| -rw-r--r-- | startx.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -11,7 +11,7 @@ XCOMM and pop a clock and serveral xterms. XCOMM XCOMM Site administrators are STRONGLY urged to write nicer versions. XCOMM -XCOMM $XFree86: xc/programs/xinit/startx.cpp,v 3.16 2003/01/24 21:30:02 herrb Exp $ +XCOMM $XFree86: xc/programs/xinit/startx.cpp,v 3.18 2003/08/22 19:27:33 eich Exp $ #ifdef SCO @@ -82,7 +82,7 @@ fi whoseargs="client" while [ x"$1" != x ]; do case "$1" in - # '' required to prevent cpp from treating "/*" as a C comment. + XCOMM '' required to prevent cpp from treating "/*" as a C comment. /''*|\./''*) if [ "$whoseargs" = "client" ]; then if [ x"$clientargs" = x ]; then @@ -105,8 +105,8 @@ while [ x"$1" != x ]; do if [ "$whoseargs" = "client" ]; then clientargs="$clientargs $1" else - # display must be the FIRST server argument - if [ x"$serverargs" = x ] && \ + 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" else @@ -120,7 +120,7 @@ done XCOMM process client arguments if [ x"$client" = x ]; then - # if no client arguments either, use rc file instead + XCOMM if no client arguments either, use rc file instead if [ x"$clientargs" = x ]; then client="$defaultclientargs" else @@ -130,7 +130,7 @@ fi XCOMM process server arguments if [ x"$server" = x ]; then - # if no server arguments or display either, use rc file instead + XCOMM if no server arguments or display either, use rc file instead if [ x"$serverargs" = x -a x"$display" = x ]; then server="$defaultserverargs" else @@ -164,7 +164,7 @@ authdisplay=${display:-:0} mcookie=`MK_COOKIE` for displayname in $authdisplay $hostname$authdisplay; do if ! xauth list "$displayname" | grep "$displayname " >/dev/null 2>&1; then - xauth << EOF + xauth -q << EOF add $displayname . $mcookie EOF removelist="$displayname $removelist" |