Pull XORG-6_8_0 to CYGWIN branchCYGWIN-6_8_0-MERGE

5 files changed, 23 insertions, 29 deletions

diff --git a/startx.cmd b/startx.cmd
index e18fb62..cd37ecb 100644
--- a/startx.cmd
+++ b/startx.cmd
@@ -1,6 +1,5 @@
 /* OS/2 REXX */
 /* $XFree86: xc/programs/xinit/startx.cmd,v 3.3 1996/10/17 15:23:47 dawes Exp $
- * $XdotOrg$
  * 
  * This is just a sample implementation of a slightly less primitive 
  * interface than xinit.  It looks for user xinitrc.cmd and xservrc.cmd
diff --git a/startx.cpp b/startx.cpp
index 2f66cb8..5684cc0 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -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
 
diff --git a/startx.man b/startx.man
index c8f4105..196affd 100644
--- a/startx.man
+++ b/startx.man
@@ -1,5 +1,5 @@
 .\" $Xorg: startx.man,v 1.4 2001/02/09 02:05:49 xorgcvs Exp $
-.\" $XdotOrg: xc/programs/xinit/startx.man,v 1.7 2001/04/19 15:08:32 dawes Exp $
+.\" $XdotOrg: xc/programs/xinit/startx.man,v 1.2 2004/04/23 19:54:49 eich Exp $
 .\" Copyright 1993, 1998  The Open Group
 .\" 
 .\" Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/xinit.c b/xinit.c
index ec2e6d0..fea283e 100644
--- a/xinit.c
+++ b/xinit.c
@@ -26,6 +26,7 @@ in this Software without prior written authorization from The Open Group.
 
 */
 /* $XFree86: xc/programs/xinit/xinit.c,v 3.32 2002/05/31 18:46:13 dawes Exp $ */
+
 #include <X11/Xlib.h>
 #include <X11/Xos.h>
 #include <stdio.h>
diff --git a/xinitrc.cmd b/xinitrc.cmd
index 0b2338a..f40a7b7 100644
--- a/xinitrc.cmd
+++ b/xinitrc.cmd
@@ -1,6 +1,5 @@
 /* OS/2 REXX */
 /* $XFree86: xc/programs/xinit/xinitrc.cmd,v 3.5 1997/01/27 08:26:14 dawes Exp $ */
-/* $XdotOrg: xc/programs/xinit/xinitrc.cmd,v 3.5 1997/01/27 08:26:14 dawes Exp $ */
 '@echo off'
 env = 'OS2ENVIRONMENT'
 x11root = VALUE('X11ROOT',,env)