From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30063 invoked by alias); 3 Dec 2003 01:38:16 -0000 Mailing-List: contact cygwin-xfree-help@cygwin.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: cygwin-xfree-owner@cygwin.com Mail-Followup-To: cygwin-xfree@cygwin.com Reply-To: cygwin-xfree@cygwin.com Received: (qmail 30056 invoked from network); 3 Dec 2003 01:38:16 -0000 Received: from unknown (HELO central.ixn.com) (65.19.132.2) by sources.redhat.com with SMTP; 3 Dec 2003 01:38:16 -0000 Received: from msu.edu ([207.179.68.222]) (authenticated bits=0) by central.ixn.com (8.12.10/8.12.10) with ESMTP id hB31cALQ063493 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 2 Dec 2003 20:38:12 -0500 (EST) Message-ID: <3FCD3E7E.5060604@msu.edu> Date: Wed, 03 Dec 2003 01:38:00 -0000 From: Harold L Hunt II User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.5) Gecko/20031013 Thunderbird/0.3 X-Accept-Language: en-us, en MIME-Version: 1.0 To: cygwin-xfree@cygwin.com Subject: Re: Cygwin XFree86 startx Problem References: <20031121192050.14367.qmail@web60304.mail.yahoo.com> <3FBE6FCF.6090002@msu.edu> <3FBFACC6.80305@msu.edu> In-Reply-To: Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, hits=0.5 required=5.5 tests=REMOVE_REMOVAL_2WORD autolearn=no version=2.60 X-Spam-Checker-Version: SpamAssassin 2.60 (1.212-2003-09-23-exp) X-SW-Source: 2003-12/txt/msg00016.txt.bz2 List-Id: Igor, Cool. Thanks! Harold Igor Pechtchanski wrote: > On Sat, 29 Nov 2003, Igor Pechtchanski wrote: > > >>On Sat, 22 Nov 2003, Harold L Hunt II wrote: >> >> >>>Igor, >>> >>>Igor Pechtchanski wrote: >>> >>>>On Fri, 21 Nov 2003, Harold L Hunt II wrote: >>>> >>>> >>>>>Igor, >>>>> >>>>>Igor Pechtchanski wrote: >>>>> >>>>> >>>>> >>>>>>On Fri, 21 Nov 2003, Chan Seng Loong wrote: >>>>>> >>>>>> >>>>>>>hi again... >>>>>>> >>>>>>>Thanks to Mr. Igor Pechtchanski, the "[: Seng: unknown >>>>>>>operand" problem is eleminated with the power of "" >>>>>>>qutoes :-D >>>>>> >>>>>>Good. Harold, how do you want to go about incorporating the patch? >>>>> >>>>>As you suspected, I think this is actually a generated file. Granted, >>>>>the input is similar to the output, but it is a different file that >>>>>needs to be patched. Again, I cannot check this right now. >>>>> >>>>>As far as what to do with the patch, it is hard to say. Are you just >>>>>asking about how it will get into my next release? That should be easy. >>>>> As far as finding it an upstream home, we still have to wait for the >>>>>tree on freedesktop.org to finish being setup. >>>>> >>>>>Harold >>>> >>>>Ok, I'll try to checkout the CVS tree at some point soon and produce this >>>>patch off the correct file. >>> >>>Base the patch off of the SourceForge tree that we have for now: >>> >>>http://sourceforge.net/projects/xoncygwin/ >>> >>>That's what I essentially do my builds from, so it should work. >>>Hopefully the file in question is actually in that tree... if not, then >>>just wait until our freedesktop.org tree is ready. >>> >>>Harold >> >>Harold, >> >>The file (startx.cpp) is in xc/programs/xinit, and the xoncygwin tree only >>has xc/programs/Xserver. Are you going to use the tree on freedesktop.org >>(which is already set up at "xorg") for further builds of the non-server >>parts? If so, should I use the MAIN branch there, or the XORG-CURRENT >>branch? >> Igor > > > Harold, > > Here's a patch against the HEAD of the MAIN branch in the xorg tree at > freedesktop.org. ChangeLog is below. Let me know if there's a problem. > Igor > ============================================================================== > ChangeLog: > 2003-12-02 Igor Pechtchanski > * xc/programs/xinit/startx.cpp: Make space-friendly. > > > > ------------------------------------------------------------------------ > > --- xc/programs/xinit/startx.cpp-orig 2003-12-02 13:10:12.000000000 -0500 > +++ xc/programs/xinit/startx.cpp 2003-12-02 13:45:06.566899200 -0500 > @@ -48,8 +48,9 @@ fi > scoclientrc=$HOME/.startxrc > #endif > > -userclientrc=$HOME/.xinitrc > -userserverrc=$HOME/.xserverrc > +userclientrc="$HOME/.xinitrc" > +userserverrc="$HOME/.xserverrc" > +/* Note: XINITDIR and BINDIR should be space-free */ > sysclientrc=XINITDIR/xinitrc > sysserverrc=XINITDIR/xserverrc > defaultclient=BINDIR/xterm > @@ -64,19 +65,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" > @@ -86,15 +87,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 > ;; > @@ -103,14 +104,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 > ;; > @@ -124,7 +125,7 @@ if [ x"$client" = x ]; then > if [ x"$clientargs" = x ]; then > client="$defaultclientargs" > else > - client=$defaultclient > + client="$defaultclient" > fi > fi > > @@ -134,12 +135,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 > > @@ -172,9 +173,13 @@ EOF > done > #endif > > -xinit $client $clientargs -- $server $display $serverargs > +XCOMM correctly process quotes, etc > +eval "set -- $client $clientargs -- $server $display $serverargs" > + > +xinit "$@" > > if [ x"$removelist" != x ]; then > + XCOMM Note: this is still not space-friendly! > xauth remove $removelist > fi >